Changeset 54527 in vbox

Timestamp:

Feb 26, 2015 1:01:00 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7462: Add menu-bar enable check-box to menu-bar editor opened from the VM settings / Interface page.

Location:

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

Files:

• UIMenuBarEditorWindow.cpp (modified) (7 diffs)
• UIMenuBarEditorWindow.h (modified) (4 diffs)

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

@@ -24 +24 @@
 # include <QPaintEvent>
 # include <QMetaEnum>
+# include <QCheckBox>
 # include <QMenuBar>
 # include <QPainter>
@@ -54 +55 @@
     , m_pToolBar(0)
     , m_pButtonClose(0)
+    , m_pCheckBoxEnable(0)
 {
     /* Prepare: */
@@ -81 +83 @@
         return;
 
+    /* Update enable-checkbox: */
+    updateEnableCheckbox();
+
     /* Update menus: */
     updateMenus();
+}
+
+void UIMenuBarEditorWidget::sltHandleMenuBarEnableToggle(bool fEnabled)
+{
+    /* Toggle enable-checkbox if necessary: */
+    if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
+    {
+        /* Check whether this value is really changed: */
+        const bool fMenuBarEnabled = gEDataManager->menuBarEnabled(machineID());
+        if (fMenuBarEnabled != fEnabled)
+        {
+            /* Set new value: */
+            gEDataManager->setMenuBarEnabled(fEnabled, machineID());
+        }
+    }
 }
 
@@ -236 +256 @@
     {
         /* Configure main-layout: */
-#ifdef Q_WS_MAC
-        /* Standard margins on Mac OS X are too big: */
-        m_pMainLayout->setContentsMargins(10, 5, 10, 10);
-#else /* !Q_WS_MAC */
-        /* Standard margins on Windows/X11: */
         int iLeft, iTop, iRight, iBottom;
         m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        /* Standard margins should not be too big: */
+        iLeft   = qMin(iLeft,   10);
+        iTop    = qMin(iTop,    10);
+        iRight  = qMin(iRight,  10);
+        iBottom = qMin(iBottom, 10);
+        /* Top margin should be smaller for the common case: */
         if (iTop >= 5)
             iTop -= 5;
+        /* Right margin should be bigger for the settings case: */
+        if (m_fStartedFromVMSettings)
+            iRight += 5;
+        /* Apply margins/spacing finally: */
         m_pMainLayout->setContentsMargins(iLeft, iTop, iRight, iBottom);
-#endif /* !Q_WS_MAC */
         m_pMainLayout->setSpacing(0);
         /* Create tool-bar: */
@@ -272 +296 @@
                 /* Add close-button into main-layout: */
                 m_pMainLayout->addWidget(m_pButtonClose);
+            }
+        }
+        /* Create enable-checkbox if necessary: */
+        else
+        {
+            m_pCheckBoxEnable = new QCheckBox;
+            AssertPtrReturnVoid(m_pCheckBoxEnable);
+            {
+                /* Configure enable-checkbox: */
+                m_pCheckBoxEnable->setFocusPolicy(Qt::StrongFocus);
+                connect(m_pCheckBoxEnable, SIGNAL(toggled(bool)), this, SLOT(sltHandleMenuBarEnableToggle(bool)));
+                /* Add enable-checkbox into main-layout: */
+                m_pMainLayout->addWidget(m_pCheckBoxEnable);
+                /* Update enable-checkbox: */
+                updateEnableCheckbox();
             }
         }
@@ -599 +638 @@
 }
 
+void UIMenuBarEditorWidget::updateEnableCheckbox()
+{
+    /* Update enable-checkbox if necessary: */
+    if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
+    {
+        m_pCheckBoxEnable->blockSignals(true);
+        m_pCheckBoxEnable->setChecked(gEDataManager->menuBarEnabled(machineID()));
+        m_pCheckBoxEnable->blockSignals(false);
+    }
+}
+
 void UIMenuBarEditorWidget::updateMenus()
 {
@@ -887 +937 @@
     if (!m_fStartedFromVMSettings && m_pButtonClose)
         m_pButtonClose->setToolTip(tr("Close"));
+    /* Translate enable-checkbox if necessary: */
+    if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
+        m_pCheckBoxEnable->setToolTip(tr("Enable Menu Bar"));
 }
 

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

@@ -31 +31 @@
 class UIAction;
 class QIToolButton;
+class QCheckBox;
 class QHBoxLayout;
 class QAction;
@@ -86 +87 @@
     void sltHandleConfigurationChange(const QString &strMachineID);
 
+    /** Handles menu-bar enable toggle. */
+    void sltHandleMenuBarEnableToggle(bool fEnabled);
     /** Handles menu-bar menu click. */
     void sltHandleMenuBarMenuClick();
@@ -135 +138 @@
     void prepareMenuHelp();
 
-    /** Updates menus routine. */
+    /** Update enable-checkbox routine. */
+    void updateEnableCheckbox();
+    /** Update menus routine. */
     void updateMenus();
 #ifdef Q_WS_MAC
-    /** Mac OS X: Updates 'Application' menu routine. */
+    /** Mac OS X: Update 'Application' menu routine. */
     void updateMenuApplication();
 #endif /* Q_WS_MAC */
-    /** Updates 'Machine' menu routine. */
+    /** Update 'Machine' menu routine. */
     void updateMenuMachine();
-    /** Updates 'View' menu routine. */
+    /** Update 'View' menu routine. */
     void updateMenuView();
-    /** Updates 'Input' menu routine. */
+    /** Update 'Input' menu routine. */
     void updateMenuInput();
-    /** Updates 'Devices' menu routine. */
+    /** Update 'Devices' menu routine. */
     void updateMenuDevices();
 #ifdef VBOX_WITH_DEBUGGER_GUI
-    /** Updates 'Debug' menu routine. */
+    /** Update 'Debug' menu routine. */
     void updateMenuDebug();
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 #ifdef Q_WS_MAC
-    /** Mac OS X: Updates 'Window' menu routine. */
+    /** Mac OS X: Update 'Window' menu routine. */
     void updateMenuWindow();
 #endif /* Q_WS_MAC */
-    /** Updates 'Help' menu routine. */
+    /** Update 'Help' menu routine. */
     void updateMenuHelp();
 
@@ -186 +191 @@
         /** Holds the close-button instance. */
         QIToolButton *m_pButtonClose;
+        /** Holds the enable-checkbox instance. */
+        QCheckBox *m_pCheckBoxEnable;
         /** Holds tool-bar action references. */
         QMap<QString, QAction*> m_actions;