Changeset 77556 in vbox

Timestamp:

Mar 4, 2019 1:33:06 PM (6 years ago)

Author:

vboxsync

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

129161

Message:

FE/Qt: bugref:9335. Making sure size editor has size suffix even if the user leaves it out.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• widgets/UIMediumSizeEditor.cpp (modified) (7 diffs)
• widgets/UIMediumSizeEditor.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -971 +971 @@
     else
         return 0;
+}
+
+/* static */
+SizeSuffix VBoxGlobal::parseSizeSuffix(const QString &strText)
+{
+    /* Text should be in form of B|KB|MB|GB|TB|PB. */
+    QRegExp regexp(sizeRegexp());
+    int iPos = regexp.indexIn(strText);
+    if (iPos != -1)
+    {
+        QString strInteger = regexp.cap(1);
+        QString strSuff = regexp.cap(2);
+        if (strInteger.isEmpty())
+        {
+            strInteger = regexp.cap(3);
+            strSuff = regexp.cap(5);
+        }
+
+        SizeSuffix enmSizeSuffix = SizeSuffix_Byte;
+
+        if (strSuff.isEmpty() || strSuff == tr("B", "size suffix Bytes"))
+            enmSizeSuffix = SizeSuffix_Byte;
+        else if (strSuff == tr("KB", "size suffix KBytes=1024 Bytes"))
+            enmSizeSuffix = SizeSuffix_KiloByte;
+        else if (strSuff == tr("MB", "size suffix MBytes=1024 KBytes"))
+            enmSizeSuffix = SizeSuffix_MegaByte;
+        else if (strSuff == tr("GB", "size suffix GBytes=1024 MBytes"))
+            enmSizeSuffix = SizeSuffix_GigaByte;
+        else if (strSuff == tr("TB", "size suffix TBytes=1024 GBytes"))
+            enmSizeSuffix = SizeSuffix_TeraByte;
+        else if (strSuff == tr("PB", "size suffix PBytes=1024 TBytes"))
+            enmSizeSuffix = SizeSuffix_PetaByte;
+        return enmSizeSuffix;
+    }
+    else
+        return SizeSuffix_Byte;
+}
+
+/* static */
+bool VBoxGlobal::hasSizeSuffix(const QString &strText)
+{
+    /* Text should be in form of B|KB|MB|GB|TB|PB. */
+    QRegExp regexp(sizeRegexp());
+    int iPos = regexp.indexIn(strText);
+    if (iPos != -1)
+    {
+        QString strInteger = regexp.cap(1);
+        QString strSuff = regexp.cap(2);
+        if (strInteger.isEmpty())
+        {
+            strInteger = regexp.cap(3);
+            strSuff = regexp.cap(5);
+        }
+
+        if (strSuff.isEmpty())
+            return false;
+        if (strSuff == tr("B", "size suffix Bytes") ||
+            strSuff == tr("KB", "size suffix KBytes=1024 Bytes") ||
+            strSuff == tr("MB", "size suffix MBytes=1024 KBytes") ||
+            strSuff == tr("GB", "size suffix GBytes=1024 MBytes") ||
+            strSuff == tr("TB", "size suffix TBytes=1024 GBytes") ||
+            strSuff == tr("PB", "size suffix PBytes=1024 TBytes"))
+            return true;
+        return false;
+    }
+    else
+        return false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -320 +320 @@
         /** Parses the given size strText and returns the size value in bytes. */
         static quint64 parseSize(const QString &strText);
+        /** Parses the given size strText and returns the size suffix. */
+        static SizeSuffix parseSizeSuffix(const QString &strText);
+        /** Parses the given string @a strText and returns true if it includes a size suffix. */
+        static bool hasSizeSuffix(const QString &strText);
         /** Formats the given @a uSize value in bytes to a human readable string.
           * @param  uSize     Brings the size value in bytes.

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

@@ -25 +25 @@
 #include "QILineEdit.h"
 #include "VBoxGlobal.h"
+#include "UIConverter.h"
 #include "UIMediumSizeEditor.h"
 
@@ -38 +39 @@
     , m_uSizeMax(vboxGlobal().virtualBox().GetSystemProperties().GetInfoVDSize())
     , m_iSliderScale(calculateSliderScale(m_uSizeMax))
+    , m_uSize(0)
+    , m_enmSizeSuffix(SizeSuffix_Byte)
     , m_pSlider(0)
     , m_pLabelMinSize(0)
@@ -58 +61 @@
     m_pEditor->blockSignals(true);
     m_pEditor->setText(vboxGlobal().formatSize(m_uSize));
+    m_enmSizeSuffix = vboxGlobal().parseSizeSuffix(m_pEditor->text());
     m_pEditor->blockSignals(false);
 
@@ -85 +89 @@
     m_pEditor->blockSignals(true);
     m_pEditor->setText(vboxGlobal().formatSize(m_uSize));
+    m_enmSizeSuffix = vboxGlobal().parseSizeSuffix(m_pEditor->text());
     m_pEditor->blockSignals(false);
     /* Update the tool-tips: */
@@ -92 +97 @@
 }
 
