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

Timestamp:

Mar 2, 2010 11:00:50 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Presentation mode belongs to the machine logic not a particular window.

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• UIMachineLogicFullscreen.h (modified) (1 diff)
• UIMachineWindowFullscreen.cpp (modified) (5 diffs)
• UIMachineWindowFullscreen.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -40 +40 @@
 
 #include "VBoxUtils.h"
+
+#ifdef Q_WS_MAC
+# ifdef QT_MAC_USE_COCOA
+#  include <Carbon/Carbon.h>
+# endif /* QT_MAC_USE_COCOA */
+#endif /* Q_WS_MAC */
 
 UIMachineLogicFullscreen::UIMachineLogicFullscreen(QObject *pParent, UISession *pSession, UIActionsPool *pActionsPool)
@@ -152 +158 @@
      * This is necessary for Qt versions > 4.3.3: */
     ::darwinSetFrontMostProcess();
+    setPresentationModeEnabled(true);
 #endif /* Q_WS_MAC */
 
@@ -264 +271 @@
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);
-}
-
+
+#ifdef Q_WS_MAC
+    setPresentationModeEnabled(false);
+#endif/* Q_WS_MAC */
+}
+
+#ifdef Q_WS_MAC
+# ifdef QT_MAC_USE_COCOA
+void UIMachineLogicFullscreen::setPresentationModeEnabled(bool fEnabled)
+{
+    if (fEnabled)
+    {
+        /* First check if we are on the primary screen, only than the
+         * presentation mode have to be changed. */
+        // TODO_NEW_CORE: we need some algorithm to decide which virtual screen
+        // is on which physical host display. Than we can decide on the
+        // presentation mode as well. */
+//        QDesktopWidget* pDesktop = QApplication::desktop();
+//        if (pDesktop->screenNumber(this) == pDesktop->primaryScreen())
+        {
+            QString testStr = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PresentationModeEnabled).toLower();
+            /* Default to false if it is an empty value */
+            if (testStr.isEmpty() || testStr == "false")
+                SetSystemUIMode(kUIModeAllHidden, 0);
+            else
+                SetSystemUIMode(kUIModeAllSuppressed, 0);
+        }
+    }
+    else
+        SetSystemUIMode(kUIModeNormal, 0);
+}
+# endif /* QT_MAC_USE_COCOA */
+#endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h

@@ -60 +60 @@
     void cleanupActionConnections() {}
 
+#ifdef Q_WS_MAC
+# ifdef QT_MAC_USE_COCOA
+    void setPresentationModeEnabled(bool fEnabled);
+# endif /* QT_MAC_USE_COCOA */
+#endif /* Q_WS_MAC */
+
     /* Friend classes: */
     friend class UIMachineLogic;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -36 +36 @@
 #include "UIMachineView.h"
 #include "UIMachineWindowFullscreen.h"
-
-#ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
-#  include <Carbon/Carbon.h>
-# endif /* QT_MAC_USE_COCOA */
-#endif /* Q_WS_MAC */
 
 UIMachineWindowFullscreen::UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId)
@@ -316 +310 @@
        Mac */
     show();
+    move(0,0);
 
 #ifdef Q_WS_MAC
@@ -325 +320 @@
     /* Here we are going really fullscreen */
     setWindowState(windowState() ^ Qt::WindowFullScreen);
-    setPresentationModeEnabled(true);
 
 # ifndef QT_MAC_USE_COCOA
@@ -354 +348 @@
     {
     }
-
-#ifdef Q_WS_MAC
-    setPresentationModeEnabled(false);
-#endif/* Q_WS_MAC */
 }
 
@@ -370 +360 @@
 }
 
-#ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
-void UIMachineWindowFullscreen::setPresentationModeEnabled(bool fEnabled)
-{
-    if (fEnabled)
-    {
-        /* First check if we are on the primary screen, only than the presentation mode have to be changed. */
-        QDesktopWidget* pDesktop = QApplication::desktop();
-        if (pDesktop->screenNumber(this) == pDesktop->primaryScreen())
-        {
-            QString testStr = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PresentationModeEnabled).toLower();
-            /* Default to false if it is an empty value */
-            if (testStr.isEmpty() || testStr == "false")
-                SetSystemUIMode(kUIModeAllHidden, 0);
-            else
-                SetSystemUIMode(kUIModeAllSuppressed, 0);
-        }
-    }
-    else
-        SetSystemUIMode(kUIModeNormal, 0);
-}
-# endif /* QT_MAC_USE_COCOA */
-#endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -99 +99 @@
 
 #ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
-    void setPresentationModeEnabled(bool fEnabled);
-# endif /* QT_MAC_USE_COCOA */
     CGDisplayFadeReservationToken mFadeToken;
 #endif /* Q_WS_MAC */