Changeset 28731 in vbox

Timestamp:

Apr 26, 2010 8:11:58 AM (15 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: use IEC KiB/MiB/... unit prefixes consistently instead of misusing SI KB/MB/... unit prefixes consistently

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (9 diffs)
• runtime/UIMultiScreenLayout.cpp (modified) (1 diff)
• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)
• settings/vm/VBoxVMSettingsDisplay.cpp (modified) (1 diff)
• settings/vm/VBoxVMSettingsDisplay.h (modified) (1 diff)
• settings/vm/VBoxVMSettingsDisplay.ui (modified) (1 diff)
• settings/vm/VBoxVMSettingsSystem.cpp (modified) (2 diffs)
• settings/vm/VBoxVMSettingsSystem.ui (modified) (1 diff)
• widgets/VBoxApplianceEditorWgt.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -4685 +4685 @@
     /* HDTV == 1920x1080 ~ 2M
      * for the 4:2:2 formats each pixel is 2Bytes
-     * so each frame may be 4MB
-     * so for triple-buffering we would need 12 MB */
+     * so each frame may be 4MiB
+     * so for triple-buffering we would need 12 MiB */
     return _1M * 12;
 }

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

@@ -1978 +1978 @@
 
         QString item = QString (sSectionItemTpl2).arg (tr ("Base Memory", "details report"),
-                                                       tr ("<nobr>%1 MB</nobr>", "details report"))
+                                                       tr ("<nobr>%1 MiB</nobr>", "details report"))
                        .arg (aMachine.GetMemorySize())
                      + QString (sSectionItemTpl2).arg (tr ("Processor(s)", "details report"),
@@ -2011 +2011 @@
         QString item = QString(sSectionItemTpl2)
                        .arg(tr ("Video Memory", "details report"),
-                             tr ("<nobr>%1 MB</nobr>", "details report"))
+                             tr ("<nobr>%1 MiB</nobr>", "details report"))
                        .arg(aMachine.GetVRAMSize());
         ++rows;
@@ -3832 +3832 @@
 /**
  *  Returns the regexp string that defines the format of the human-readable
- *  size representation, <tt>####[.##] B|KB|MB|GB|TB|PB</tt>.
+ *  size representation, <tt>####[.##] B|kB|KB|KiB|MB|MiB|GB|GiB|TB|TiB|PB|PiB</tt>.
  *
  *  This regexp will capture 5 groups of text:
@@ -3847 +3847 @@
 {
     QString regexp =
-        QString ("^(?:(?:(\\d+)(?:\\s?([KMGTP]?B))?)|(?:(\\d*)%1(\\d{1,2})(?:\\s?([KMGTP]B))))$")
-                 .arg (decimalSep());
+        tr ("^(?:(?:(\\d+)(?:\\s?(B|kB|KB|KiB|MB|MiB|GB|GiB|TB|TiB|PB|PiB))?)|(?:(\\d*)%1(\\d{1,2})(?:\\s?(kB|KB|KiB|MB|MiB|GB|GiB|TB|TiB|PB|PiB))))$", "regexp for matching ####[.##] B|kB|KB|KiB|MB|MiB|GB|GiB|TB|TiB|PB|PiB, %1=decimal point")
+            .arg (decimalSep());
     return regexp;
 }
@@ -3854 +3854 @@
 /**
  *  Parses the given size string that should be in form of
- *  <tt>####[.##] B|KB|MB|GB|TB|PB</tt> and returns the size value
- *  in bytes. Zero is returned on error.
+ *  <tt>####[.##] B|kB|KB|KiB|MB|MiB|GB|GiB|TB|TiB|PB|PiB</tt> and returns
+ *  the size value in bytes. Zero is returned on error.
  */
 /* static */
@@ -3875 +3875 @@
 
         quint64 denom = 0;
-        if (suff.isEmpty() || suff == "B")
+        if (suff.isEmpty() || suff == tr ("B", "size suffix Bytes"))
             denom = 1;
-        else if (suff == "KB")
+        else if (suff == tr ("kB", "size suffix kBytes=1000 Bytes"))
+            denom = 1000;
+        else if (   suff == tr ("KiB", "size suffix KiBytes")
+                 || suff == tr ("KB", "size suffix legacy KB=KiBytes"))
             denom = _1K;
-        else if (suff == "MB")
+        else if (suff == tr ("MB", "size suffix MBytes=1000 kBytes"))
+            denom = 1000000;
+        else if (suff == tr ("MiB", "size suffix MiBytes"))
             denom = _1M;
-        else if (suff == "GB")
+        else if (suff == tr ("GB", "size suffix GBytes=1000 MBytes"))
+            denom = 1000000000;
+        else if (suff == tr ("GiB", "size suffix GiBytes"))
             denom = _1G;
-        else if (suff == "TB")
+        else if (suff == tr ("TB", "size suffix TBytes=1000 GBytes"))
+            denom = 1000000000000ULL;
+        else if (suff == tr ("TiB", "size suffix TiBytes"))
             denom = _1T;
-        else if (suff == "PB")
+        else if (suff == tr ("PB", "size suffix PBytes=1000 TBytes"))
+            denom = 1000000000000000ULL;
+        else if (suff == tr ("PiB", "size suffix PiBytes"))
             denom = _1P;
 
