Changeset 54529 in vbox

Timestamp:

Feb 26, 2015 1:37:25 PM (10 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

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

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

@@ -27 +27 @@
 # include <QMouseEvent>
 # include <QStatusBar>
+# include <QCheckBox>
 # include <QPainter>
 # include <QPixmap>
@@ -264 +265 @@
     , m_pMainLayout(0), m_pButtonLayout(0)
     , m_pButtonClose(0)
+    , m_pCheckBoxEnable(0)
     , m_pButtonDropToken(0)
     , m_fDropAfterTokenButton(true)
@@ -285 +287 @@
         return;
 
+    /* Update enable-checkbox: */
+    updateEnableCheckbox();
+
     /* Update status buttons: */
     updateStatusButtons();
+}
+
+void UIStatusBarEditorWidget::sltHandleStatusBarEnableToggle(bool fEnabled)
+{
+    /* Toggle enable-checkbox if necessary: */
+    if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
+    {
+        /* Check whether this value is really changed: */
+        const bool fStatusBarEnabled = gEDataManager->statusBarEnabled(machineID());
+        if (fStatusBarEnabled != fEnabled)
+        {
+            /* Set new value: */
+            gEDataManager->setStatusBarEnabled(fEnabled, machineID());
+        }
+    }
 }
 
@@ -339 +359 @@
     {
         /* Configure main-layout: */
-#ifdef Q_WS_MAC
-        /* Standard margins on Mac OS X are too big: */
-        m_pMainLayout->setContentsMargins(10, 10, 10, 5);
-#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);
+        /* Bottom margin should be smaller for the common case: */
         if (iBottom >= 5)
             iBottom -= 5;
+        /* Left margin should be bigger for the settings case: */
+        if (m_fStartedFromVMSettings)
+            iLeft += 5;
+        /* Apply margins/spacing finally: */
         m_pMainLayout->setContentsMargins(iLeft, iTop, iRight, iBottom);
-#endif /* !Q_WS_MAC */
         m_pMainLayout->setSpacing(0);
         /* Create close-button if necessary: */
@@ -366 +390 @@
             }
         }
+        /* 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(sltHandleStatusBarEnableToggle(bool)));
+                /* Add enable-checkbox into main-layout: */
+                m_pMainLayout->addWidget(m_pCheckBoxEnable);
+                /* Update enable-checkbox: */
+                updateEnableCheckbox();
+            }
+        }
         /* Insert stretch: */
         m_pMainLayout->addStretch();
@@ -427 +466 @@
 }
 
+void UIStatusBarEditorWidget::updateEnableCheckbox()
+{
+    /* Update enable-checkbox if necessary: */
+    if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
+    {
+        m_pCheckBoxEnable->blockSignals(true);
+        m_pCheckBoxEnable->setChecked(gEDataManager->statusBarEnabled(machineID()));
+        m_pCheckBoxEnable->blockSignals(false);
+    }
+}
+
 void UIStatusBarEditorWidget::updateStatusButtons()
 {
@@ -461 +511 @@
     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 Status Bar"));
 }
 

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

@@ -32 +32 @@
 class QIToolButton;
 class QHBoxLayout;
+class QCheckBox;
 
 /** UISlidingToolBar wrapper
@@ -76 +77 @@
     void sltHandleConfigurationChange(const QString &strMachineID);
 
+    /** Handles status-bar enable toggle. */
+    void sltHandleStatusBarEnableToggle(bool fEnabled);
     /** Handles button click. */
     void sltHandleButtonClick();
@@ -91 +94 @@
     void prepareStatusButton(IndicatorType type);
 
-    /** Updates status buttons. */
+    /** Update enable-checkbox routine. */
+    void updateEnableCheckbox();
+    /** Update status buttons routine. */
     void updateStatusButtons();
 
@@ -130 +135 @@
         /** Holds the close-button instance. */
         QIToolButton *m_pButtonClose;
+        /** Holds the enable-checkbox instance. */
+        QCheckBox *m_pCheckBoxEnable;
         /** Holds status-bar buttons. */
         QMap<IndicatorType, UIStatusBarEditorButton*> m_buttons;