Changeset 14540 in vbox

Timestamp:

Nov 24, 2008 6:44:17 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: FormatSize function reworked, warning about too low memory for seamless updated to use integer format of size instead of decimal.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (3 diffs)
• src/VBoxNewHDWzd.cpp (modified) (1 diff)
• src/VBoxVMSettingsGeneral.cpp (modified) (1 diff)
• ui/VBoxNewHDWzd.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDefs.h

@@ -124 +124 @@
     };
 
+    /** Size formatting types. */
+    enum FormatSize
+    {
+        FormatSize_Round,
+        FormatSize_RoundDown,
+        FormatSize_RoundUp
+    };
+
     static const char* GUI_LastWindowPosition;
     static const char* GUI_LastWindowPosition_Max;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -844 +844 @@
 
     static quint64 parseSize (const QString &);
-    static QString formatSize (quint64, int aMode = 0);
+    static QString formatSize (quint64 aSize, uint aDecimal = 2,
+                               VBoxDefs::FormatSize aMode = VBoxDefs::FormatSize_Round);
 
     static quint64 requiredVideoMemory (CMachine *aMachine = 0);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -3825 +3825 @@
  *  in form of <tt>####[.##] B|KB|MB|GB|TB|PB</tt>.
  *
- *  The \a mode parameter is used for resulting numbers that get a fractional
- *  part after converting the \a size to KB, MB etc:
+ *  The \a mode parameter is used for rounding the resulting number
+ *  after converting the \a size to KB, MB etc:
  *  <ul>
- *  <li>When \a mode is 0, the result is rounded to the closest number
- *      containing two decimal digits.
+ *  <li>When \a mode is FormatSize_Round, the result is rounded to the
+ *      closest number containing \a decimal number of digits.
  *  </li>
- *  <li>When \a mode is -1, the result is rounded to the largest two decimal
- *      digit number that is not greater than the result. This guarantees that
- *      converting the resulting string back to the integer value in bytes
- *      will not produce a value greater that the initial \a size parameter.
+ *  <li>When \a mode is FormatSize_RoundDown, the result is rounded to the
+ *      largest \a decimal number of digits that is not greater than the
+ *      result. This guarantees that converting the resulting string back
+ *      to the integer value in bytes will not produce a value greater that
+ *      the initial \a size parameter.
  *  </li>
- *  <li>When \a mode is 1, the result is rounded to the smallest two decimal
- *      digit number that is not less than the result. This guarantees that
- *      converting the resulting string back to the integer value in bytes
- *      will not produce a value less that the initial \a size parameter.
+ *  <li>When \a mode is FormatSize_RoundUp, the result is rounded to the
+ *      smallest \a decimal number of digits that is not less than the
+ *      result. This guarantees that converting the resulting string back
+ *      to the integer value in bytes will not produce a value less that
+ *      the initial \a size parameter.
  *  </li>
  *  </ul>
  *
- *  @param  aSize   size value in bytes
- *  @param  aMode   convertion mode (-1, 0 or 1)
- *  @return         human-readable size string
+ *  @param  aSize    size value in bytes
+ *  @param  aMode    convertion mode (FormatSize_Round, FormatSize_RoundDown,
+ *                                                      FormatSize_RoundUp)
+ *  @param  aDecimal the number of decimal digits in result
+ *  @return          human-readable size string
  */
 /* static */
-QString VBoxGlobal::formatSize (quint64 aSize, int aMode /* = 0 */)
+QString VBoxGlobal::formatSize (quint64 aSize, uint aDecimal /* = 2 */,
+                                VBoxDefs::FormatSize aMode /* = FormatSize_Round */)
 {
     static const char *Suffixes [] = { "B", "KB", "MB", "GB", "TB", "PB", NULL };
@@ -3887 +3892 @@
 
     quint64 intg = aSize / denom;
-    quint64 hund = aSize % denom;
+    quint64 decm = aSize % denom;
+    quint64 mult = 1;
+    for (uint i = 0; i < aDecimal; ++ i) mult *= 10;
 
     QString number;
     if (denom > 1)
     {
-        if (hund)
-        {
-            hund *= 100;
+        if (decm)
+        {
+            decm *= mult;
             /* not greater */
-            if (aMode < 0) hund = hund / denom;
+            if (aMode == VBoxDefs::FormatSize_RoundDown)
+                decm = decm / denom;
             /* not less */
-            else if (aMode > 0) hund = (hund + denom - 1) / denom;
+            else if (aMode == VBoxDefs::FormatSize_RoundUp)
+                decm = (decm + denom - 1) / denom;
             /* nearest */
-            else hund = (hund + denom / 2) / denom;
+            else decm = (decm + denom / 2) / denom;
         }
         /* check for the fractional part overflow due to rounding */
-        if (hund == 100)
-        {
-            hund = 0;
+        if (decm == mult)
+        {
+            decm = 0;
             ++ intg;
             /* check if we've got 1024 XB after rounding and scale down if so */
@@ -3914 +3923 @@
             }
         }
-        number = QString ("%1%2%3").arg (intg).arg (decimalSep())
-                                   .arg (QString::number (hund).rightJustified (2, '0'));
+        number = QString::number (intg);
+        if (aDecimal) number += QString ("%1%2").arg (decimalSep())
+            .arg (QString::number (decm).rightJustified (aDecimal, '0'));
     }
     else

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxNewHDWzd.cpp

@@ -128 +128 @@
     }
     mSliderScale = qMax (mSliderScale, 8);
-    mLeName->setValidator (new QRegExpValidator (QRegExp( ".+" ), this));
-    mLeSize->setValidator (new QRegExpValidator (QRegExp(vboxGlobal().sizeRegexp()), this));
+    mLeName->setValidator (new QRegExpValidator (QRegExp (".+"), this));
+    mLeSize->setValidator (new QRegExpValidator (QRegExp (vboxGlobal().sizeRegexp()), this));
     mLeSize->setAlignment (Qt::AlignRight);
     mWValNameAndSize = new QIWidgetValidator (mPageNameAndSize, this);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsGeneral.cpp

@@ -392 +392 @@
             "the minimum amount required to switch the virtual machine to "
             "fullscreen or seamless mode.")
-            .arg (vboxGlobal().formatSize (needBytes));
+            .arg (vboxGlobal().formatSize (needBytes, 0, VBoxDefs::FormatSize_RoundUp));
         return true;
     }

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui

@@ -603 +603 @@
                  </sizepolicy>
                 </property>
-                <property name="text" >
-                 <string/>
-                </property>
                 <property name="alignment" >
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -634 +631 @@
                   <verstretch>0</verstretch>
                  </sizepolicy>
-                </property>
-                <property name="text" >
-                 <string/>
                 </property>
                 <property name="alignment" >