@@ -3903 +3914 @@
 /**
  * Formats the given @a aSize value in bytes to a human readable string
- * in form of <tt>####[.##] B|KB|MB|GB|TB|PB</tt>.
+ * in form of <tt>####[.##] B|KiB|MiB|GiB|TiB|PiB</tt>.
  *
  * The @a aMode and @a aDecimal parameters are used for rounding the resulting
- * number when converting the size value to KB, MB, etc gives a fractional part:
+ * number when converting the size value to KiB, MiB, etc gives a fractional part:
  * <ul>
  * <li>When \a aMode is FormatSize_Round, the result is rounded to the
@@ -3934 +3945 @@
                                 VBoxDefs::FormatSize aMode /* = FormatSize_Round */)
 {
-    static const char *Suffixes [] = { "B", "KB", "MB", "GB", "TB", "PB", NULL };
+    static QString Suffixes [7];
+    Suffixes[0] = tr ("B", "size suffix Bytes");
+    Suffixes[1] = tr ("KiB", "size suffix KiBytes");
+    Suffixes[2] = tr ("MiB", "size suffix MiBytes");
+    Suffixes[3] = tr ("GiB", "size suffix GiBytes");
+    Suffixes[4] = tr ("TiB", "size suffix TiBytes");
+    Suffixes[5] = tr ("PiB", "size suffix PiBytes");
+    Suffixes[6] = (const char *)NULL;
+    AssertCompile(6 < RT_ELEMENTS (Suffixes));
 
     quint64 denom = 0;
@@ -3995 +4014 @@
             decm = 0;
             ++ intg;
-            /* check if we've got 1024 XB after rounding and scale down if so */
+            /* check if we've got 1024 XiB after rounding and scale down if so */
             if (intg == 1024 && Suffixes [suffix + 1] != NULL)
             {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

@@ -156 +156 @@
     {
         quint64 availBits = machine.GetVRAMSize() /* VRAM */
-            * _1M /* MB to bytes */
+            * _1M /* MiB to bytes */
             * 8; /* to bits */
         quint64 usedBits = memoryRequirements(pTmpMap);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -84 +84 @@
     {
         quint64 availBits = machine.GetVRAMSize() /* VRAM */
-                            * _1M /* MB to bytes */
+                            * _1M /* MiB to bytes */
                             * 8; /* to bits */
         quint64 usedBits = m_pScreenLayout->memoryRequirements();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -82 +82 @@
     {
         quint64 availBits = machine.GetVRAMSize() /* VRAM */
-                            * _1M /* MB to bytes */
+                            * _1M /* MiB to bytes */
                             * 8; /* to bits */
         quint64 usedBits = m_pScreenLayout->memoryRequirements();

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -267 +267 @@
 
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_minVRAM));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_maxVRAMVisible));
+    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MiB</qt>").arg (m_minVRAM));
+    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MiB</qt>").arg (m_maxVRAMVisible));
     mLbMonitorsMin->setText (tr ("<qt>%1</qt>").arg (1));
     mLbMonitorsMax->setText (tr ("<qt>%1</qt>").arg (sys.GetMaxGuestMonitors()));

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.h

@@ -67 +67 @@
     QIWidgetValidator *mValidator;
 
-    /* System minimum lower limit of VRAM (MB). */
+    /* System minimum lower limit of VRAM (MiB). */
     int m_minVRAM;
-    /* System maximum limit of VRAM (MB). */
+    /* System maximum limit of VRAM (MiB). */
     int m_maxVRAM;
-    /* Upper limit of VRAM in MB for this dialog. This value is lower than
+    /* Upper limit of VRAM in MiB for this dialog. This value is lower than
      * m_maxVRAM to save careless users from setting useless big values. */
     int m_maxVRAMVisible;

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.ui

@@ -145 +145 @@
               </property>
               <property name="text">
-               <string>MB</string>
+               <string>MiB</string>
               </property>
              </widget>

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -381 +381 @@
 
     /* Retranslate the memory slider legend */
-    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mSlMemory->minRAM()));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mSlMemory->maxRAM()));
+    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MiB</qt>").arg (mSlMemory->minRAM()));
+    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MiB</qt>").arg (mSlMemory->maxRAM()));
 
     /* Retranslate the cpu slider legend */

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui

@@ -145 +145 @@
            </property>
            <property name="text">
-            <string>MB</string>
+            <string>MiB</string>
            </property>
           </widget>

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -220 +220 @@
                             }
                         case KVirtualSystemDescriptionType_OS: v = vboxGlobal().vmGuestOSTypeDescription (mConfigValue); break;
-                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxApplianceEditorWgt::tr ("MB"); break;
+                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxApplianceEditorWgt::tr ("MiB", "size suffix MiBytes"); break;
                         case KVirtualSystemDescriptionType_SoundCard: v = vboxGlobal().toString (static_cast<KAudioControllerType> (mConfigValue.toInt())); break;
                         case KVirtualSystemDescriptionType_NetworkAdapter: v = vboxGlobal().toString (static_cast<KNetworkAdapterType> (mConfigValue.toInt())); break;
@@ -399 +399 @@
                     QSpinBox *e = new QSpinBox (aParent);
                     e->setRange (VBoxApplianceEditorWgt::minGuestRAM(), VBoxApplianceEditorWgt::maxGuestRAM());
-                    e->setSuffix (" " + VBoxApplianceEditorWgt::tr ("MB"));
+                    e->setSuffix (" " + VBoxApplianceEditorWgt::tr ("MiB", "size suffix MiBytes"));
                     editor = e;
                     break;