Changeset 58674 in vbox

Timestamp:

Nov 12, 2015 3:15:45 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7909: Mac OS X: Runtime UI: Extra-Data Manager: Action-pool: Renaming dock icon disable overlay action and some code style rework.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• platform/darwin/UIAbstractDockIconPreview.cpp (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (2 diffs)
• runtime/UIActionPoolRuntime.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -136 +136 @@
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
-const char* UIExtraDataDefs::GUI_DockIconOverlayDisabled = "GUI/DockIconOverlayDisabled";
+const char* UIExtraDataDefs::GUI_DockIconDisableOverlay = "GUI/DockIconDisableOverlay";
 #endif /* Q_WS_MAC */
 const char* UIExtraDataDefs::GUI_PassCAD = "GUI/PassCAD";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -235 +235 @@
         /** Mac OS X: Holds guest-screen which Dock icon should reflect at runtime. */
         extern const char* GUI_RealtimeDockIconUpdateMonitor;
-        /** Mac OS X: Holds whether Dock icon should disable guest-os overlay. */
-        extern const char* GUI_DockIconOverlayDisabled;
+        /** Mac OS X: Holds whether Dock icon should have overlay disabled. */
+        extern const char* GUI_DockIconDisableOverlay;
 #endif /* Q_WS_MAC */
         /** Holds whether machine should pass CAD to guest. */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1874 +1874 @@
            << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
 #ifdef Q_WS_MAC
-           << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconOverlayDisabled
+           << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconDisableOverlay
 #endif /* Q_WS_MAC */
            << GUI_PassCAD
@@ -3431 +3431 @@
 }
 
-bool UIExtraDataManager::dockIconOverlayDisabled(const QString &strID)
-{   
+bool UIExtraDataManager::dockIconDisableOverlay(const QString &strID)
+{
     /* 'False' unless feature allowed: */
-    return isFeatureAllowed(GUI_DockIconOverlayDisabled, strID);
-}
-
-void UIExtraDataManager::setdockIconOverlayDisabled(bool fDisabled, const QString &strID)
+    return isFeatureAllowed(GUI_DockIconDisableOverlay, strID);
+}
+
+void UIExtraDataManager::setDockIconDisableOverlay(bool fDisabled, const QString &strID)
 {
     /* 'True' if feature allowed, null-string otherwise: */
-    setExtraDataString(GUI_DockIconOverlayDisabled, toFeatureAllowed(fDisabled), strID);
+    setExtraDataString(GUI_DockIconDisableOverlay, toFeatureAllowed(fDisabled), strID);
 }
 #endif /* Q_WS_MAC */
@@ -3825 +3825 @@
                      strKey == GUI_RealtimeDockIconUpdateMonitor)
                 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, strMachineID));
-            /* 'Dock icon overlay' appearance changed (allowed if not restricted)? */
-            else if (strKey == GUI_DockIconOverlayDisabled)
+            /* 'Dock icon overlay' appearance changed (restricted if not allowed)? */
+            else if (strKey == GUI_DockIconDisableOverlay)
                 emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, strMachineID));
 #endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -464 +464 @@
 
         /** Mac OS X: Returns whether Dock icon overlay is disabled. */
-        bool dockIconOverlayDisabled(const QString &strID);
-        /** Mac OS X: Defines whether Dock icon overlay @a fDisabled. */
-        void setdockIconOverlayDisabled(bool fDisabled, const QString &strID);
+        bool dockIconDisableOverlay(const QString &strID);
+        /** Mac OS X: Defines whether Dock icon overlay is @a fDisabled. */
+        void setDockIconDisableOverlay(bool fDisabled, const QString &strID);
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp

