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

Timestamp:

May 21, 2013 2:31:39 PM (12 years ago)

Author:

vboxsync

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

85905

Message:

FE/Qt: UI tool-bar cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• selector/UIVMDesktop.cpp (modified) (1 diff)
• widgets/UIToolBar.cpp (modified) (5 diffs)
• widgets/UIToolBar.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -249 +249 @@
             pSpace->setFixedSize(10, 1);
         pToolBar->addWidget(pSpace);
+#ifdef Q_WS_MAC
         pToolBar->updateLayout();
+#endif /* Q_WS_MAC */
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
  *
@@ -6 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +22 @@
 #ifdef Q_WS_MAC
 # include "VBoxUtils.h"
-#endif
+#endif /* Q_WS_MAC */
 
-/* Global includes */
+/* Qt includes: */
 #include <QLayout>
 #include <QMainWindow>
-/* Note: This styles are available on _all_ platforms. */
+/* Note: These styles are available on _all_ platforms: */
 #include <QCleanlooksStyle>
 #include <QWindowsStyle>
 
-UIToolBar::UIToolBar(QWidget *pParent)
+UIToolBar::UIToolBar(QWidget *pParent /*= 0*/)
     : QToolBar(pParent)
-    , m_pMainWindow(qobject_cast <QMainWindow*>(pParent))
+    , m_pMainWindow(qobject_cast<QMainWindow*>(pParent))
 {
+    /* Configure tool-bar: */
     setFloatable(false);
     setMovable(false);
@@ -43 +45 @@
         setStyleSheet("QToolBar { border: 0px none black; }");
 
+    /* Configure layout: */
     if (layout())
         layout()->setContentsMargins(0, 0, 0, 0);;
 
+    /* Configure context-menu policy: */
     setContextMenuPolicy(Qt::NoContextMenu);
-}
-
-#ifdef Q_WS_MAC
-void UIToolBar::setMacToolbar()
-{
-    if (m_pMainWindow)
-        m_pMainWindow->setUnifiedTitleAndToolBarOnMac(true);
-}
-
-void UIToolBar::setShowToolBarButton(bool fShow)
-{
-    ::darwinSetShowsToolbarButton(this, fShow);
-}
-#endif /* Q_WS_MAC */
-
-void UIToolBar::updateLayout()
-{
-#ifdef Q_WS_MAC
-    /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
-       the necessary size of the toolbar is increased. Also for some languages
-       the with doesn't match if the text increase. So manually adjust the size
-       after changing the text. */
-    QSizePolicy sp = sizePolicy();
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    adjustSize();
-    setSizePolicy(sp);
-    layout()->invalidate();
-    layout()->activate();
-#endif /* Q_WS_MAC */
 }
 
@@ -90 +65 @@
 }
 
+#ifdef Q_WS_MAC
+void UIToolBar::setMacToolbar()
+{
+    if (m_pMainWindow)
+        m_pMainWindow->setUnifiedTitleAndToolBarOnMac(true);
+}
+
+void UIToolBar::setShowToolBarButton(bool fShow)
+{
+    ::darwinSetShowsToolbarButton(this, fShow);
+}
+
+void UIToolBar::updateLayout()
+{
+    /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+       the necessary size of the toolbar is increased. Also for some languages
+       the with doesn't match if the text increase. So manually adjust the size
+       after changing the text. */
+    QSizePolicy sp = sizePolicy();
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    adjustSize();
+    setSizePolicy(sp);
+    layout()->invalidate();
+    layout()->activate();
+}
+#endif /* Q_WS_MAC */
+

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define ___UIToolBar_h___
 
-/* Global includes */
+/* Qt includes: */
 #include <QToolBar>
 
-/* Global forward declarations */
+/* Forward declarations: */
 class QMainWindow;
 
-/**
- *  The UIToolBar class is a simple QToolBar reimplementation to disable
- *  its built-in context menu and add some default behavior we need.
- */
+/* UI tool-bar prototype class: */
 class UIToolBar : public QToolBar
 {
 public:
 
-    UIToolBar(QWidget *pParent);
+    /* Constructor: */
+    UIToolBar(QWidget *pParent = 0);
+
+    /* API: Text-label stuff: */
+    void setUsesTextLabel(bool fEnable);
 
 #ifdef Q_WS_MAC
+    /* API: Mac toolbar stuff: */
     void setMacToolbar();
     void setShowToolBarButton(bool fShow);
+    void updateLayout();
 #endif /* Q_WS_MAC */
-
-    void updateLayout();
-    void setUsesTextLabel(bool fEnable);
 
 private:
 
-    /* Private member vars */
+    /* Variables: */
     QMainWindow *m_pMainWindow;
 };
 
-#endif // !___UIToolBar_h___
-
+#endif /* !___UIToolBar_h___ */