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

Timestamp:

Aug 11, 2014 3:15:27 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7462: Runtime UI: Menu-bar, menu cleanup/rework (part 16).

Location:

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

Files:

• UIActionPoolRuntime.cpp (modified) (13 diffs)
• UIActionPoolRuntime.h (modified) (3 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.h (modified) (1 diff)

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

@@ -1278 +1278 @@
     if (m_pMultiScreenLayout)
     {
-        disconnect(this, SIGNAL(sigNotifyAboutTriggeringViewMultiscreen(int, int)),
+        disconnect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
                    m_pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
         disconnect(m_pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
@@ -1290 +1290 @@
     if (m_pMultiScreenLayout)
     {
-        connect(this, SIGNAL(sigNotifyAboutTriggeringViewMultiscreen(int, int)),
+        connect(this, SIGNAL(sigNotifyAboutTriggeringViewScreenRemap(int, int)),
                 m_pMultiScreenLayout, SLOT(sltHandleScreenLayoutChange(int, int)));
         connect(m_pMultiScreenLayout, SIGNAL(sigScreenLayoutUpdate()),
@@ -1372 +1372 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-void UIActionPoolRuntime::sltPrepareMenuViewResize()
+void UIActionPoolRuntime::sltPrepareMenuViewScreen()
 {
     /* Make sure sender is valid: */
@@ -1379 +1379 @@
 
     /* Call to corresponding handler: */
-    updateMenuViewResize(pMenu);
+    updateMenuViewScreen(pMenu);
 }
 
@@ -1392 +1392 @@
 }
 
-void UIActionPoolRuntime::sltHandleActionTriggerViewResize(QAction *pAction)
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenResize(QAction *pAction)
 {
     /* Make sure sender is valid: */
@@ -1400 +1400 @@
     const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
     const QSize size = pAction->property("Requested Size").toSize();
-    emit sigNotifyAboutTriggeringViewResize(iGuestScreenIndex, size);
-}
-
-void UIActionPoolRuntime::sltHandleActionTriggerViewMultiscreen(QAction *pAction)
+    emit sigNotifyAboutTriggeringViewScreenResize(iGuestScreenIndex, size);
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenRemap(QAction *pAction)
 {
     /* Make sure sender is valid: */
@@ -1411 +1411 @@
     const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
     const int iHostScreenIndex = pAction->property("Host Screen Index").toInt();
-    emit sigNotifyAboutTriggeringViewMultiscreen(iGuestScreenIndex, iHostScreenIndex);
+    emit sigNotifyAboutTriggeringViewScreenRemap(iGuestScreenIndex, iHostScreenIndex);
 }
 
@@ -1981 +1981 @@
                                                                      "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
-            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewResize()));
+            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
         }
     }
@@ -2051 +2051 @@
                                                                      "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
-            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewResize()));
+            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
         }
     }
@@ -2084 +2084 @@
 }
 
-void UIActionPoolRuntime::updateMenuViewResize(QMenu *pMenu)
+void UIActionPoolRuntime::updateMenuViewScreen(QMenu *pMenu)
 {
     /* Make sure UI session defined: */
@@ -2111 +2111 @@
     const QSize screenSize = QSize(pFrameBuffer->width(), pFrameBuffer->height());
 
-    /* Create exclusive action-group: */
+    /* Create exclusive 'resize' action-group: */
     QActionGroup *pActionGroup = new QActionGroup(pMenu);
     AssertPtrReturnVoid(pActionGroup);
     {
-        /* Configure exclusive action-group: */
+        /* Configure exclusive 'resize' action-group: */
         pActionGroup->setExclusive(true);
         /* For every available size: */
         foreach (const QSize &size, sizes)
         {
-            /* Create exclusive action: */
+            /* Create exclusive 'resize' action: */
             QAction *pAction = pActionGroup->addAction(UIActionPoolRuntime::tr("Resize to %1x%2", "Virtual Screen")
                                                                                .arg(size.width()).arg(size.height()));
             AssertPtrReturnVoid(pAction);
             {
-                /* Configure exclusive action: */
+                /* Configure exclusive 'resize' action: */
                 pAction->setEnabled(session()->isGuestSupportsGraphics());
                 pAction->setProperty("Guest Screen Index", iGuestScreenIndex);
@@ -2141 +2141 @@
         /* Install listener for exclusive action-group: */
         connect(pActionGroup, SIGNAL(triggered(QAction*)),
-                this, SLOT(sltHandleActionTriggerViewResize(QAction*)));
+                this, SLOT(sltHandleActionTriggerViewScreenResize(QAction*)));
     }
 }
@@ -2180 +2180 @@
         /* Install listener for exclusive action-group: */
         connect(pActionGroup, SIGNAL(triggered(QAction*)),
-                this, SLOT(sltHandleActionTriggerViewMultiscreen(QAction*)));
+                this, SLOT(sltHandleActionTriggerViewScreenRemap(QAction*)));
     }
 }

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

