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

Timestamp:

Mar 5, 2010 12:49:55 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: presentation mode

Location:

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

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (3 diffs)

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

@@ -539 +539 @@
     connect(&vboxGlobal(), SIGNAL(dockIconUpdateChanged(const VBoxChangeDockIconUpdateEvent &)),
             this, SLOT(sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &)));
-    /* Presentation Mode connection */
-    connect(&vboxGlobal(), SIGNAL(presentationModeChanged(const VBoxChangePresentationModeEvent &)),
-            this, SLOT(sltChangePresentationMode(const VBoxChangePresentationModeEvent &)));
 
     /* Overlay logo for the dock icon */
@@ -1141 +1138 @@
     updateDockOverlay();
 }
-
-# ifdef QT_MAC_USE_COCOA
-void UIMachineView::sltChangePresentationMode(const VBoxChangePresentationModeEvent &event)
-{
-    // TODO_NEW_CORE
-    // this is full screen related
-#if 0
-    if (mIsFullscreen)
-    {
-        /* 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
-}
-# endif /* QT_MAC_USE_COCOA */
 #endif
 
@@ -2661 +2632 @@
 }
 
-void UIMachineView::setMouseCoalescingEnabled (bool aOn)
+void UIMachineView::setMouseCoalescingEnabled(bool fOn)
 {
     /* Enable mouse event compression if we leave the VM view. This
@@ -2670 +2641 @@
        the keyboard/mouse is grabbed (this is when we have a valid
        event handler). */
-    if (aOn || m_fKeyboardGrabbed)
-        ::darwinSetMouseCoalescingEnabled (aOn);
+    if (fOn || m_fKeyboardGrabbed)
+        ::darwinSetMouseCoalescingEnabled(fOn);
 }
 #endif /* Q_WS_MAC */

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

@@ -43 +43 @@
 #ifdef Q_WS_MAC
 class VBoxChangeDockIconUpdateEvent;
-class VBoxChangePresentationModeEvent;
 class VBoxDockIconPreview;
 #endif /* Q_WS_MAC */
@@ -80 +79 @@
     void updateDockIcon();
     void updateDockOverlay();
-    void setMouseCoalescingEnabled(bool aOn);
+    void setMouseCoalescingEnabled(bool fOn);
     void setDockIconEnabled(bool aOn) { mDockIconEnabled = aOn; };
 #endif
@@ -171 +170 @@
     /* Dock icon update handler */
     void sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &event);
-# ifdef QT_MAC_USE_COCOA
-    /* Presentation mode handler */
-    void sltChangePresentationMode(const VBoxChangePresentationModeEvent &event);
-# endif
 #endif
 

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

@@ -151 +151 @@
 }
 
+#ifdef Q_WS_MAC
+void UIMachineLogicFullscreen::prepareConsoleConnections()
+{
+    /* Base class connections: */
+    UIMachineLogic::prepareConsoleConnections();
+
+    /* Presentation mode connection */
+    connect (&vboxGlobal(), SIGNAL(presentationModeChanged(const VBoxChangePresentationModeEvent &)),
+             this, SLOT(sltChangePresentationMode(const VBoxChangePresentationModeEvent &)));
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineLogicFullscreen::prepareActionGroups()
 {
@@ -303 +315 @@
 
 #ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
+void UIMachineLogicFullscreen::sltChangePresentationMode(const VBoxChangePresentationModeEvent & /* event */)
+{
+    setPresentationModeEnabled(true);
+}
+
 void UIMachineLogicFullscreen::setPresentationModeEnabled(bool fEnabled)
 {
@@ -327 +343 @@
         SetSystemUIMode(kUIModeNormal, 0);
 }
-# endif /* QT_MAC_USE_COCOA */
 #endif /* Q_WS_MAC */

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

@@ -29 +29 @@
 /* Local forwards */
 class UIActionsPool;
+class VBoxChangePresentationModeEvent;
 
 class UIMachineLogicFullscreen : public UIMachineLogic
@@ -45 +46 @@
     void initialize();
 
+private slots:
+
+#ifdef Q_WS_MAC
+    void sltChangePresentationMode(const VBoxChangePresentationModeEvent &event);
+#endif /* Q_WS_MAC */
+
 private:
 
     /* Prepare helpers: */
+#ifdef Q_WS_MAC
+    void prepareConsoleConnections();
+#endif /* Q_WS_MAC */
     void prepareActionGroups();
     void prepareMachineWindows();
@@ -56 +66 @@
 
 #ifdef Q_WS_MAC
-# ifdef QT_MAC_USE_COCOA
     void setPresentationModeEnabled(bool fEnabled);
-# endif /* QT_MAC_USE_COCOA */
 #endif /* Q_WS_MAC */