Changeset 52344 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 11, 2014 3:29:06 PM (11 years ago)

Author:

vboxsync

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

95469

Message:

FE/Qt: 6840: Runtime UI: View menu: Virtual Screen #N sub-menu: Action to enable/disable non-primary guest-screens for multi-monitor case.

Location:

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

Files:

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

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

@@ -1390 +1390 @@
     /* Call to corresponding handler: */
     updateMenuViewMultiscreen(pMenu);
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenToggle()
+{
+    /* Make sure sender is valid: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertPtrReturnVoid(pAction);
+
+    /* Send request to enable/disable guest-screen: */
+    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
+    const bool fScreenEnabled = pAction->isChecked();
+    emit sigNotifyAboutTriggeringViewScreenToggle(iGuestScreenIndex, fScreenEnabled);
 }
 
@@ -2110 +2122 @@
     const UIFrameBuffer* pFrameBuffer = session()->frameBuffer(iGuestScreenIndex);
     const QSize screenSize = QSize(pFrameBuffer->width(), pFrameBuffer->height());
+    const bool fScreenEnabled = session()->isScreenVisible(iGuestScreenIndex);
+
+    /* For non-primary screens: */
+    if (iGuestScreenIndex > 0)
+    {
+        /* Create 'toggle' action: */
+        QAction *pToggleAction = pMenu->addAction(UIActionPoolRuntime::tr("Enable", "Virtual Screen"),
+                                                  this, SLOT(sltHandleActionTriggerViewScreenToggle()));
+        AssertPtrReturnVoid(pToggleAction);
+        {
+            /* Configure 'toggle' action: */
+            pToggleAction->setEnabled(session()->isGuestSupportsGraphics());
+            pToggleAction->setProperty("Guest Screen Index", iGuestScreenIndex);
+            pToggleAction->setCheckable(true);
+            pToggleAction->setChecked(fScreenEnabled);
+            /* Add separator: */
+            pMenu->addSeparator();
+        }
+    }
 
     /* Create exclusive 'resize' action-group: */
@@ -2126 +2157 @@
             {
                 /* Configure exclusive 'resize' action: */
-                pAction->setEnabled(session()->isGuestSupportsGraphics());
+                pAction->setEnabled(session()->isGuestSupportsGraphics() && fScreenEnabled);
                 pAction->setProperty("Guest Screen Index", iGuestScreenIndex);
                 pAction->setProperty("Requested Size", size);

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

@@ -121 +121 @@
 signals:
 
+    /** Notifies about 'View' : 'Virtual Screen #' menu : 'Toggle' action trigger. */
+    void sigNotifyAboutTriggeringViewScreenToggle(int iGuestScreenIndex, bool fEnabled);
     /** Notifies about 'View' : 'Virtual Screen #' menu : 'Resize' action trigger. */
     void sigNotifyAboutTriggeringViewScreenResize(int iGuestScreenIndex, const QSize &size);
@@ -174 +176 @@
     void sltPrepareMenuViewMultiscreen();
 
+    /** Handles 'View' : 'Virtual Screen #' menu : 'Toggle' action trigger. */
+    void sltHandleActionTriggerViewScreenToggle();
     /** Handles 'View' : 'Virtual Screen #' menu : 'Resize' @a pAction trigger. */
     void sltHandleActionTriggerViewScreenResize(QAction *pAction);

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

@@ -124 +124 @@
 }
 
+void UIMachineLogicNormal::sltHandleActionTriggerViewScreenToggle(int iIndex, bool fEnabled)
+{
+    /* Enable/disable guest keeping current size: */
+    ULONG uWidth, uHeight, uBitsPerPixel;
+    LONG uOriginX, uOriginY;
+    CDisplay display = session().GetConsole().GetDisplay();
+    display.GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY);
+    if (!fEnabled)
+        display.SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
+    else
+    {
+        /* Defaults: */
+        if (!uWidth)
+            uWidth = 800;
+        if (!uHeight)
+            uHeight = 600;
+        display.SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
+    }
+}
+
 void UIMachineLogicNormal::sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size)
 {
@@ -148 +168 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
             this, SLOT(sltToggleStatusBar()));
+    connect(actionPool(), SIGNAL(sigNotifyAboutTriggeringViewScreenToggle(int, bool)),
+            this, SLOT(sltHandleActionTriggerViewScreenToggle(int, bool)));
     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 sltHandleActionTriggerViewScreenToggle(int iIndex, bool fEnabled);
     void sltHandleActionTriggerViewScreenResize(int iIndex, const QSize &size);