Changeset 94445 in vbox

Timestamp:

Apr 1, 2022 5:19:37 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: General page accessibility improvements for Name, System and Description tabs; Get rid of excessive stuff in name editor; Moving description stuff to separate editor.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIMachineDescriptionEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp ) (2 diffs)
• src/settings/editors/UIMachineDescriptionEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h ) (5 diffs)
• src/settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)
• src/settings/editors/UINameAndSystemEditor.h (modified) (1 diff)
• src/settings/machine/UIMachineSettingsGeneral.cpp (modified) (8 diffs)
• src/settings/machine/UIMachineSettingsGeneral.h (modified) (2 diffs)

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

@@ -908 +908 @@
         src/settings/editors/UIMachineAudioFeaturesEditor.h \
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h \
+        src/settings/editors/UIMachineDescriptionEditor.h \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.h \
         src/settings/editors/UIMonitorCountEditor.h \
@@ -1468 +1469 @@
         src/settings/editors/UIMachineAudioFeaturesEditor.cpp \
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp \
+        src/settings/editors/UIMachineDescriptionEditor.cpp \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp \
         src/settings/editors/UIMonitorCountEditor.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAutoCaptureKeyboardEditor class implementation.
+ * VBox Qt GUI - UIMachineDescriptionEditor class implementation.
  */
 
@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QCheckBox>
-#include <QGridLayout>
-#include <QLabel>
+#include <QTextEdit>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-#include "UIAutoCaptureKeyboardEditor.h"
+#include "UIMachineDescriptionEditor.h"
 
 
-UIAutoCaptureKeyboardEditor::UIAutoCaptureKeyboardEditor(QWidget *pParent /* = 0 */)
+UIMachineDescriptionEditor::UIMachineDescriptionEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fValue(false)
-    , m_pLabel(0)
-    , m_pCheckBox(0)
+    , m_pTextEdit(0)
 {
     prepare();
 }
 
-void UIAutoCaptureKeyboardEditor::setValue(bool fValue)
+void UIMachineDescriptionEditor::setValue(const QString &strValue)
 {
     /* Update cached value and
-     * check-box if value has changed: */
-    if (m_fValue != fValue)
+     * text-edit if value has changed: */
+    if (m_strValue != strValue)
     {
-        m_fValue = fValue;
-        if (m_pCheckBox)
-            m_pCheckBox->setCheckState(m_fValue ? Qt::Checked : Qt::Unchecked);
+        m_strValue = strValue;
+        if (m_pTextEdit)
+            m_pTextEdit->setPlainText(strValue);
     }
 }
 
-bool UIAutoCaptureKeyboardEditor::value() const
+QString UIMachineDescriptionEditor::value() const
 {
-    return m_pCheckBox ? m_pCheckBox->checkState() == Qt::Checked : m_fValue;
+    return m_pTextEdit ? m_pTextEdit->toPlainText() : m_strValue;
 }
 
-void UIAutoCaptureKeyboardEditor::retranslateUi()
+void UIMachineDescriptionEditor::retranslateUi()
 {
-    if (m_pLabel)
-        m_pLabel->setText(tr("Extended Features:"));
-    if (m_pCheckBox)
-    {
-        m_pCheckBox->setText(tr("&Auto Capture Keyboard"));
-        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."));
-    }
+    if (m_pTextEdit)
+        m_pTextEdit->setToolTip(tr("Holds the description of the virtual machine. The description field is useful "
+                                   "for commenting on configuration details of the installed guest OS."));
 }
 
-void UIAutoCaptureKeyboardEditor::prepare()
+void UIMachineDescriptionEditor::prepare()
 {
     /* Prepare main layout: */
-    QGridLayout *pLayout = new QGridLayout(this);
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
     if (pLayout)
     {
         pLayout->setContentsMargins(0, 0, 0, 0);
-        pLayout->setColumnStretch(1, 1);
 
-        /* Prepare label: */
-        m_pLabel = new QLabel(this);
-        if (m_pLabel)
-            pLayout->addWidget(m_pLabel, 0, 0);
-        /* Prepare check-box: */
-        m_pCheckBox = new QCheckBox(this);
-        if (m_pCheckBox)
-            pLayout->addWidget(m_pCheckBox, 0, 1);
+        /* Prepare text-edit: */
+        m_pTextEdit = new QTextEdit(this);
+        if (m_pTextEdit)
+        {
+            setFocusProxy(m_pTextEdit);
+            m_pTextEdit->setAcceptRichText(false);
+#ifdef VBOX_WS_MAC
+            m_pTextEdit->setMinimumHeight(150);
+#endif
+
+            pLayout->addWidget(m_pTextEdit);
+        }
     }
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIAutoCaptureKeyboardEditor class declaration.
+ * VBox Qt GUI - UIMachineDescriptionEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIAutoCaptureKeyboardEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIAutoCaptureKeyboardEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIMachineDescriptionEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIMachineDescriptionEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -26 +26 @@
 
 /* Forward declarations: */
-class QCheckBox;
-class QLabel;
+class QTextEdit;
 
-/** QWidget subclass used as an auto capture keyboard editor. */
-class SHARED_LIBRARY_STUFF UIAutoCaptureKeyboardEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as machine description editor. */
+class SHARED_LIBRARY_STUFF UIMachineDescriptionEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -37 +36 @@
 
     /** Constructs editor passing @a pParent to the base-class. */
-    UIAutoCaptureKeyboardEditor(QWidget *pParent = 0);
+    UIMachineDescriptionEditor(QWidget *pParent = 0);
 
-    /** Defines editor @a fValue. */
-    void setValue(bool fValue);
+    /** Defines editor @a strValue. */
+    void setValue(const QString &strValue);
     /** Returns editor value. */
-    bool value() const;
+    QString value() const;
 
 protected:
@@ -55 +54 @@
 
     /** Holds the value to be set. */
-    bool  m_fValue;
+    QString  m_strValue;
 
-    /** Holds the label instance. */
-    QLabel    *m_pLabel;
     /** Holds the check-box instance. */
-    QCheckBox *m_pCheckBox;
+    QTextEdit *m_pTextEdit;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIAutoCaptureKeyboardEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIMachineDescriptionEditor_h */

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

@@ -20 +20 @@
 #include <QGridLayout>
 #include <QLabel>
-#include <QRegularExpressionValidator>
 #include <QVBoxLayout>
 
@@ -264 +263 @@
 }
 
