Changeset 94518 in vbox

Timestamp:

Apr 7, 2022 2:51:27 PM (3 years ago)

Author:

vboxsync

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

150863

Message:

FE/Qt/Ds: bugref:6899: Machine settings: User Interface page accessibility improvements; Moving mini-toolbar stuff to separate editor.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIMiniToolbarSettingsEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.cpp ) (4 diffs)
• src/settings/editors/UIMiniToolbarSettingsEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.h ) (6 diffs)
• src/settings/machine/UIMachineSettingsInterface.cpp (modified) (17 diffs)
• src/settings/machine/UIMachineSettingsInterface.h (modified) (3 diffs)
• src/widgets/UIMenuBarEditorWindow.cpp (modified) (1 diff)
• src/widgets/UIStatusBarEditorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -912 +912 @@
         src/settings/editors/UIMachineDescriptionEditor.h \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.h \
+        src/settings/editors/UIMiniToolbarSettingsEditor.h \
         src/settings/editors/UIMonitorCountEditor.h \
         src/settings/editors/UINameAndSystemEditor.h \
@@ -1477 +1478 @@
         src/settings/editors/UIMachineDescriptionEditor.cpp \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp \
+        src/settings/editors/UIMiniToolbarSettingsEditor.cpp \
         src/settings/editors/UIMonitorCountEditor.cpp \
         src/settings/editors/UINameAndSystemEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIMachineAudioFeaturesEditor class implementation.
+ * VBox Qt GUI - UIMiniToolbarSettingsEditor class implementation.
  */
 
@@ -22 +22 @@
 
 /* GUI includes: */
-#include "UIMachineAudioFeaturesEditor.h"
+#include "UIMiniToolbarSettingsEditor.h"
 
 
-UIMachineAudioFeaturesEditor::UIMachineAudioFeaturesEditor(QWidget *pParent /* = 0 */)
+UIMiniToolbarSettingsEditor::UIMiniToolbarSettingsEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fEnableOutput(false)
-    , m_fEnableInput(false)
+    , m_fShowMiniToolbar(false)
+    , m_fMiniToolbarAtTop(false)
     , m_pLabel(0)
-    , m_pCheckBoxEnableOutput(0)
-    , m_pCheckBoxEnableInput(0)
+    , m_pCheckBoxShowMiniToolBar(0)
+    , m_pCheckBoxMiniToolBarAtTop(0)
 {
     prepare();
 }
 
-void UIMachineAudioFeaturesEditor::setEnableOutput(bool fOn)
+void UIMiniToolbarSettingsEditor::setShowMiniToolbar(bool fOn)
 {
     /* Update cached value and
      * check-box if value has changed: */
-    if (m_fEnableOutput != fOn)
+    if (m_fShowMiniToolbar != fOn)
     {
-        m_fEnableOutput = fOn;
-        if (m_pCheckBoxEnableOutput)
-            m_pCheckBoxEnableOutput->setCheckState(m_fEnableOutput ? Qt::Checked : Qt::Unchecked);
+        m_fShowMiniToolbar = fOn;
+        if (m_pCheckBoxShowMiniToolBar)
+            m_pCheckBoxShowMiniToolBar->setCheckState(m_fShowMiniToolbar ? Qt::Checked : Qt::Unchecked);
     }
 }
 
-bool UIMachineAudioFeaturesEditor::outputEnabled() const
+bool UIMiniToolbarSettingsEditor::showMiniToolbar() const
 {
-    return   m_pCheckBoxEnableOutput
-           ? m_pCheckBoxEnableOutput->checkState() == Qt::Checked
-           : m_fEnableOutput;
+    return   m_pCheckBoxShowMiniToolBar
+           ? m_pCheckBoxShowMiniToolBar->checkState() == Qt::Checked
+           : m_fShowMiniToolbar;
 }
 
-void UIMachineAudioFeaturesEditor::setEnableInput(bool fOn)
+void UIMiniToolbarSettingsEditor::setMiniToolbarAtTop(bool fOn)
 {
     /* Update cached value and
      * check-box if value has changed: */
-    if (m_fEnableInput != fOn)
+    if (m_fMiniToolbarAtTop != fOn)
     {
-        m_fEnableInput = fOn;
-        if (m_pCheckBoxEnableInput)
-            m_pCheckBoxEnableInput->setCheckState(m_fEnableInput ? Qt::Checked : Qt::Unchecked);
+        m_fMiniToolbarAtTop = fOn;
+        if (m_pCheckBoxMiniToolBarAtTop)
+            m_pCheckBoxMiniToolBarAtTop->setCheckState(m_fMiniToolbarAtTop ? Qt::Checked : Qt::Unchecked);
     }
 }
 
-bool UIMachineAudioFeaturesEditor::inputEnabled() const
+bool UIMiniToolbarSettingsEditor::miniToolbarAtTop() const
 {
-    return   m_pCheckBoxEnableInput
-           ? m_pCheckBoxEnableInput->checkState() == Qt::Checked
-           : m_fEnableInput;
+    return   m_pCheckBoxMiniToolBarAtTop
+           ? m_pCheckBoxMiniToolBarAtTop->checkState() == Qt::Checked
+           : m_fMiniToolbarAtTop;
 }
 
-int UIMachineAudioFeaturesEditor::minimumLabelHorizontalHint() const
+int UIMiniToolbarSettingsEditor::minimumLabelHorizontalHint() const
 {
     return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
-void UIMachineAudioFeaturesEditor::setMinimumLayoutIndent(int iIndent)
+void UIMiniToolbarSettingsEditor::setMinimumLayoutIndent(int iIndent)
 {
     if (m_pLayout)
@@ -85 +85 @@
 }
 
-void UIMachineAudioFeaturesEditor::retranslateUi()
+void UIMiniToolbarSettingsEditor::retranslateUi()
 {
     if (m_pLabel)
-        m_pLabel->setText(tr("Extended Features:"));
-    if (m_pCheckBoxEnableOutput)
+        m_pLabel->setText(tr("Mini ToolBar:"));
+    if (m_pCheckBoxShowMiniToolBar)
     {
-        m_pCheckBoxEnableOutput->setText(tr("Enable Audio &Output"));
-        m_pCheckBoxEnableOutput->setToolTip(tr("When checked, output to the virtual audio device will reach the host. "
-                                               "Otherwise the guest is muted."));
+        m_pCheckBoxShowMiniToolBar->setText(tr("Show in &Full-screen/Seamless"));
+        m_pCheckBoxShowMiniToolBar->setToolTip(tr("When checked, show the Mini ToolBar in full-screen and seamless modes."));
     }
-    if (m_pCheckBoxEnableInput)
+    if (m_pCheckBoxMiniToolBarAtTop)
     {
-        m_pCheckBoxEnableInput->setText(tr("Enable Audio &Input"));
-        m_pCheckBoxEnableInput->setToolTip(tr("When checked, the guest will be able to capture audio input from the host. "
-                                              "Otherwise the guest will capture only silence."));
+        m_pCheckBoxMiniToolBarAtTop->setText(tr("Show at &Top of Screen"));
+        m_pCheckBoxMiniToolBarAtTop->setToolTip(tr("When checked, show the Mini ToolBar at the top of the screen, rather than in "
+                                                   "its default position at the bottom of the screen."));
     }
 }
 
-void UIMachineAudioFeaturesEditor::prepare()
+void UIMiniToolbarSettingsEditor::prepare()
 {
     /* Prepare main layout: */
@@ -120 +119 @@
         }
         /* Prepare 'enable output' check-box: */
-        m_pCheckBoxEnableOutput = new QCheckBox(this);
-        if (m_pCheckBoxEnableOutput)
-            m_pLayout->addWidget(m_pCheckBoxEnableOutput, 0, 1);
+        m_pCheckBoxShowMiniToolBar = new QCheckBox(this);
+        if (m_pCheckBoxShowMiniToolBar)
+            m_pLayout->addWidget(m_pCheckBoxShowMiniToolBar, 0, 1);
         /* Prepare 'enable input' check-box: */
-        m_pCheckBoxEnableInput = new QCheckBox(this);
-        if (m_pCheckBoxEnableInput)
-            m_pLayout->addWidget(m_pCheckBoxEnableInput, 1, 1);
+        m_pCheckBoxMiniToolBarAtTop = new QCheckBox(this);
+        if (m_pCheckBoxMiniToolBarAtTop)
+            m_pLayout->addWidget(m_pCheckBoxMiniToolBarAtTop, 1, 1);
+    }
+
+    /* Prepare connections and widget availability: */
+    if (   m_pCheckBoxShowMiniToolBar
+        && m_pCheckBoxMiniToolBarAtTop)
+    {
+        connect(m_pCheckBoxShowMiniToolBar, &QCheckBox::toggled,
+                m_pCheckBoxMiniToolBarAtTop, &QCheckBox::setEnabled);
+        m_pCheckBoxMiniToolBarAtTop->setEnabled(m_pCheckBoxShowMiniToolBar->isChecked());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMiniToolbarSettingsEditor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIMachineAudioFeaturesEditor class declaration.
+ * VBox Qt GUI - UIMiniToolbarSettingsEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIMachineAudioFeaturesEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIMachineAudioFeaturesEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIMiniToolbarSettingsEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIMiniToolbarSettingsEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -30 +30 @@
 class QLabel;
 
-/** QWidget subclass used as machine audio features editor. */
-class SHARED_LIBRARY_STUFF UIMachineAudioFeaturesEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as mini-toolbar editor. */
+class SHARED_LIBRARY_STUFF UIMiniToolbarSettingsEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -38 +38 @@
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIMachineAudioFeaturesEditor(QWidget *pParent = 0);
+    UIMiniToolbarSettingsEditor(QWidget *pParent = 0);
 
-    /** Defines whether 'enable output' feature in @a fOn. */
-    void setEnableOutput(bool fOn);
-    /** Returns 'enable output' feature value. */
-    bool outputEnabled() const;
+    /** Defines whether 'show mini-toolbar' feature in @a fOn. */
+    void setShowMiniToolbar(bool fOn);
+    /** Returns 'show mini-toolbar' feature value. */
+    bool showMiniToolbar() const;
 
-    /** Defines whether 'enable input' feature in @a fOn. */
-    void setEnableInput(bool fOn);
-    /** Returns 'enable input' feature value. */
-    bool inputEnabled() const;
+    /** Defines whether 'mini-toolbar at top' feature in @a fOn. */
+    void setMiniToolbarAtTop(bool fOn);
+    /** Returns 'mini-toolbar at top' feature value. */
+    bool miniToolbarAtTop() const;
 
     /** Returns minimum layout hint. */
@@ -67 +67 @@
     /** @name Values
      * @{ */
-        /** Holds the 'enable output' feature value. */
-        bool  m_fEnableOutput;
-        /** Holds the 'enable input' feature value. */
-        bool  m_fEnableInput;
+        /** Holds the 'show mini-toolbar' feature value. */
+        bool  m_fShowMiniToolbar;
+        /** Holds the 'mini-toolbar at top' feature value. */
+        bool  m_fMiniToolbarAtTop;
     /** @} */
 
@@ -79 +79 @@
         /** Holds the label instance. */
         QLabel      *m_pLabel;
-        /** Holds the 'enable output' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableOutput;
-        /** Holds the 'enable input' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableInput;
+        /** Holds the 'show mini-toolbar' check-box instance. */
+        QCheckBox   *m_pCheckBoxShowMiniToolBar;
+        /** Holds the 'mini-toolbar alignment' check-box instance. */
+        QCheckBox   *m_pCheckBoxMiniToolBarAtTop;
     /** @} */
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIMachineAudioFeaturesEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIMiniToolbarSettingsEditor_h */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -27 +25 @@
 #include "UIStatusBarEditorWindow.h"
 #include "UIMenuBarEditorWindow.h"
+#include "UIMiniToolbarSettingsEditor.h"
 #include "UIVisualStateEditor.h"
 
@@ -52 +51 @@
         , m_restrictionsOfMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Invalid)
 #ifndef VBOX_WS_MAC
-        , m_fShowMiniToolBar(false)
-        , m_fMiniToolBarAtTop(false)
+        , m_fShowMiniToolbar(false)
+        , m_fMiniToolbarAtTop(false)
 #endif /* !VBOX_WS_MAC */
         , m_enmVisualState(UIVisualStateType_Invalid)
@@ -82 +81 @@
                && (m_restrictionsOfMenuHelp == other.m_restrictionsOfMenuHelp)
 #ifndef VBOX_WS_MAC
-               && (m_fShowMiniToolBar == other.m_fShowMiniToolBar)
-               && (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop)
+               && (m_fShowMiniToolbar == other.m_fShowMiniToolbar)
+               && (m_fMiniToolbarAtTop == other.m_fMiniToolbarAtTop)
 #endif /* !VBOX_WS_MAC */
                && (m_enmVisualState == other.m_enmVisualState)
@@ -130 +129 @@
 #ifndef VBOX_WS_MAC
     /** Holds whether the mini-toolbar is enabled. */
-    bool  m_fShowMiniToolBar;
+    bool  m_fShowMiniToolbar;
     /** Holds whether the mini-toolbar should be aligned at top of screen. */
-    bool  m_fMiniToolBarAtTop;
+    bool  m_fMiniToolbarAtTop;
 #endif /* !VBOX_WS_MAC */
 
@@ -144 +143 @@
     , m_pActionPool(0)
     , m_pCache(0)
-    , m_pLayout(0)
     , m_pEditorMenuBar(0)
     , m_pEditorVisualState(0)
-    , m_pLabelMiniToolBar(0)
-    , m_pCheckBoxShowMiniToolBar(0)
-    , m_pCheckBoxMiniToolBarAlignment(0)
+    , m_pEditorMiniToolabSettings(0)
     , m_pEditorStatusBar(0)
 {
@@ -197 +193 @@
     oldInterfaceData.m_restrictionsOfMenuHelp = gEDataManager->restrictedRuntimeMenuHelpActionTypes(m_machine.GetId());
 #ifndef VBOX_WS_MAC
-    oldInterfaceData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
-    oldInterfaceData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
+    oldInterfaceData.m_fShowMiniToolbar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
+    oldInterfaceData.m_fMiniToolbarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
 #endif
     oldInterfaceData.m_enmVisualState = gEDataManager->requestedVisualState(m_machine.GetId());
@@ -235 +231 @@
     m_pEditorMenuBar->setRestrictionsOfMenuHelp(oldInterfaceData.m_restrictionsOfMenuHelp);
 #ifndef VBOX_WS_MAC
-    m_pCheckBoxShowMiniToolBar->setChecked(oldInterfaceData.m_fShowMiniToolBar);
-    m_pCheckBoxMiniToolBarAlignment->setChecked(oldInterfaceData.m_fMiniToolBarAtTop);
+    m_pEditorMiniToolabSettings->setShowMiniToolbar(oldInterfaceData.m_fShowMiniToolbar);
+    m_pEditorMiniToolabSettings->setMiniToolbarAtTop(oldInterfaceData.m_fMiniToolbarAtTop);
 #endif
     m_pEditorVisualState->setMachineId(m_machine.GetId());
@@ -274 +270 @@
     newInterfaceData.m_restrictionsOfMenuHelp = m_pEditorMenuBar->restrictionsOfMenuHelp();
 #ifndef VBOX_WS_MAC
-    newInterfaceData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
-    newInterfaceData.m_fMiniToolBarAtTop = m_pCheckBoxMiniToolBarAlignment->isChecked();
+    newInterfaceData.m_fShowMiniToolbar = m_pEditorMiniToolabSettings->showMiniToolbar();
+    newInterfaceData.m_fMiniToolbarAtTop = m_pEditorMiniToolabSettings->miniToolbarAtTop();
 #endif
     newInterfaceData.m_enmVisualState = m_pEditorVisualState->value();
@@ -297 +293 @@
 void UIMachineSettingsInterface::retranslateUi()
 {
-    m_pEditorMenuBar->setToolTip(tr("Allows to modify VM menu-bar contents."));
-    m_pLabelMiniToolBar->setText(tr("Mini ToolBar:"));
-    m_pCheckBoxShowMiniToolBar->setText(tr("Show in &Full-screen/Seamless"));
-    m_pCheckBoxShowMiniToolBar->setToolTip(tr("When checked, show the Mini ToolBar in full-screen and seamless modes."));
-    m_pCheckBoxMiniToolBarAlignment->setText(tr("Show at &Top of Screen"));
-    m_pCheckBoxMiniToolBarAlignment->setToolTip(tr("When checked, show the Mini ToolBar at the top of the screen, rather than in "
-                                                   "its default position at the bottom of the screen."));
-    m_pEditorStatusBar->setToolTip(tr("Allows to modify VM status-bar contents."));
-
     /* These editors have own labels, but we want them to be properly layouted according to each other: */
     int iMinimumLayoutHint = 0;
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVisualState->minimumLabelHorizontalHint());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelMiniToolBar->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMiniToolabSettings->minimumLabelHorizontalHint());
     m_pEditorVisualState->setMinimumLayoutIndent(iMinimumLayoutHint);
