Changeset 106002 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 10, 2024 11:35:42 AM (5 months ago)

Author:

vboxsync

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

164748

Message:

FE/Qt: bugref:10681: Get rid of QIComboBox dependencies for UIFilePathSelector widget; It's no more required for QComboBox accessibility support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)
• settings/editors/UIRecordingSettingsEditor.cpp (modified) (1 diff)
• widgets/UIFilePathSelector.cpp (modified) (11 diffs)
• widgets/UIFilePathSelector.h (modified) (4 diffs)

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

@@ -457 +457 @@
             if (m_pSelectorPath)
             {
-                m_pLabelPath->setBuddy(m_pSelectorPath->focusProxy());
+                m_pLabelPath->setBuddy(m_pSelectorPath);
                 QString strDefaultMachineFolder = gpGlobalSession->virtualBox().GetSystemProperties().GetDefaultMachineFolder();
                 m_pSelectorPath->setPath(strDefaultMachineFolder);
@@ -480 +480 @@
             if (m_pSelectorImage)
             {
-                m_pLabelImage->setBuddy(m_pSelectorImage->focusProxy());
+                m_pLabelImage->setBuddy(m_pSelectorImage);
                 m_pSelectorImage->setResetEnabled(false);
                 m_pSelectorImage->setMode(UIFilePathSelector::Mode_File_Open);

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

@@ -512 +512 @@
                 {
                     if (m_pLabelFilePath)
-                        m_pLabelFilePath->setBuddy(m_pEditorFilePath->focusProxy());
+                        m_pLabelFilePath->setBuddy(m_pEditorFilePath);
                     m_pEditorFilePath->setEditable(false);
                     m_pEditorFilePath->setMode(UIFilePathSelector::Mode_File_Save);

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

@@ -69 +69 @@
 
 UIFilePathSelector::UIFilePathSelector(QWidget *pParent /* = 0 */)
-    : QIComboBox(pParent)
+    : QComboBox(pParent)
     , m_enmMode(Mode_Folder)
     , m_strInitialPath(QDir::current().absolutePath())
@@ -139 +139 @@
     if (m_fEditable)
     {
-        QIComboBox::setEditable(true);
+        /* Call to base-class: */
+        QComboBox::setEditable(true);
 
         /* Install combo-box event-filter: */
-        Assert(comboBox());
-        comboBox()->installEventFilter(this);
+        this->installEventFilter(this);
+
+        /* Configure a type of line-edit: */
+        setLineEdit(new QILineEdit);
 
         /* Install line-edit connection/event-filter: */
@@ -160 +163 @@
                        this, &UIFilePathSelector::onTextEdited);
         }
-        if (comboBox())
-        {
-            /* Remove combo-box event-filter: */
-            comboBox()->removeEventFilter(this);
-        }
-        QIComboBox::setEditable(false);
-    }
+
+        /* Remove combo-box event-filter: */
+        this->removeEventFilter(this);
+
+        /* Call to base-class: */
+        QComboBox::setEditable(false);
+    }
+}
+
+void UIFilePathSelector::setMarkable(bool fMarkable)
+{
+    QILineEdit *pLineEdit = isEditable() ? qobject_cast<QILineEdit*>(lineEdit()) : 0;
+    if (pLineEdit)
+        pLineEdit->setMarkable(fMarkable);
+}
+
+void UIFilePathSelector::mark(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage)
+{
+    QILineEdit *pLineEdit = isEditable() ? qobject_cast<QILineEdit*>(lineEdit()) : 0;
+    setMarkable(true);
+    if (pLineEdit)
+        pLineEdit->mark(fError, strErrorMessage, strNoErrorMessage);
 }
 
@@ -202 +220 @@
 {
     /* Call to base-class: */
-    QIComboBox::setToolTip(strToolTip);
+    QComboBox::setToolTip(strToolTip);
 
     /* Remember if the tool-tip overriden: */
@@ -244 +262 @@
 {
     /* If the object is private combo-box: */
-    if (pObject == comboBox())
+    if (pObject == this)
     {
         /* Handle focus events related to private child: */
@@ -263 +281 @@
 
     /* Call to base-class: */
-    return QIComboBox::eventFilter(pObject, pEvent);
+    return QComboBox::eventFilter(pObject, pEvent);
 }
 
 void UIFilePathSelector::resizeEvent(QResizeEvent *pEvent)
 {
-    QIComboBox::resizeEvent(pEvent);
+    QComboBox::resizeEvent(pEvent);
     refreshText();
 }
@@ -283 +301 @@
             refreshText();
     }
-    QIComboBox::focusInEvent(pEvent);
+    QComboBox::focusInEvent(pEvent);
 }
 
@@ -293 +311 @@
         refreshText();
     }
-    QIComboBox::focusOutEvent(pEvent);
+    QComboBox::focusOutEvent(pEvent);
 }
 
@@ -561 +579 @@
         /* Set the tool-tip: */
         if (!m_fToolTipOverriden)
-            QIComboBox::setToolTip(fullPath());
+            QComboBox::setToolTip(fullPath());
         setItemData(PathId, toolTip(), Qt::ToolTipRole);
 
@@ -591 +609 @@
             /* Set the tool-tip: */
             if (!m_fToolTipOverriden)
-                QIComboBox::setToolTip(m_strNoneToolTip);
+                QComboBox::setToolTip(m_strNoneToolTip);
             setItemData(PathId, toolTip(), Qt::ToolTipRole);
         }
@@ -611 +629 @@
         /* Set the tool-tip: */
         if (!m_fToolTipOverriden)
-            QIComboBox::setToolTip(fullPath());
+            QComboBox::setToolTip(fullPath());
         setItemData(PathId, toolTip(), Qt::ToolTipRole);
     }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.h

@@ -32 +32 @@
 #endif
 
+/* Qt includes: */
+#include <QComboBox>
+
 /* GUI includes: */
-#include "QIComboBox.h"
 #include "UILibraryDefs.h"
 #include "UIMediumDefs.h"
@@ -49 +51 @@
 class QIToolButton;
 
-/** QIComboBox subclass providing GUI with the
+/** QComboBox subclass providing GUI with the
   * possibility to choose/reflect file/folder path. */
-class SHARED_LIBRARY_STUFF UIFilePathSelector : public QIComboBox
+class SHARED_LIBRARY_STUFF UIFilePathSelector : public QComboBox
 {
     Q_OBJECT;
@@ -78 +80 @@
     };
 
-    /** Constructs file-path selector passing @a pParent to QIComboBox base-class. */
+    /** Constructs file-path selector passing @a pParent to QComboBox base-class. */
     UIFilePathSelector(QWidget *pParent = 0);
 
@@ -90 +92 @@
     /** Returns whether the path is editable. */
     bool isEditable() const { return m_fEditable; }
+    /** Calls QILineEdit member's setMarkable API. */
+    void setMarkable(bool fMarkable);
+    /** Marks the line edit of the combobox. Refer to QILineEdit::mark(..). */
+    void mark(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage);
 
     /** Defines whether the reseting to defauilt path is @a fEnabled. */