Changeset 44831 in vbox

Timestamp:

Feb 26, 2013 4:01:56 PM (12 years ago)

Author:

vboxsync

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

83971

Message:

FE/Qt: Multi-screen support: Cleanup multi-screen layout (part 3).

Location:

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

Files:

• UIMultiScreenLayout.cpp (modified) (3 diffs)
• UIMultiScreenLayout.h (modified) (2 diffs)

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

@@ -42 +42 @@
     : m_pMachineLogic(pMachineLogic)
     , m_pScreenMap(new QMap<int, int>())
+    , m_pViewMenu(0)
 {
     /* Calculate host/guest screen count: */
@@ -50 +51 @@
 UIMultiScreenLayout::~UIMultiScreenLayout()
 {
+    /* Cleanup screen-map: */
     delete m_pScreenMap;
-    while (!m_screenMenuList.isEmpty())
-    {
-        delete m_screenMenuList.first();
-        m_screenMenuList.removeFirst();
-    }
+    /* Cleanup view-menu: */
+    cleanupViewMenu();
 }
 
 void UIMultiScreenLayout::setViewMenu(QMenu *pViewMenu)
 {
-    if (m_cHostScreens > 1)
-    {
-        pViewMenu->addSeparator();
-        for (int i = 0; i < m_cGuestScreens; ++i)
-        {
-            m_screenMenuList << pViewMenu->addMenu(tr("Virtual Screen %1").arg(i + 1));
-            m_screenMenuList.last()->menuAction()->setData(true);
-            QActionGroup *pScreenGroup = new QActionGroup(m_screenMenuList.last());
-            pScreenGroup->setExclusive(true);
-            connect(pScreenGroup, SIGNAL(triggered(QAction*)), this, SLOT(sltScreenLayoutChanged(QAction*)));
-            for (int a = 0; a < m_cHostScreens; ++a)
-            {
-                QAction *pAction = pScreenGroup->addAction(tr("Use Host Screen %1").arg(a + 1));
-                pAction->setCheckable(true);
-                pAction->setData(RT_MAKE_U32(i, a));
-            }
-            m_screenMenuList.last()->addActions(pScreenGroup->actions());
-        }
-    }
+    /* Assign view-menu: */
+    m_pViewMenu = pViewMenu;
+    /* Prepare view-menu: */
+    prepareViewMenu();
 }
 
@@ -284 +268 @@
 }
 
+void UIMultiScreenLayout::prepareViewMenu()
+{
+    /* Make sure view-menu was set: */
+    if (!m_pViewMenu)
+        return;
+
+    /* Cleanup menu first: */
+    cleanupViewMenu();
+
+    /* If we do have more than one host screen: */
+    if (m_cHostScreens > 1)
+    {
+        for (int i = 0; i < m_cGuestScreens; ++i)
+        {
+            m_screenMenuList << m_pViewMenu->addMenu(tr("Virtual Screen %1").arg(i + 1));
+            m_screenMenuList.last()->menuAction()->setData(true);
+            QActionGroup *pScreenGroup = new QActionGroup(m_screenMenuList.last());
+            pScreenGroup->setExclusive(true);
+            connect(pScreenGroup, SIGNAL(triggered(QAction*)), this, SLOT(sltScreenLayoutChanged(QAction*)));
+            for (int a = 0; a < m_cHostScreens; ++a)
+            {
+                QAction *pAction = pScreenGroup->addAction(tr("Use Host Screen %1").arg(a + 1));
+                pAction->setCheckable(true);
+                pAction->setData(RT_MAKE_U32(i, a));
+            }
+            m_screenMenuList.last()->addActions(pScreenGroup->actions());
+        }
+    }
+}
+
+void UIMultiScreenLayout::cleanupViewMenu()
+{
+    /* Make sure view-menu was set: */
+    if (!m_pViewMenu)
+        return;
+
+    /* Cleanup view-menu actions: */
+    while (!m_screenMenuList.isEmpty())
+        delete m_screenMenuList.takeFirst();
+}
+
 quint64 UIMultiScreenLayout::memoryRequirements(const QMap<int, int> *pScreenLayout) const
 {

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

@@ -68 +68 @@
     void calculateHostMonitorCount();
     void calculateGuestScreenCount();
+    void prepareViewMenu();
+
+    /* Helper: Cleanup stuff: */
+    void cleanupViewMenu();
 
     /* Other helpers: */
@@ -77 +81 @@
     int m_cHostScreens;
     QMap<int, int> *m_pScreenMap;
+    QMenu *m_pViewMenu;
     QList<QMenu*> m_screenMenuList;
 };