@@ -122 +122 @@
 {
     /* Determine whether dock icon overlay is not disabled: */
-    if (!gEDataManager->dockIconOverlayDisabled(vboxGlobal().managedVMUuid()))
+    if (!gEDataManager->dockIconDisableOverlay(vboxGlobal().managedVMUuid()))
     {
-        /* Initialize overlayrect: */
+        /* Initialize overlay rectangle: */
         CGRect overlayRect = CGRectMake(0, 0, 0, 0);
         /* Make sure overlay image is valid: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -1840 +1840 @@
 };
 
-class UIActionToggleDockIconOverlayDisabled : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionToggleDockIconOverlayDisabled(UIActionPool *pParent)
+class UIActionToggleDockIconDisableOverlay : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleDockIconDisableOverlay(UIActionPool *pParent)
         : UIActionToggle(pParent) {}
 
@@ -2149 +2149 @@
     m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_PreviewMonitor] = new UIActionToggleDockPreviewMonitor(this);
     m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor] = new UIActionToggleDockDisableMonitor(this);
-    m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_OverlayDisabled] = new UIActionToggleDockIconOverlayDisabled(this);
+    m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay] = new UIActionToggleDockIconDisableOverlay(this);
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

@@ -122 +122 @@
     UIActionIndexRT_M_Dock_M_DockSettings_T_PreviewMonitor,
     UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor,
-    UIActionIndexRT_M_Dock_M_DockSettings_T_OverlayDisabled,
+    UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay,
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1194 +1194 @@
             this, SLOT(sltChangeDockIconUpdate(bool)));
 
-    /* Get dock icon overlay disabled action: */
-    QAction *pDockIconOverlayDisabled = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings_T_OverlayDisabled);
-    /* Prepare dock icon overlay disabled action with initial data: */
-    pDockIconOverlayDisabled->setChecked(gEDataManager->dockIconOverlayDisabled(vboxGlobal().managedVMUuid()));
-    /* Connect dock icon overlay disabled signals: */
-    connect(pDockIconOverlayDisabled, SIGNAL(triggered(bool)),
-            this, SLOT(sltDockIconOverlayDisabledChanged(bool)));
+    /* Get dock icon disable overlay action: */
+    QAction *pDockIconDisableOverlay = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay);
+    /* Prepare dock icon disable overlay action with initial data: */
+    pDockIconDisableOverlay->setChecked(gEDataManager->dockIconDisableOverlay(vboxGlobal().managedVMUuid()));
+    /* Connect dock icon disable overlay related signals: */
+    connect(pDockIconDisableOverlay, SIGNAL(triggered(bool)),
+            this, SLOT(sltDockIconDisableOverlayChanged(bool)));
     connect(gEDataManager, SIGNAL(sigDockIconOverlayAppearanceChange(bool)),
             this, SLOT(sltChangeDockIconOverlayAppearance(bool)));
-    /* Add dock icon overlay disabled action to the dock settings menu: */
-    pDockSettingsMenu->addAction(pDockIconOverlayDisabled);
+    /* Add dock icon disable overlay action to the dock settings menu: */
+    pDockSettingsMenu->addAction(pDockIconDisableOverlay);
 
     /* Monitor selection if there are more than one monitor */
@@ -2143 +2143 @@
 void UIMachineLogic::sltChangeDockIconOverlayAppearance(bool fDisabled)
 {
-    /* Value of flag is directly referenced from extra-data manager later: */
-    Q_UNUSED(fDisabled);
     /* Update dock icon overlay: */
     if (isMachineWindowsCreated())
         updateDockOverlay();
-    /* Make sure to update dock icon action when dock icon overlay disabled changed from extra-data manager: */
-    QAction *pDockIconOverlayDisabled = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings_T_OverlayDisabled);
-    if (fDisabled != pDockIconOverlayDisabled->isChecked())
-        pDockIconOverlayDisabled->setChecked(fDisabled);
-}
-
-void UIMachineLogic::sltDockIconOverlayDisabledChanged(bool fDisabled)
-{
-    /* Write dock icon overlay flag to extra-data: */
-    gEDataManager->setdockIconOverlayDisabled(fDisabled, vboxGlobal().managedVMUuid());
+    /* Make sure to update dock icon disable overlay action state when 'GUI_DockIconDisableOverlay' changed from extra-data manager: */
+    QAction *pDockIconDisableOverlay = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings_T_DisableOverlay);
+    if (fDisabled != pDockIconDisableOverlay->isChecked())
+    {
+        /* Block signals initially to avoid recursive loop: */
+        pDockIconDisableOverlay->blockSignals(true);
+        /* Update state: */
+        pDockIconDisableOverlay->setChecked(fDisabled);
+        /* Make sure to unblock signals again: */
+        pDockIconDisableOverlay->blockSignals(false);
+    }
+}
+
+void UIMachineLogic::sltDockIconDisableOverlayChanged(bool fDisabled)
+{
+    /* Write dock icon disable overlay flag to extra-data: */
+    gEDataManager->setDockIconDisableOverlay(fDisabled, vboxGlobal().managedVMUuid());
 }
 #endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -314 +314 @@
     void sltChangeDockIconOverlayAppearance(bool fDisabled);
     /** Handles dock icon overlay disable action triggering. */
-    void sltDockIconOverlayDisabledChanged(bool fDisabled);
+    void sltDockIconDisableOverlayChanged(bool fDisabled);
 #endif /* RT_OS_DARWIN */
 
@@ -400 +400 @@
     QActionGroup *m_pDockPreviewSelectMonitorGroup;
     int m_DockIconPreviewMonitor;
-    /** Holds whether dock icon overlay disabled. */
-    bool m_fIsDockIconOverlayDisabled;
 #endif /* Q_WS_MAC */