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

Timestamp:

Dec 3, 2013 3:07:30 PM (11 years ago)

Author:

vboxsync

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

91063

Message:

FE/Qt: Mac OS X: Hide mini-toolbar minimize button.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (4 diffs)
• widgets/UIMiniToolBar.h (modified) (3 diffs)

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

@@ -116 +116 @@
         menus << actions.at(i)->menu();
     m_pMiniToolBar->addMenus(menus);
+#ifndef RT_OS_DARWIN
     connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
+#endif /* !RT_OS_DARWIN */
     connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
             gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SLOT(trigger()));

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

@@ -271 +271 @@
         connect(m_pToolbar, SIGNAL(sigResized()), this, SLOT(sltHandleToolbarResize()));
         connect(m_pToolbar, SIGNAL(sigAutoHideToggled()), this, SLOT(sltAutoHideToggled()));
+#ifndef RT_OS_DARWIN
         connect(m_pToolbar, SIGNAL(sigMinimizeAction()), this, SIGNAL(sigMinimizeAction()));
+#endif /* !RT_OS_DARWIN */
         connect(m_pToolbar, SIGNAL(sigExitAction()), this, SIGNAL(sigExitAction()));
         connect(m_pToolbar, SIGNAL(sigCloseAction()), this, SIGNAL(sigCloseAction()));
@@ -427 +429 @@
     , m_pAutoHideAction(0)
     , m_pLabel(0)
+#ifndef RT_OS_DARWIN
     , m_pMinimizeAction(0)
+#endif /* !RT_OS_DARWIN */
     , m_pRestoreAction(0)
     , m_pCloseAction(0)
@@ -607 +611 @@
     m_margins << widgetForAction(addWidget(new QWidget));
 
+#ifndef RT_OS_DARWIN
     /* Minimize action: */
     m_pMinimizeAction = new QAction(this);
@@ -613 +618 @@
     connect(m_pMinimizeAction, SIGNAL(triggered()), this, SIGNAL(sigMinimizeAction()));
     addAction(m_pMinimizeAction);
+#endif /* !RT_OS_DARWIN */
 
     /* Exit action: */

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

@@ -54 +54 @@
 
     /* Notifiers: Action stuff: */
+#ifndef RT_OS_DARWIN
     void sigMinimizeAction();
+#endif /* !RT_OS_DARWIN */
     void sigExitAction();
     void sigCloseAction();
@@ -152 +154 @@
     /* Notifiers: Action stuff: */
     void sigAutoHideToggled();
+#ifndef RT_OS_DARWIN
     void sigMinimizeAction();
+#endif /* !RT_OS_DARWIN */
     void sigExitAction();
     void sigCloseAction();
@@ -202 +206 @@
     QAction *m_pAutoHideAction;
     QLabel *m_pLabel;
+#ifndef RT_OS_DARWIN
     QAction *m_pMinimizeAction;
+#endif /* !RT_OS_DARWIN */
     QAction *m_pRestoreAction;
     QAction *m_pCloseAction;