Changeset 69858 in vbox

Timestamp:

Nov 28, 2017 10:56:02 AM (7 years ago)

Author:

vboxsync

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

119303

Message:

FE/Qt bugref:8939. MacOS 'dock icon preview menu' is correctly updated as new screens are added/removed

Location:

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

Files:

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

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

@@ -783 +783 @@
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->showInNecessaryMode();
+
+#ifdef VBOX_WS_MAC
+    /* Update dock: */
+    updateDock();
+#endif
 }
 
@@ -833 +838 @@
     , m_pDockIconPreview(0)
     , m_pDockPreviewSelectMonitorGroup(0)
+    , m_pDockSettingsMenuSeparator(0)
     , m_DockIconPreviewMonitor(0)
 #endif /* VBOX_WS_MAC */
@@ -1253 +1259 @@
     pDockSettingsMenu->addAction(pDockIconDisableOverlay);
 
-    /* Monitor selection if there are more than one monitor */
-    int cGuestScreens = machine().GetMonitorCount();
-    if (cGuestScreens > 1)
-    {
-        pDockSettingsMenu->addSeparator();
-        m_DockIconPreviewMonitor = qMin(gEDataManager->realtimeDockIconUpdateMonitor(vboxGlobal().managedVMUuid()),
-                                        cGuestScreens - 1);
+    /* If we have more than one visible window: */
+    const QList<int> visibleWindowsList = uisession()->listOfVisibleWindows();
+    const int cVisibleGuestScreens = visibleWindowsList.size();
+    if (cVisibleGuestScreens > 1)
+    {
+        /* Add separator: */
+        m_pDockSettingsMenuSeparator = pDockSettingsMenu->addSeparator();
+
+        int extraDataUpdateMonitor = gEDataManager->realtimeDockIconUpdateMonitor(vboxGlobal().managedVMUuid());
+        if (visibleWindowsList.contains(extraDataUpdateMonitor))
+            m_DockIconPreviewMonitor = extraDataUpdateMonitor;
+        else
+            m_DockIconPreviewMonitor = visibleWindowsList.at(cVisibleGuestScreens - 1);
+
         m_pDockPreviewSelectMonitorGroup = new QActionGroup(this);
-        for (int i = 0; i < cGuestScreens; ++i)
+
+        /* And dock preview actions: */
+        for (int i = 0; i < cVisibleGuestScreens; ++i)
         {
             QAction *pAction = new QAction(m_pDockPreviewSelectMonitorGroup);
             pAction->setCheckable(true);
-            pAction->setData(i);
-            if (m_DockIconPreviewMonitor == i)
+            pAction->setData(visibleWindowsList.at(i));
+            if (m_DockIconPreviewMonitor == visibleWindowsList.at(i))
                 pAction->setChecked(true);
         }
@@ -1297 +1312 @@
     setDockIconPreviewEnabled(fEnabled);
     updateDockOverlay();
+}
+
+void UIMachineLogic::updateDock()
+{
+    QMenu *pDockSettingsMenu = actionPool()->action(UIActionIndexRT_M_Dock_M_DockSettings)->menu();
+    /* Clean the previous preview actions: */
+    if (m_pDockPreviewSelectMonitorGroup)
+    {
+        QList<QAction*> previewActions = m_pDockPreviewSelectMonitorGroup->actions();
+        foreach (QAction *pAction, previewActions)
+        {
+            pDockSettingsMenu->removeAction(pAction);
+            m_pDockPreviewSelectMonitorGroup->removeAction(pAction);
+            delete pAction;
+        }
+    }
+    const QList<int> visibleWindowsList = uisession()->listOfVisibleWindows();
+    const int cVisibleGuestScreens = visibleWindowsList.size();
+    if (cVisibleGuestScreens > 1)
+    {
+        if (!m_pDockPreviewSelectMonitorGroup)
+            m_pDockPreviewSelectMonitorGroup = new QActionGroup(this);
+        /* Only if currently selected monitor for icon preview is not enabled: */
+        if (!visibleWindowsList.contains(m_DockIconPreviewMonitor))
+        {
+            int iExtraDataUpdateMonitor = gEDataManager->realtimeDockIconUpdateMonitor(vboxGlobal().managedVMUuid());
+            if (visibleWindowsList.contains(iExtraDataUpdateMonitor))
+                m_DockIconPreviewMonitor = iExtraDataUpdateMonitor;
+            else
+                m_DockIconPreviewMonitor = visibleWindowsList.at(cVisibleGuestScreens - 1);
+        }
+        if (!m_pDockSettingsMenuSeparator)
+            m_pDockSettingsMenuSeparator = pDockSettingsMenu->addSeparator();
+        for (int i = 0; i < cVisibleGuestScreens; ++i)
+        {
+            QAction *pAction = new QAction(m_pDockPreviewSelectMonitorGroup);
+            pAction->setCheckable(true);
+            pAction->setData(visibleWindowsList.at(i));
+            pAction->setText(QApplication::translate("UIActionPool", "Preview Monitor %1").arg(pAction->data().toInt() + 1));
+            if (m_DockIconPreviewMonitor == visibleWindowsList.at(i))
+                pAction->setChecked(true);
+        }
+        pDockSettingsMenu->addActions(m_pDockPreviewSelectMonitorGroup->actions());
+        connect(m_pDockPreviewSelectMonitorGroup, SIGNAL(triggered(QAction*)),
+                this, SLOT(sltDockPreviewMonitorChanged(QAction*)));
+    }
+    else
+    {
+        m_DockIconPreviewMonitor = 0;
+        /* Remove the seperator as well: */
+        if (m_pDockSettingsMenuSeparator)
+        {
+            pDockSettingsMenu->removeAction(m_pDockSettingsMenuSeparator);
+            delete m_pDockSettingsMenuSeparator;
+            m_pDockSettingsMenuSeparator = 0;
+        }
+    }
 }
 #endif /* VBOX_WS_MAC */

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

@@ -225 +225 @@
 #ifdef VBOX_WS_MAC
     virtual void prepareDock();
+    virtual void updateDock();
 #endif /* VBOX_WS_MAC */
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -406 +407 @@
     UIDockIconPreview *m_pDockIconPreview;
     QActionGroup *m_pDockPreviewSelectMonitorGroup;
+    QAction *m_pDockSettingsMenuSeparator;
     int m_DockIconPreviewMonitor;
 #endif /* VBOX_WS_MAC */

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

@@ -2076 +2076 @@
 }
 
+QList<int> UISession::listOfVisibleWindows() const
+{
+    QList<int> visibleWindows;
+    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
+        if (m_monitorVisibilityVector.at(i))
+            visibleWindows.push_back(i);
+    return visibleWindows;
+}
+
 void UISession::loadVMSettings()
 {

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

@@ -274 +274 @@
     /** Returns VM's effective paravirtualization provider. */
     KParavirtProvider paraVirtProvider() const { return m_paraVirtProvider; }
+
+    /** Returns the list of visible guest windows. */
+    QList<int> listOfVisibleWindows() const;
 
 signals: