Changeset 58544 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 2, 2015 5:42:06 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103873

Message:

FE/Qt: 7909: Mac OS X: Runtime UI: Extra-Data Manager: Renaming extra-data key from GUI_DockIconOverlayEnabled to GUI_DockIconOverlayDisabled to keep name consistency.

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/UIMachineLogic.cpp (modified) (1 diff)
• 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_DockIconOverlayEnabled = "GUI/DockIconOverlayEnabled";
+const char* UIExtraDataDefs::GUI_DockIconOverlayDisabled = "GUI/DockIconOverlayDisabled";
 #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 have guest-os overlay. */
-        extern const char* GUI_DockIconOverlayEnabled;
+        /** Mac OS X: Holds whether Dock icon should disable guest-os overlay. */
+        extern const char* GUI_DockIconOverlayDisabled;
 #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_DockIconOverlayEnabled
+           << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconOverlayDisabled
 #endif /* Q_WS_MAC */
            << GUI_PassCAD
@@ -3431 +3431 @@
 }
 
-bool UIExtraDataManager::dockIconOverlayEnabled(const QString &strID)
-{
-    /* 'True' unless feature restricted: */
-    return !isFeatureRestricted(GUI_DockIconOverlayEnabled, strID);
-}
-
-void UIExtraDataManager::setdockIconOverlayEnabled(bool fEnabled, const QString &strID)
-{
-    /* 'False' if feature restricted, 'True' otherwise: */
-    setExtraDataString(GUI_DockIconOverlayEnabled, toFeatureRestricted(!fEnabled), strID);
+bool UIExtraDataManager::dockIconOverlayDisabled(const QString &strID)
+{   
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_DockIconOverlayDisabled, strID);
+}
+
+void UIExtraDataManager::setdockIconOverlayDisabled(bool fDisabled, const QString &strID)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    setExtraDataString(GUI_DockIconOverlayDisabled, toFeatureAllowed(fDisabled), strID);
 }
 #endif /* Q_WS_MAC */
@@ -3826 +3826 @@
                 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, strMachineID));
             /* 'Dock icon overlay' appearance changed (allowed if not restricted)? */
-            else if (strKey == GUI_DockIconOverlayEnabled)
-                emit sigDockIconOverlayAppearanceChange(!isFeatureRestricted(strKey, strMachineID));
+            else if (strKey == GUI_DockIconOverlayDisabled)
+                emit sigDockIconOverlayAppearanceChange(isFeatureAllowed(strKey, strMachineID));
 #endif /* Q_WS_MAC */
         }

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

@@ -463 +463 @@
         void setRealtimeDockIconUpdateMonitor(int iIndex, const QString &strID);
 
-        /** Mac OS X: Returns whether Dock icon overlay is enabled. */
-        bool dockIconOverlayEnabled(const QString &strID);
-        /** Mac OS X: Defines whether Dock icon overlay @a fEnabled. */
-        void setdockIconOverlayEnabled(bool fEnabled, const QString &strID);
+        /** 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);
 #endif /* Q_WS_MAC */
 

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

@@ -121 +121 @@
 void UIAbstractDockIconPreviewHelper::drawOverlayIcons(CGContextRef context)
 {
-    /* Determine whether dock icon overlay enabled: */
-    if (gEDataManager->dockIconOverlayEnabled(vboxGlobal().managedVMUuid()))
+    /* Determine whether dock icon overlay is not disabled: */
+    if (!gEDataManager->dockIconOverlayDisabled(vboxGlobal().managedVMUuid()))
     {
         /* Initialize overlayrect: */

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

@@ -2131 +2131 @@
 }
 
-void UIMachineLogic::sltChangeDockIconOverlayAppearance(bool fEnabled)
+void UIMachineLogic::sltChangeDockIconOverlayAppearance(bool fDisabled)
 {
     /* Value of flag is directly referenced from extra-data manager later: */
-    Q_UNUSED(fEnabled);
+    Q_UNUSED(fDisabled);
     /* Update dock icon overlay: */
     if (isMachineWindowsCreated())

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

@@ -311 +311 @@
     void sltDockPreviewMonitorChanged(QAction *pAction);
     void sltChangeDockIconUpdate(bool fEnabled);
-    void sltChangeDockIconOverlayAppearance(bool fEnabled);
+    /** Handles dock icon overlay change event. */
+    void sltChangeDockIconOverlayAppearance(bool fDisabled);
 #endif /* RT_OS_DARWIN */
 
@@ -397 +398 @@
     QActionGroup *m_pDockPreviewSelectMonitorGroup;
     int m_DockIconPreviewMonitor;
+    /** Holds whether dock icon overlay disabled. */
+    bool m_fIsDockIconOverlayDisabled;
 #endif /* Q_WS_MAC */