Changeset 99179 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2023 3:58:10 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10343: Adjust reg-exp rules for UIUSBFilterDetailsEditor; Integer values should support ranges now.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUSBFilterDetailsEditor.cpp (modified) (6 diffs)

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

@@ -260 +260 @@
 void UIUSBFilterDetailsEditor::prepareWidgets()
 {
+    /* Name field validation: */
+    const QRegularExpression re1(".+");
+    /* Integer field validation, supports hex ranges: */
+    const QString strHexValue("((0[xX])?[0-9a-fA-F]{1,4})");
+    const QString strRange = QString("(%1|-%1|%1-|%1-%1)").arg(strHexValue);
+    const QString strRanges = QString("(%1(,%1)*)?").arg(strRange);
+    const QRegularExpression re2(strRanges);
+
     /* Prepare main layout: */
     QGridLayout *pLayout = new QGridLayout(this);
@@ -280 +288 @@
                 m_pLabelName->setBuddy(m_pEditorName);
             m_pEditorName->setMinimumWidthByText(QString().fill('0', 32));
-            m_pEditorName->setValidator(new QRegularExpressionValidator(QRegularExpression(".+"), this));
+            m_pEditorName->setValidator(new QRegularExpressionValidator(re1, this));
             connect(m_pEditorName, &QLineEdit::textChanged,
                     this, &UIUSBFilterDetailsEditor::sltRevalidate);
@@ -300 +308 @@
                 m_pLabelVendorID->setBuddy(m_pEditorVendorID);
             m_pEditorVendorID->setMinimumWidthByText(QString().fill('0', 8));
-            m_pEditorVendorID->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]{0,4}"), this));
+            m_pEditorVendorID->setValidator(new QRegularExpressionValidator(re2, this));
             connect(m_pEditorVendorID, &QLineEdit::textChanged,
                     this, &UIUSBFilterDetailsEditor::sltRevalidate);
@@ -320 +328 @@
                 m_pLabelProductID->setBuddy(m_pEditorProductID);
             m_pEditorProductID->setMinimumWidthByText(QString().fill('0', 8));
-            m_pEditorProductID->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]{0,4}"), this));
+            m_pEditorProductID->setValidator(new QRegularExpressionValidator(re2, this));
             connect(m_pEditorProductID, &QLineEdit::textChanged,
                     this, &UIUSBFilterDetailsEditor::sltRevalidate);
@@ -340 +348 @@
                 m_pLabelRevision->setBuddy(m_pEditorRevision);
             m_pEditorRevision->setMinimumWidthByText(QString().fill('0', 8));
-            m_pEditorRevision->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]{0,4}"), this));
+            m_pEditorRevision->setValidator(new QRegularExpressionValidator(re2, this));
             connect(m_pEditorRevision, &QLineEdit::textChanged,
                     this, &UIUSBFilterDetailsEditor::sltRevalidate);
@@ -411 +419 @@
                 m_pLabelPort->setBuddy(m_pEditorPort);
             m_pEditorPort->setMinimumWidthByText(QString().fill('0', 8));
-            m_pEditorPort->setValidator(new QRegularExpressionValidator(QRegularExpression("(0[xX])?[0-9a-fA-F]{0,4}"), this));
+            m_pEditorPort->setValidator(new QRegularExpressionValidator(re2, this));
             connect(m_pEditorPort, &QLineEdit::textChanged,
                     this, &UIUSBFilterDetailsEditor::sltRevalidate);