Changeset 24904 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 24, 2009 2:15:19 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix displaying a "more arrow" after starting a VM

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxSelectorWnd.h (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -46 +46 @@
 class VBoxVMItem;
 class VBoxTrayIcon;
+class VBoxToolBar;
 
 class QTabWidget;
@@ -146 +147 @@
     QMenu *mVMMenu;
     QMenu *mHelpMenu;
+
+    /* Main toolbar */
+    VBoxToolBar *mVMToolBar;
 
     /* VM list context menu */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -477 +477 @@
 
     /* VM list toolbar */
-    VBoxToolBar *vmTools = new VBoxToolBar (this);
+    mVMToolBar = new VBoxToolBar (this);
 #if MAC_LEOPARD_STYLE
     /* Enable unified toolbars on Mac OS X. Available on Qt >= 4.3 */
-    addToolBar (vmTools);
-    vmTools->setMacToolbar();
+    addToolBar (mVMToolBar);
+    mVMToolBar->setMacToolbar();
     /* No spacing/margin on the mac */
     VBoxGlobal::setLayoutMargin (centralLayout, 0);
@@ -535 +535 @@
     /* add actions to the toolbar */
 
-    vmTools->setIconSize (QSize (32, 32));
-    vmTools->setToolButtonStyle (Qt::ToolButtonTextUnderIcon);
-    vmTools->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Preferred);
-
-    vmTools->addAction (mVmNewAction);
-    vmTools->addAction (mVmConfigAction);
+    mVMToolBar->setIconSize (QSize (32, 32));
+    mVMToolBar->setToolButtonStyle (Qt::ToolButtonTextUnderIcon);
+    mVMToolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Preferred);
+
+    mVMToolBar->addAction (mVmNewAction);
+    mVMToolBar->addAction (mVmConfigAction);
 #if 0 /* delete action is really rare */
-    vmTools->addAction (mVmDeleteAction);
+    mVMToolBar->addAction (mVmDeleteAction);
 #endif
-    vmTools->addAction (mVmStartAction);
-    vmTools->addAction (mVmDiscardAction);
+    mVMToolBar->addAction (mVmStartAction);
+    mVMToolBar->addAction (mVmDiscardAction);
 
     /* add actions to menubar */
@@ -721 +721 @@
         int y = mNormalGeo.y();
 #if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
-        /* The toolbar counts to the content not to the frame. Unfortunaly the
-         * toolbar isn't fully initialized when this window will be moved to
-         * the last position after VBox starting. As a workaround just do
+        /* The toolbar counts to the content not to the frame. Unfortunately
+         * the toolbar isn't fully initialized when this window will be moved
+         * to the last position after VBox starting. As a workaround just do
          * remove the toolbar height part when save the last position. */
         y -= ::darwinWindowToolBarHeight (this);
@@ -1475 +1475 @@
         {
             mVmStartAction->setText (tr ("S&tart"));
+#ifdef QT_MAC_USE_COCOA
+            /* There is a bug in Qt Cocoa which result in showing a "more
+             * arrow" when the necessary size of the toolbar is increased. So
+             * manually adjust the size after changing the text. */
+            mVMToolBar->adjustSize();
+#endif /* QT_MAC_USE_COCOA */
             mVmStartAction->setStatusTip (
                 tr ("Start the selected virtual machine"));
@@ -1483 +1489 @@
         {
             mVmStartAction->setText (tr ("S&how"));
+#ifdef QT_MAC_USE_COCOA
+            /* There is a bug in Qt Cocoa which result in showing a "more
+             * arrow" when the necessary size of the toolbar is increased. So
+             * manually adjust the size after changing the text. */
+            mVMToolBar->adjustSize();
+#endif /* QT_MAC_USE_COCOA */
             mVmStartAction->setStatusTip (
                 tr ("Switch to the window of the selected virtual machine"));