-void UIMediumSizeEditor::sltSizeEditorChanged(const QString &strValue)
-{
+void UIMediumSizeEditor::sltSizeEditorEditingFinished()
+{
+    QString strSizeString = ensureSizeSuffix(m_pEditor->text());
+
+    if (strSizeString != m_pEditor->text())
+    {
+        m_pEditor->blockSignals(true);
+        m_pEditor->setText(strSizeString);
+        m_pEditor->blockSignals(false);
+    }
+
     /* Update the current size: */
-    m_uSize = vboxGlobal().parseSize(strValue);
+    m_uSize = checkSectorSizeAlignment(vboxGlobal().parseSize(strSizeString));
+
     /* Update the other widget: */
     m_pSlider->blockSignals(true);
@@ -106 +121 @@
 }
 
-void UIMediumSizeEditor::sltSizeEditorEditingFinished()
-{
-    qulonglong uSize = checkSectorSizeAlignment(m_uSize);
-
-    /* The size is already aligned to sector size: */
-    if (uSize == m_uSize)
-        return;
-    setMediumSize(uSize);
+QString UIMediumSizeEditor::ensureSizeSuffix(const QString &strSizeString)
+{
+    if (vboxGlobal().hasSizeSuffix(strSizeString))
+    {
+        /* Update the m_enmSizeSuffix: */
+        m_enmSizeSuffix = vboxGlobal().parseSizeSuffix(strSizeString);
+        return strSizeString;
+    }
+
+    return QString("%1 %2").arg(strSizeString).arg(gpConverter->toString(m_enmSizeSuffix));
 }
 
@@ -180 +197 @@
             m_pEditor->setAlignment(Qt::AlignRight);
             m_pEditor->setValidator(new QRegExpValidator(QRegExp(vboxGlobal().sizeRegexp()), this));
-            connect(m_pEditor, &QILineEdit::textChanged,
-                    this, &UIMediumSizeEditor::sltSizeEditorChanged);
             connect(m_pEditor, &QILineEdit::editingFinished,
                     this, &UIMediumSizeEditor::sltSizeEditorEditingFinished);

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

@@ -27 +27 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+#include "UIDefs.h"
 #include "UILibraryDefs.h"
 
@@ -65 +66 @@
     /** Handles size slider change. */
     void sltSizeSliderChanged(int iValue);
-    /** Handles size editor change. */
-    void sltSizeEditorChanged(const QString &strValue);
+    /** Handles size editor text edit finished signal. */
     void sltSizeEditorEditingFinished();
 
@@ -86 +86 @@
     /** Checks if the uSize is divisible by m_uSectorSize */
     qulonglong checkSectorSizeAlignment(qulonglong uSize);
+    QString ensureSizeSuffix(const QString &strSizeString);
 
     /* Holds the block size. We force m_uSize to be multiple of this number. */
@@ -97 +98 @@
     /** Holds the current medium size. */
     qulonglong        m_uSize;
+    SizeSuffix        m_enmSizeSuffix;
 
     /** Holds the size slider. */