@@ -121 +121 @@
 signals:
 
-    /** Notifies about 'View' : 'Resize' menu action trigger. */
-    void sigNotifyAboutTriggeringViewResize(int iGuestScreenIndex, const QSize &size);
-    /** Notifies about 'View' : 'Multiscreen' menu action trigger. */
-    void sigNotifyAboutTriggeringViewMultiscreen(int iGuestScreenIndex, int iHostScreenIndex);
+    /** Notifies about 'View' : 'Virtual Screen #' menu : 'Resize' action trigger. */
+    void sigNotifyAboutTriggeringViewScreenResize(int iGuestScreenIndex, const QSize &size);
+    /** Notifies about 'View' : 'Virtual Screen #' menu : 'Remap' action trigger. */
+    void sigNotifyAboutTriggeringViewScreenRemap(int iGuestScreenIndex, int iHostScreenIndex);
 
 public:
@@ -169 +169 @@
 protected slots:
 
-    /** Prepare 'View' : 'Resize' menu routine. */
-    void sltPrepareMenuViewResize();
-    /** Prepare 'View' : 'Multiscreen' menu routine. */
+    /** Prepare 'View' : 'Virtual Screen #' menu routine (Normal, Scale). */
+    void sltPrepareMenuViewScreen();
+    /** Prepare 'View' : 'Virtual Screen #' menu routine (Fullscreen, Seamless). */
     void sltPrepareMenuViewMultiscreen();
 
-    /** Handles 'View' : 'Resize' menu @a pAction trigger. */
-    void sltHandleActionTriggerViewResize(QAction *pAction);
-    /** Handles 'View' : 'Multiscreen' menu @a pAction trigger. */
-    void sltHandleActionTriggerViewMultiscreen(QAction *pAction);
+    /** Handles 'View' : 'Virtual Screen #' menu : 'Resize' @a pAction trigger. */
+    void sltHandleActionTriggerViewScreenResize(QAction *pAction);
+    /** Handles 'View' : 'Virtual Screen #' menu : 'Remap' @a pAction trigger. */
+    void sltHandleActionTriggerViewScreenRemap(QAction *pAction);
 
     /** Handles screen-layout update. */
@@ -213 +213 @@
     /** Update 'View' : 'Status Bar' menu routine. */
     void updateMenuViewStatusBar();
-    /** Update 'View' : 'Resize' @a pMenu routine. */
-    void updateMenuViewResize(QMenu *pMenu);
-    /** Update 'View' : 'Multiscreen' @a pMenu routine. */
+    /** Update 'View' : 'Virtual Screen #' @a pMenu routine (Normal, Scale). */
+    void updateMenuViewScreen(QMenu *pMenu);
+    /** Update 'View' : 'Virtual Screen #' @a pMenu routine (Fullscreen, Seamless). */
     void updateMenuViewMultiscreen(QMenu *pMenu);
     /** Update 'Devices' menu routine. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -124 +124 @@
 }
 
-void UIMachineLogicNormal::sltHandleActionTriggerViewResize(int iIndex, const QSize &size)
+void UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size)
 {
     /* Resize guest to required size: */
@@ -148 +148 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
             this, SLOT(sltToggleStatusBar()));
-    connect(actionPool(), SIGNAL(sigNotifyAboutTriggeringViewResize(int, const QSize&)),
-            this, SLOT(sltHandleActionTriggerViewResize(int, const QSize&)));
+    connect(actionPool(), SIGNAL(sigNotifyAboutTriggeringViewScreenResize(int, const QSize&)),
+            this, SLOT(sltHandleActionTriggerViewScreenResize(int, const QSize&)));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

@@ -46 +46 @@
     void sltStatusBarSettingsClosed();
     void sltToggleStatusBar();
-    void sltHandleActionTriggerViewResize(int iIndex, const QSize &size);
+    void sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size);
 
 private: