Changeset 93936 in vbox

Timestamp:

Feb 24, 2022 4:50:21 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Global preferences: Reworking Input page to utilize labels of editors it uses; This also increases page accessibility.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• editors/UIAutoCaptureKeyboardEditor.cpp (modified) (3 diffs)
• editors/UIAutoCaptureKeyboardEditor.h (modified) (2 diffs)
• editors/UIShortcutConfigurationEditor.cpp (modified) (1 diff)
• global/UIGlobalSettingsInput.cpp (modified) (5 diffs)
• global/UIGlobalSettingsInput.h (modified) (2 diffs)

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

@@ -25 +25 @@
 
 
-UIAutoCaptureKeyboardEditor::UIAutoCaptureKeyboardEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
+UIAutoCaptureKeyboardEditor::UIAutoCaptureKeyboardEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabel(fWithLabel)
     , m_fValue(false)
     , m_pLabel(0)
@@ -60 +59 @@
     if (m_pCheckBox)
     {
-        m_pCheckBox->setWhatsThis(tr("When checked, the keyboard is automatically captured every time the VM window is "
-                                     "activated. When the keyboard is captured, all keystrokes (including system ones like "
-                                     "Alt-Tab) are directed to the VM."));
+        m_pCheckBox->setToolTip(tr("When checked, the keyboard is automatically captured every time the VM window is "
+                                   "activated. When the keyboard is captured, all keystrokes (including system ones like "
+                                   "Alt-Tab) are directed to the VM."));
         m_pCheckBox->setText(tr("&Auto Capture Keyboard"));
     }
@@ -75 +74 @@
         pLayoutMain->setContentsMargins(0, 0, 0, 0);
         pLayoutMain->setColumnStretch(1, 1);
-        int iColumn = 0;
 
         /* Prepare label: */
-        if (m_fWithLabel)
-        {
-            m_pLabel = new QLabel(this);
-            if (m_pLabel)
-                pLayoutMain->addWidget(m_pLabel, 0, iColumn++);
-        }
+        m_pLabel = new QLabel(this);
+        if (m_pLabel)
+            pLayoutMain->addWidget(m_pLabel, 0, 0);
         /* Prepare check-box: */
         m_pCheckBox = new QCheckBox(this);
         if (m_pCheckBox)
-            pLayoutMain->addWidget(m_pCheckBox, 0, iColumn++);
+            pLayoutMain->addWidget(m_pCheckBox, 0, 1);
     }
 

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

@@ -36 +36 @@
 public:
 
-    /** Constructs auto capture keyboard editor passing @a pParent to the base-class.
-      * @param  fWithLabel  Brings whether we should add label ourselves. */
-    UIAutoCaptureKeyboardEditor(QWidget *pParent = 0, bool fWithLabel = false);
+    /** Constructs auto capture keyboard editor passing @a pParent to the base-class. */
+    UIAutoCaptureKeyboardEditor(QWidget *pParent = 0);
 
     /** Defines editor @a fValue. */
@@ -55 +54 @@
     void prepare();
 
-    /** Holds whether descriptive label should be created. */
-    bool  m_fWithLabel;
-
     /** Holds the value to be set. */
     bool  m_fValue;

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

@@ -855 +855 @@
     m_pTableManager->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
     m_pTableRuntime->setWhatsThis(tr("Lists all available shortcuts which can be configured."));
-    m_pEditorFilterManager->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
-    m_pEditorFilterRuntime->setWhatsThis(tr("Holds a sequence to filter the shortcut list."));
+    m_pEditorFilterManager->setToolTip(tr("Holds a sequence to filter the shortcut list."));
+    m_pEditorFilterRuntime->setToolTip(tr("Holds a sequence to filter the shortcut list."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QCheckBox>
-#include <QGridLayout>
-#include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -68 +67 @@
     : m_pCache(0)
     , m_pEditorShortcutConfiguration(0)
-    , m_pLabelInputExtended(0)
     , m_pEditorAutoCaptureKeyboard(0)
 {
@@ -179 +177 @@
 void UIGlobalSettingsInput::retranslateUi()
 {
-    m_pLabelInputExtended->setText(tr("Extended Features:"));
 }
 
@@ -199 +196 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
+    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
     if (pLayoutMain)
     {
@@ -205 +202 @@
         m_pEditorShortcutConfiguration = new UIShortcutConfigurationEditor(this);
         if (m_pEditorShortcutConfiguration)
-            pLayoutMain->addWidget(m_pEditorShortcutConfiguration, 0, 0, 1, 2);
-
-        /* Prepare input extended label: */
-        m_pLabelInputExtended = new QLabel(this);
-        if (m_pLabelInputExtended)
-        {
-            m_pLabelInputExtended->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelInputExtended, 1, 0);
-        }
+            pLayoutMain->addWidget(m_pEditorShortcutConfiguration);
+
         /* Prepare 'auto capture keyboard' editor: */
         m_pEditorAutoCaptureKeyboard = new UIAutoCaptureKeyboardEditor(this);
         if (m_pEditorAutoCaptureKeyboard)
-            pLayoutMain->addWidget(m_pEditorAutoCaptureKeyboard, 1, 1);
+            pLayoutMain->addWidget(m_pEditorAutoCaptureKeyboard);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h

@@ -26 +26 @@
 
 /* Forward declarations: */
-class QLabel;
 class UIAutoCaptureKeyboardEditor;
 class UIShortcutConfigurationEditor;
@@ -87 +86 @@
         /** Holds the 'shortcut configuration' editor instance. */
         UIShortcutConfigurationEditor *m_pEditorShortcutConfiguration;
-        /** Holds the input extended label instance. */
-        QLabel                        *m_pLabelInputExtended;
         /** Holds the 'auto capture keyboard' editor instance. */
         UIAutoCaptureKeyboardEditor   *m_pEditorAutoCaptureKeyboard;