Changeset 99177 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2023 3:46:06 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10343: Adjust UIUSBFilterDetailsEditor to have line-edits of a bit more suitable size.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QILineEdit.cpp (modified) (2 diffs)
• extensions/QILineEdit.h (modified) (1 diff)
• settings/editors/UIUSBFilterDetailsEditor.cpp (modified) (11 diffs)
• settings/editors/UIUSBFilterDetailsEditor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -71 +71 @@
 void QILineEdit::setMinimumWidthByText(const QString &strText)
 {
-    setMinimumWidth(featTextWidth(strText).width());
+    setMinimumWidth(fitTextWidth(strText).width());
 }
 
 void QILineEdit::setFixedWidthByText(const QString &strText)
 {
-    setFixedWidth(featTextWidth(strText).width());
+    setFixedWidth(fitTextWidth(strText).width());
 }
 
@@ -174 +174 @@
 }
 
-QSize QILineEdit::featTextWidth(const QString &strText) const
+QSize QILineEdit::fitTextWidth(const QString &strText) const
 {
     QStyleOptionFrame sof;

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h

@@ -84 +84 @@
 
     /** Calculates suitable @a strText size. */
-    QSize featTextWidth(const QString &strText) const;
+    QSize fitTextWidth(const QString &strText) const;
 
     /** Holds whether this is allowed to copy contents when disabled. */

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

@@ -30 +30 @@
 #include <QGridLayout>
 #include <QLabel>
-#include <QLineEdit>
 #include <QRegularExpressionValidator>
 
 /* GUI includes: */
 #include "QIDialogButtonBox.h"
+#include "QILineEdit.h"
 #include "UIConverter.h"
 #include "UIUSBFilterDetailsEditor.h"
@@ -245 +245 @@
     /* Adjust dialog size: */
     adjustSize();
-
-#ifdef VBOX_WS_MAC
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    setFixedSize(minimumSize());
-#endif /* VBOX_WS_MAC */
 }
 
@@ -268 +263 @@
         }
         /* Prepare name editor: */
-        m_pEditorName = new QLineEdit(this);
+        m_pEditorName = new QILineEdit(this);
         if (m_pEditorName)
         {
             if (m_pLabelName)
                 m_pLabelName->setBuddy(m_pEditorName);
+            m_pEditorName->setMinimumWidthByText(QString().fill('0', 32));
             m_pEditorName->setValidator(new QRegularExpressionValidator(QRegularExpression(".+"), this));
-
             pLayout->addWidget(m_pEditorName, 0, 1);
         }
@@ -286 +281 @@
         }
         /* Prepare vendor ID editor: */
-        m_pEditorVendorID = new QLineEdit(this);
+        m_pEditorVendorID = new QILineEdit(this);
         if (m_pEditorVendorID)
         {
             if (m_pLabelVendorID)
                 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));
-
             pLayout->addWidget(m_pEditorVendorID, 1, 1);
         }
@@ -304 +299 @@
         }
         /* Prepare product ID editor: */
-        m_pEditorProductID = new QLineEdit(this);
+        m_pEditorProductID = new QILineEdit(this);
         if (m_pEditorProductID)
         {
             if (m_pLabelProductID)
                 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));
-
             pLayout->addWidget(m_pEditorProductID, 2, 1);
         }
@@ -322 +317 @@
         }
         /* Prepare revision editor: */
-        m_pEditorRevision = new QLineEdit(this);
+        m_pEditorRevision = new QILineEdit(this);
         if (m_pEditorRevision)
         {
             if (m_pLabelRevision)
                 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));
-
             pLayout->addWidget(m_pEditorRevision, 3, 1);
         }
@@ -340 +335 @@
         }
         /* Prepare manufacturer editor: */
-        m_pEditorManufacturer = new QLineEdit(this);
+        m_pEditorManufacturer = new QILineEdit(this);
         if (m_pEditorManufacturer)
         {
             if (m_pLabelManufacturer)
                 m_pLabelManufacturer->setBuddy(m_pEditorManufacturer);
+            m_pEditorManufacturer->setMinimumWidthByText(QString().fill('0', 8));
             pLayout->addWidget(m_pEditorManufacturer, 4, 1);
         }