-    m_pLayout->setColumnMinimumWidth(0, iMinimumLayoutHint);
+    m_pEditorMiniToolabSettings->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
 
@@ -319 +306 @@
     m_pEditorMenuBar->setEnabled(isMachineInValidMode());
 #ifdef VBOX_WS_MAC
-    m_pLabelMiniToolBar->hide();
-    m_pCheckBoxShowMiniToolBar->hide();
-    m_pCheckBoxMiniToolBarAlignment->hide();
-#else /* !VBOX_WS_MAC */
-    m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
-    m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
-    m_pCheckBoxMiniToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
-#endif /* !VBOX_WS_MAC */
+    m_pEditorMiniToolabSettings->hide();
+#else
+    m_pEditorMiniToolabSettings->setEnabled(isMachineInValidMode());
+#endif
     m_pEditorStatusBar->setEnabled(isMachineInValidMode());
 }
@@ -350 +333 @@
 {
     /* Prepare main layout: */
-    m_pLayout = new QGridLayout(this);
-    if (m_pLayout)
-    {
-        m_pLayout->setColumnStretch(1, 1);
-        m_pLayout->setRowStretch(4, 1);
-
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
+    {
         /* Prepare menu-bar editor: */
         m_pEditorMenuBar = new UIMenuBarEditorWidget(this);
@@ -363 +343 @@
             m_pEditorMenuBar->setMachineID(m_uMachineId);
 
-            m_pLayout->addWidget(m_pEditorMenuBar, 0, 0, 1, 3);
+            pLayout->addWidget(m_pEditorMenuBar);
         }
 
@@ -369 +349 @@
         m_pEditorVisualState = new UIVisualStateEditor(this);
         if (m_pEditorVisualState)
-            m_pLayout->addWidget(m_pEditorVisualState, 1, 0, 1, 3);
-
-        /* Prepare mini-toolbar label: */
-        m_pLabelMiniToolBar = new QLabel(this);
-        if (m_pLabelMiniToolBar)
-        {
-            m_pLabelMiniToolBar->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            m_pLayout->addWidget(m_pLabelMiniToolBar, 2, 0);
-        }
-        /* Prepare 'show mini-toolbar' check-box: */
-        m_pCheckBoxShowMiniToolBar = new QCheckBox(this);
-        if (m_pCheckBoxShowMiniToolBar)
-            m_pLayout->addWidget(m_pCheckBoxShowMiniToolBar, 2, 1);
-        /* Prepare 'mini-toolbar alignment' check-box: */
-        m_pCheckBoxMiniToolBarAlignment = new QCheckBox(this);
-        if (m_pCheckBoxMiniToolBarAlignment)
-            m_pLayout->addWidget(m_pCheckBoxMiniToolBarAlignment, 3, 1);
+            pLayout->addWidget(m_pEditorVisualState);
+
+        /* Prepare mini-toolbar settings editor: */
+        m_pEditorMiniToolabSettings = new UIMiniToolbarSettingsEditor(this);
+        if (m_pEditorMiniToolabSettings)
+            pLayout->addWidget(m_pEditorMiniToolabSettings);
+
+        pLayout->addStretch();
 
         /* Prepare status-bar editor: */
@@ -392 +363 @@
         {
             m_pEditorStatusBar->setMachineID(m_uMachineId);
-            m_pLayout->addWidget(m_pEditorStatusBar, 5, 0, 1, 3);
+            pLayout->addWidget(m_pEditorStatusBar);
         }
     }
@@ -399 +370 @@
 void UIMachineSettingsInterface::prepareConnections()
 {
-    connect(m_pCheckBoxShowMiniToolBar, &QCheckBox::toggled,
-            m_pCheckBoxMiniToolBarAlignment, &UIMachineSettingsInterface::setEnabled);
 }
 
@@ -530 +499 @@
 #ifndef VBOX_WS_MAC
         /* Save whether mini-toolbar is enabled: */
-        if (fSuccess && newInterfaceData.m_fShowMiniToolBar != oldInterfaceData.m_fShowMiniToolBar)
-            /* fSuccess = */ gEDataManager->setMiniToolbarEnabled(newInterfaceData.m_fShowMiniToolBar, m_machine.GetId());
+        if (fSuccess && newInterfaceData.m_fShowMiniToolbar != oldInterfaceData.m_fShowMiniToolbar)
+            /* fSuccess = */ gEDataManager->setMiniToolbarEnabled(newInterfaceData.m_fShowMiniToolbar, m_machine.GetId());
         /* Save whether mini-toolbar should be location at top of screen: */
-        if (fSuccess && newInterfaceData.m_fMiniToolBarAtTop != oldInterfaceData.m_fMiniToolBarAtTop)
-            /* fSuccess = */ gEDataManager->setMiniToolbarAlignment(newInterfaceData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
+        if (fSuccess && newInterfaceData.m_fMiniToolbarAtTop != oldInterfaceData.m_fMiniToolbarAtTop)
+            /* fSuccess = */ gEDataManager->setMiniToolbarAlignment(newInterfaceData.m_fMiniToolbarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
 #endif
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -26 +26 @@
 
 /* Forward declarations: */
-class QCheckBox;
-class QGridLayout;
 class QLabel;
 class UIActionPool;
 class UIMenuBarEditorWidget;
+class UIMiniToolbarSettingsEditor;
 class UIStatusBarEditorWidget;
 class UIVisualStateEditor;
@@ -96 +95 @@
 
     /** Holds the machine ID copy. */
-    const QUuid    m_uMachineId;
+    const QUuid   m_uMachineId;
     /** Holds the action-pool instance. */
-    UIActionPool  *m_pActionPool;
+    UIActionPool *m_pActionPool;
 
     /** Holds the page data cache instance. */
@@ -105 +104 @@
     /** @name Widgets
      * @{ */
-        /** Holds the main layout instance. */
-        QGridLayout             *m_pLayout;
         /** Holds the menu-bar editor instance. */
-        UIMenuBarEditorWidget   *m_pEditorMenuBar;
+        UIMenuBarEditorWidget       *m_pEditorMenuBar;
         /** Holds the visual state editor instance. */
-        UIVisualStateEditor     *m_pEditorVisualState;
-        /** Holds the mini-toolbar label instance. */
-        QLabel                  *m_pLabelMiniToolBar;
-        /** Holds the 'show mini-toolbar' check-box instance. */
-        QCheckBox               *m_pCheckBoxShowMiniToolBar;
-        /** Holds the 'mini-toolbar alignment' check-box instance. */
-        QCheckBox               *m_pCheckBoxMiniToolBarAlignment;
+        UIVisualStateEditor         *m_pEditorVisualState;
+        /** Holds the mini-toolbar settings editor instance. */
+        UIMiniToolbarSettingsEditor *m_pEditorMiniToolabSettings;
         /** Holds the status-bar editor instance. */
-        UIStatusBarEditorWidget *m_pEditorStatusBar;
+        UIStatusBarEditorWidget     *m_pEditorStatusBar;
     /** @} */
 };

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

@@ -658 +658 @@
 void UIMenuBarEditorWidget::retranslateUi()
 {
+    /* Translate widget itself: */
+    setToolTip(tr("Allows to modify VM menu-bar contents."));
+
     /* Translate close-button if necessary: */
     if (!m_fStartedFromVMSettings && m_pButtonClose)

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

@@ -485 +485 @@
 void UIStatusBarEditorWidget::retranslateUi()
 {
+    /* Translate widget itself: */
+    setToolTip(tr("Allows to modify VM status-bar contents."));
+
     /* Translate close-button if necessary: */
     if (!m_fStartedFromVMSettings && m_pButtonClose)