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

Timestamp:

Nov 3, 2015 12:32:58 PM (9 years ago)

Author:

vboxsync

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

103883

Message:

FE/Qt: 7909: Mac OS X: Runtime UI: Action-pool: Adding sub-menu option in dock-icon settings for disabling guest-os overlay.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIActionPoolRuntime.cpp (modified) (2 diffs)
• UIActionPoolRuntime.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)

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

@@ -1839 +1839 @@
     }
 };
+
+class UIActionToggleDockIconOverlayDisabled : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleDockIconOverlayDisabled(UIActionPool *pParent)
+        : UIActionToggle(pParent) {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("DockOverlayDisable");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "Disable Dock Icon Overlay"));
+    }
+};
 #endif /* Q_WS_MAC */
-
 
 UIActionPoolRuntime::UIActionPoolRuntime(bool fTemporary /* = false */)
@@ -2128 +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);
 #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,
 #endif /* Q_WS_MAC */
 

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

@@ -1193 +1193 @@
     connect(gEDataManager, SIGNAL(sigDockIconAppearanceChange(bool)),
             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)));
     connect(gEDataManager, SIGNAL(sigDockIconOverlayAppearanceChange(bool)),
             this, SLOT(sltChangeDockIconOverlayAppearance(bool)));
+    /* Add dock icon overlay disabled action to the dock settings menu: */
+    pDockSettingsMenu->addAction(pDockIconOverlayDisabled);
 
     /* Monitor selection if there are more than one monitor */
@@ -2138 +2148 @@
     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());
 }
 #endif /* Q_WS_MAC */

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

@@ -313 +313 @@
     /** Handles dock icon overlay change event. */
     void sltChangeDockIconOverlayAppearance(bool fDisabled);
+    /** Handles dock icon overlay disable action triggering. */
+    void sltDockIconOverlayDisabledChanged(bool fDisabled);
 #endif /* RT_OS_DARWIN */