@@ -356 +352 @@
         }
         /* Prepare product editor: */
-        m_pEditorProduct = new QLineEdit(this);
+        m_pEditorProduct = new QILineEdit(this);
         if (m_pEditorProduct)
         {
             if (m_pLabelProduct)
                 m_pLabelProduct->setBuddy(m_pEditorProduct);
+            m_pEditorProduct->setMinimumWidthByText(QString().fill('0', 8));
             pLayout->addWidget(m_pEditorProduct, 5, 1);
         }
@@ -372 +369 @@
         }
         /* Prepare serial NO editor: */
-        m_pEditorSerialNo = new QLineEdit(this);
+        m_pEditorSerialNo = new QILineEdit(this);
         if (m_pEditorSerialNo)
         {
             if (m_pLabelSerialNo)
                 m_pLabelSerialNo->setBuddy(m_pEditorSerialNo);
+            m_pEditorSerialNo->setMinimumWidthByText(QString().fill('0', 8));
             pLayout->addWidget(m_pEditorSerialNo, 6, 1);
         }
@@ -388 +386 @@
         }
         /* Prepare port editor: */
-        m_pEditorPort = new QLineEdit(this);
+        m_pEditorPort = new QILineEdit(this);
         if (m_pEditorPort)
         {
             if (m_pLabelPort)
                 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));
-
             pLayout->addWidget(m_pEditorPort, 7, 1);
         }
@@ -414 +412 @@
             m_pComboRemote->addItem(QString(), QVariant::fromValue(UIRemoteMode_On));  /* Yes */
             m_pComboRemote->addItem(QString(), QVariant::fromValue(UIRemoteMode_Off)); /* No */
-
             pLayout->addWidget(m_pComboRemote, 8, 1);
         }

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

@@ -39 +39 @@
 class QComboBox;
 class QLabel;
-class QLineEdit;
 class QIDialogButtonBox;
+class QILineEdit;
 
 /** QIDialog subclass used as a USB filter editor. */
@@ -119 +119 @@
         QLabel            *m_pLabelName;
         /** Holds the name editor instance. */
-        QLineEdit         *m_pEditorName;
+        QILineEdit        *m_pEditorName;
         /** Holds the vendor ID label instance. */
         QLabel            *m_pLabelVendorID;
         /** Holds the vendor ID editor instance. */
-        QLineEdit         *m_pEditorVendorID;
+        QILineEdit        *m_pEditorVendorID;
         /** Holds the product ID label instance. */
         QLabel            *m_pLabelProductID;
         /** Holds the product ID editor instance. */
-        QLineEdit         *m_pEditorProductID;
+        QILineEdit        *m_pEditorProductID;
         /** Holds the revision label instance. */
         QLabel            *m_pLabelRevision;
         /** Holds the revision editor instance. */
-        QLineEdit         *m_pEditorRevision;
+        QILineEdit        *m_pEditorRevision;
         /** Holds the manufacturer label instance. */
         QLabel            *m_pLabelManufacturer;
         /** Holds the manufacturer editor instance. */
-        QLineEdit         *m_pEditorManufacturer;
+        QILineEdit        *m_pEditorManufacturer;
         /** Holds the product label instance. */
         QLabel            *m_pLabelProduct;
         /** Holds the product editor instance. */
-        QLineEdit         *m_pEditorProduct;
+        QILineEdit        *m_pEditorProduct;
         /** Holds the serial NO label instance. */
         QLabel            *m_pLabelSerialNo;
         /** Holds the serial NO editor instance. */
-        QLineEdit         *m_pEditorSerialNo;
+        QILineEdit        *m_pEditorSerialNo;
         /** Holds the port label instance. */
         QLabel            *m_pLabelPort;
         /** Holds the port editor instance. */
-        QLineEdit         *m_pEditorPort;
+        QILineEdit        *m_pEditorPort;
         /** Holds the remote label instance. */
         QLabel            *m_pLabelRemote;