Changeset 29014 in vbox for trunk

Timestamp:

May 4, 2010 1:17:17 PM (15 years ago)

Author:

vboxsync

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

61053

Message:

FE/Qt4-OSX: new core: make show window work, when the VM is collapsed into the dock

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UISession.cpp (modified) (7 diffs)
• UISession.h (modified) (1 diff)

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

@@ -434 +434 @@
     connect(uisession(), SIGNAL(sigRuntimeError(bool, const QString &, const QString &)),
             this, SLOT(sltRuntimeError(bool, const QString &, const QString &)));
+
+#ifdef Q_WS_MAC
+    /* Show windows: */
+    connect(uisession(), SIGNAL(sigShowWindows()),
+            this, SLOT(sltShowWindows()));
+#endif /* Q_WS_MAC */
 }
 
@@ -826 +832 @@
 }
 
+#ifdef Q_WS_MAC
+void UIMachineLogic::sltShowWindows()
+{
+    for (int i=0; i < m_machineWindowsList.size(); ++i)
+    {
+        UIMachineWindow *pMachineWindow = m_machineWindowsList.at(i);
+        /* Dunno what Qt thinks a window that has minimized to the dock
+         * should be - it is not hidden, neither is it minimized. OTOH it is
+         * marked shown and visible, but not activated. This latter isn't of
+         * much help though, since at this point nothing is marked activated.
+         * I might have overlooked something, but I'm buggered what if I know
+         * what. So, I'll just always show & activate the stupid window to
+         * make it get out of the dock when the user wishes to show a VM. */
+        pMachineWindow->machineWindow()->raise();
+        pMachineWindow->machineWindow()->activateWindow();
+    }
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineLogic::sltCheckRequestedModes()
 {

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

@@ -135 +135 @@
     virtual void sltUSBDeviceStateChange(const CUSBDevice &device, bool fIsAttached, const CVirtualBoxErrorInfo &error);
     virtual void sltRuntimeError(bool fIsFatal, const QString &strErrorId, const QString &strMessage);
+#ifdef RT_OS_DARWIN
+    virtual void sltShowWindows();
+#endif /* RT_OS_DARWIN */
 
     /* Mode request watch dog: */

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

@@ -231 +231 @@
 
 /* CPU change event: */
-/* Noz used:
+/* Not used:
 class UICPUChangeEvent : public QEvent
 {
@@ -331 +331 @@
 
 /* Can show window event: */
+/* Not used:
 class UICanUIShowWindowEvent : public QEvent
 {
@@ -338 +339 @@
         : QEvent((QEvent::Type)UIConsoleEventType_CanShowWindow) {}
 };
+*/
 
 /* Show window event: */
+#ifdef Q_WS_MAC
 class UIShowWindowEvent : public QEvent
 {
@@ -347 +350 @@
         : QEvent((QEvent::Type)UIConsoleEventType_ShowWindow) {}
 };
+#endif /* Q_WS_MAC */
 
 class UIConsoleCallback : VBOX_SCRIPTABLE_IMPL(IConsoleCallback)
@@ -499 +503 @@
             return E_POINTER;
 
-#if defined (Q_WS_MAC)
+#ifdef Q_WS_MAC
         /* Let's try the simple approach first - grab the focus.
          * Getting a window out of the dock (minimized or whatever it's called)
@@ -516 +520 @@
             *puWinId = ::darwinGetCurrentProcessId();
         }
-#else
+#else /* Q_WS_MAC */
         /* Return the ID of the top-level console window. */
         *puWinId = (ULONG64)m_pEventHandler->winId();
-#endif
+#endif /* !Q_WS_MAC */
 
         return S_OK;
@@ -1138 +1142 @@
 
 #ifdef Q_WS_MAC
-        /* posted OnShowWindow */
         case UIConsoleEventType_ShowWindow:
         {
-            /* Dunno what Qt3 thinks a window that has minimized to the dock
-             * should be - it is not hidden, neither is it minimized. OTOH it is
-             * marked shown and visible, but not activated. This latter isn't of
-             * much help though, since at this point nothing is marked activated.
-             * I might have overlooked something, but I'm buggered what if I know
-             * what. So, I'll just always show & activate the stupid window to
-             * make it get out of the dock when the user wishes to show a VM. */
-#if 0
-            // TODO_NEW_CORE
-            window()->show();
-            window()->activateWindow();
-#endif
+            emit sigShowWindows();
+            /* Accept event: */
+            pEvent->accept();
             return true;
         }

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

@@ -168 +168 @@
     void sigSharedFolderChange();
     void sigRuntimeError(bool bIsFatal, const QString &strErrorId, const QString &strMessage);
+#ifdef RT_OS_DARWIN
+    void sigShowWindows();
+#endif /* RT_OS_DARWIN */
 
     /* Session signals: */