Changeset 28964 in vbox

Timestamp:

May 3, 2010 9:46:46 AM (15 years ago)

Author:

vboxsync

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

60978

Message:

FE/Qt4: new core: no mini toolbar in seamless on Mac OS X

Location:

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

Files:

• UIMachineWindowSeamless.cpp (modified) (13 diffs)
• UIMachineWindowSeamless.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -27 +27 @@
 /* Local includes */
 #include "VBoxGlobal.h"
-#include "VBoxMiniToolBar.h"
+#ifndef Q_WS_MAC
+# include "VBoxMiniToolBar.h"
+#endif /* Q_WS_MAC */
 
 #include "UIActionsPool.h"
@@ -44 +46 @@
     , UIMachineWindow(pMachineLogic, uScreenId)
     , m_pMainMenu(0)
+#ifndef Q_WS_MAC
     , m_pMiniToolBar(0)
+#endif /* Q_WS_MAC */
 {
     /* "This" is machine window: */
@@ -72 +76 @@
 
     /* Prepare mini tool-bar: */
+#ifndef Q_WS_MAC
     prepareMiniToolBar();
+#endif /* Q_WS_MAC */
 
     /* Retranslate fullscreen window finally: */
@@ -130 +136 @@
 }
 
+#ifndef Q_WS_MAC
 void UIMachineWindowSeamless::sltUpdateMiniToolBarMask()
 {
@@ -135 +142 @@
         setMask(machineView()->lastVisibleRegion());
 }
+#endif /* Q_WS_MAC */
 
 void UIMachineWindowSeamless::sltTryClose()
@@ -222 +230 @@
 }
 
+#ifndef Q_WS_MAC
 void UIMachineWindowSeamless::prepareMiniToolBar()
 {
@@ -250 +259 @@
     }
 }
+#endif /* Q_WS_MAC */
 
 void UIMachineWindowSeamless::prepareMachineView()
@@ -292 +302 @@
 void UIMachineWindowSeamless::saveWindowSettings()
 {
+#ifndef Q_WS_MAC
     /* Get machine: */
     CMachine machine = session().GetConsole().GetMachine();
@@ -301 +312 @@
             machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
     }
+#endif /* Q_WS_MAC */
 }
 
@@ -325 +337 @@
 
     /* If mini tool-bar is present: */
+#ifndef Q_WS_MAC
     if (m_pMiniToolBar)
     {
@@ -339 +352 @@
         m_pMiniToolBar->setDisplayText(machine.GetName() + strSnapshotName);
     }
+#endif /* Q_WS_MAC */
 }
 
@@ -369 +383 @@
 
     /* Mini tool-bar: */
+#ifndef Q_WS_MAC
     if (m_pMiniToolBar)
     {
@@ -387 +402 @@
         region += toolBarRegion;
     }
+#endif /* Q_WS_MAC */
 
 #if 0 // TODO: Is it really needed now?

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -55 +55 @@
     void sltPopupMainMenu();
 
+#ifndef RT_OS_DARWIN /* Something is *really* broken in regards of the moc here */
     /* Update mini tool-bar mask: */
     void sltUpdateMiniToolBarMask();
+#endif /* RT_OS_DARWIN */
 
     /* Close window reimplementation: */
@@ -78 +80 @@
     void prepareSeamless();
     void prepareMenu();
+#ifndef Q_WS_MAC
     void prepareMiniToolBar();
+#endif /* Q_WS_MAC */
     void prepareMachineView();
 #ifdef Q_WS_MAC
@@ -87 +91 @@
     void saveWindowSettings();
     void cleanupMachineView();
+#ifndef Q_WS_MAC
     //void cleanupMiniToolBar() {}
+#endif /* Q_WS_MAC */
     void cleanupMenu();
     //void cleanupSeamless() {}
@@ -100 +106 @@
     /* Private variables: */
     QMenu *m_pMainMenu;
+#ifndef Q_WS_MAC
     VBoxMiniToolBar *m_pMiniToolBar;
+#endif /* Q_WS_MAC */
 #ifdef Q_WS_WIN
     QRegion m_prevRegion;