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

Timestamp:

Sep 17, 2019 1:08:09 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9335: Connecting to text change rather than text edited.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMediumSizeEditor.cpp (modified) (4 diffs)
• UIMediumSizeEditor.h (modified) (4 diffs)

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

@@ -48 +48 @@
     /* Prepare: */
     prepare();
+    QString strRegEx = QString("[^(\\d|%1)]").arg(uiCommon().decimalSep());
+    m_regExNonDigitOrSeparator = QRegularExpression(strRegEx);
 }
 
@@ -97 +99 @@
 }
 
-void UIMediumSizeEditor::sltSizeEditorEditingFinished()
+void UIMediumSizeEditor::sltSizeEditorTextChanged()
 {
     QString strSizeString = ensureSizeSuffix(m_pEditor->text());
 
-    if (strSizeString != m_pEditor->text())
-    {
-        m_pEditor->blockSignals(true);
-        m_pEditor->setText(strSizeString);
-        m_pEditor->blockSignals(false);
-    }
+
+    m_pEditor->blockSignals(true);
+    m_pEditor->setText(strSizeString);
+    /* Reposition the cursor to the front of the size suffix (and 1 char for the space) */
+    m_pEditor->setCursorPosition(strSizeString.length() - (gpConverter->toString(m_enmSizeSuffix).length() + 1));
+    m_pEditor->blockSignals(false);
 
     /* Update the current size: */
@@ -123 +125 @@
 QString UIMediumSizeEditor::ensureSizeSuffix(const QString &strSizeString)
 {
+    /* Try to update the m_enmSizeSuffix: */
     if (uiCommon().hasSizeSuffix(strSizeString))
-    {
-        /* Update the m_enmSizeSuffix: */
         m_enmSizeSuffix = uiCommon().parseSizeSuffix(strSizeString);
-        return strSizeString;
-    }
-
-    return QString("%1 %2").arg(strSizeString).arg(gpConverter->toString(m_enmSizeSuffix));
+
+    QString strOnlyDigits(strSizeString);
+    /* Remove any chars from the string except digits and decimal separator and then add a space and size suffix: */
+    return QString("%1 %2").arg(strOnlyDigits.remove(m_regExNonDigitOrSeparator)).arg(gpConverter->toString(m_enmSizeSuffix));
 }
 
@@ -193 +194 @@
         {
             /* Configure editor: */
+            m_pEditor->installEventFilter(this);
             m_pEditor->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
             m_pEditor->setFixedWidthByText("88888.88 MB");
             m_pEditor->setAlignment(Qt::AlignRight);
             m_pEditor->setValidator(new QRegExpValidator(QRegExp(uiCommon().sizeRegexp()), this));
-            connect(m_pEditor, &QILineEdit::editingFinished,
-                    this, &UIMediumSizeEditor::sltSizeEditorEditingFinished);
+            connect(m_pEditor, &QILineEdit::textChanged,
+                    this, &UIMediumSizeEditor::sltSizeEditorTextChanged);
 
             /* Add into layout: */

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

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QRegularExpression>
 #include <QWidget>
 
@@ -54 +55 @@
     /** Returns the medium size. */
     qulonglong mediumSize() const { return m_uSize; }
-    /** Defines the @a uSize. */
+    /** Sets the initial medium size as the widget is created. */
     void setMediumSize(qulonglong uSize);
 
@@ -67 +68 @@
     void sltSizeSliderChanged(int iValue);
     /** Handles size editor text edit finished signal. */
-    void sltSizeEditorEditingFinished();
+    void sltSizeEditorTextChanged();
 
 private:
@@ -108 +109 @@
     /** Holds the size editor. */
     QILineEdit *m_pEditor;
+
+    /* A regular expression used to remove any character from a QString which is neither a digit nor decimal separator. */
+    QRegularExpression m_regExNonDigitOrSeparator;
 };