-void UINameAndSystemEditor::setNameFieldValidator(const QString &strValidator)
-{
-    if (!m_pEditorName)
-        return;
-    m_pEditorName->setValidator(new QRegularExpressionValidator(QRegularExpression(strValidator), this));
-}
-
 void UINameAndSystemEditor::markNameEditor(bool fError)
 {

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

@@ -123 +123 @@
     /** Returns the VM OS type. */
     CGuestOSType type() const;
-
-    /** Defines the name-field @a strValidator. */
-    void setNameFieldValidator(const QString &strValidator);
 
     /** Passes the @p fError to QILineEdit::mark(bool) effectively marking it for error. */

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

@@ -32 +32 @@
 #include "UIErrorString.h"
 #include "UIFilePathSelector.h"
+#include "UIMachineDescriptionEditor.h"
 #include "UIMachineSettingsGeneral.h"
 #include "UIModalWindowManager.h"
@@ -148 +149 @@
     , m_pEditorEncryptionPasswordConfirm(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -154 +154 @@
 UIMachineSettingsGeneral::~UIMachineSettingsGeneral()
 {
-    /* Cleanup: */
     cleanup();
 }
@@ -286 +285 @@
     /* Load old 'Description' data from cache: */
     AssertPtrReturnVoid(m_pEditorDescription);
-    m_pEditorDescription->setPlainText(oldGeneralData.m_strDescription);
+    m_pEditorDescription->setValue(oldGeneralData.m_strDescription);
 
     /* Load old 'Encryption' data from cache: */
@@ -323 +322 @@
     /* Gather new 'Description' data: */
     AssertPtrReturnVoid(m_pEditorDescription);
-    newGeneralData.m_strDescription = m_pEditorDescription->toPlainText().isEmpty() ?
-                                      QString() : m_pEditorDescription->toPlainText();
+    newGeneralData.m_strDescription = m_pEditorDescription->value().isEmpty() ?
+                                      QString() : m_pEditorDescription->value();
 
     /* Gather new 'Encryption' data: */
@@ -494 +493 @@
                                        "This feature requires Guest Additions to be installed in the guest OS."));
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabAdvanced), tr("A&dvanced"));
-    m_pEditorDescription->setToolTip(tr("Holds the description of the virtual machine. The description field is useful for "
-                                        "commenting on configuration details of the installed guest OS."));
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabDescription), tr("D&escription"));
     m_pCheckBoxEncryption->setToolTip(tr("When checked, disks attached to this virtual machine will be encrypted."));
@@ -614 +611 @@
             m_pEditorNameAndSystem = new UINameAndSystemEditor(m_pTabBasic);
             if (m_pEditorNameAndSystem)
-            {
-                m_pEditorNameAndSystem->setNameFieldValidator(".+");
                 pLayoutBasic->addWidget(m_pEditorNameAndSystem);
-            }
-
-            /* Add vertical strech: */
+
             pLayoutBasic->addStretch();
         }
@@ -704 +697 @@
         {
             /* Prepare description editor: */
-            m_pEditorDescription = new QTextEdit(m_pTabDescription);
+            m_pEditorDescription = new UIMachineDescriptionEditor(m_pTabDescription);
             if (m_pEditorDescription)
             {
                 m_pEditorDescription->setObjectName(QStringLiteral("m_pEditorDescription"));
-                m_pEditorDescription->setAcceptRichText(false);
-#ifdef VBOX_WS_MAC
-                m_pEditorDescription->setMinimumHeight(150);
-#endif
-
                 pLayoutDescription->addWidget(m_pEditorDescription);
             }

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

@@ -30 +30 @@
 class QComboBox;
 class QLineEdit;
-class QTextEdit;
 class QITabWidget;
+class UIMachineDescriptionEditor;
 class UINameAndSystemEditor;
 
@@ -176 +176 @@
 
         /** Holds the 'Description' tab instance. */
-        QWidget   *m_pTabDescription;
+        QWidget                    *m_pTabDescription;
         /** Holds the description editor instance. */
-        QTextEdit *m_pEditorDescription;
+        UIMachineDescriptionEditor *m_pEditorDescription;
 
         /** Holds the 'Encryption' tab instance. */