Changeset 28758 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 26, 2010 3:30:22 PM (15 years ago)

Author:

vboxsync

Message:

really back out accidental previous commit

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• . (modified) (1 prop)
• src/VBoxSnapshotsWgt.cpp (modified) (5 diffs)
• src/globals/VBoxGlobal.cpp (modified) (9 diffs)
• src/globals/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/globals/VBoxProblemReporter.h (modified) (2 diffs)
• src/settings/vm/VBoxVMSettingsDisplay.cpp (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsDisplay.ui (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsSystem.cpp (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsSystem.ui (modified) (1 diff)
• src/widgets/VBoxApplianceEditorWgt.cpp (modified) (2 diffs)
• src/wizards/newhd/UINewHDWzd.cpp (modified) (1 diff)
• src/wizards/newvm/UINewVMWzd.cpp (modified) (3 diffs)
• src/wizards/newvm/UINewVMWzdPage3.ui (modified) (1 diff)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -167 +167 @@
         adjustText();
         recacheToolTip();
-    }
-
-    KMachineState getCurrentState()
-    {
-        if (mMachine.isNull())
-            return KMachineState_Null;
-
-        return mMachineState;
     }
 
@@ -447 +439 @@
     bool busy = mSessionState != KSessionState_Closed;
 
-    /* Machine state of the current state item */
-    KMachineState s = KMachineState_Null;
-    if (curStateItem())
-        s = curStateItem()->getCurrentState();
-
-    /* Enable/disable restoring snapshot */
-    mRestoreSnapshotAction->setEnabled (!busy && mCurSnapshotItem && item && !item->isCurrentStateItem());
-
-    /* Enable/disable deleting snapshot */
-    mDeleteSnapshotAction->setEnabled (   (   !busy
-                                           || s == KMachineState_PoweredOff
-                                           || s == KMachineState_Saved
-                                           || s == KMachineState_Aborted
-                                           || s == KMachineState_Running
-                                           || s == KMachineState_Paused)
-                                       && mCurSnapshotItem && item && !item->isCurrentStateItem());
+    /* Enable/disable snapshot actions */
+    mSnapshotActionGroup->setEnabled (!busy && mCurSnapshotItem && item && !item->isCurrentStateItem());
 
     /* Enable/disable the details action regardles of the session state */
@@ -556 +534 @@
     if (!vboxProblem().askAboutSnapshotDeleting (snapshot.GetName()))
         return;
-
-    /** @todo check available space on the target filesystem etc etc. */
-#if 0
-    if (!vboxProblem().askAboutSnapshotDeletingFreeSpace (snapshot.GetName(),
-                                                          "/home/juser/.VirtualBox/Machines/SampleVM/Snapshots/{01020304-0102-0102-0102-010203040506}.vdi",
-                                                          "59 GiB",
-                                                          "15 GiB"))
-        return;
-#endif
-                                                          
 
     /* Open a direct session (this call will handle all errors) */
@@ -831 +799 @@
                            mCurSnapshotItem->child (mCurSnapshotItem->childCount() - 1) :
                            mTreeWidget->invisibleRootItem()->child (0);
+    Assert (csi);
     return static_cast <SnapshotWgtItem*> (csi);
 }

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 =
-        tr ("^(?:(?:(\\d+)(?:\\s?(B|KB|MB|GB|TB|PB))?)|(?:(\\d*)%1(\\d{1,2})(?:\\s?(KB|MB|GB|TB|PB))))$", "regexp for matching ####[.##] B|KB|MB|GB|TB|PB, %1=decimal point")
+        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
+ *  <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.
  */
@@ -3877 +3877 @@
         if (suff.isEmpty() || suff == tr ("B", "size suffix Bytes"))
             denom = 1;
-        else if (suff == tr ("KB", "size suffix KBytes=1024 Bytes"))
+        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 == tr ("MB", "size suffix MBytes=1024 KBytes"))
+        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 == tr ("GB", "size suffix GBytes=1024 MBytes"))
+        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 == tr ("TB", "size suffix TBytes=1024 GBytes"))
+        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 == tr ("PB", "size suffix PBytes=1024 TBytes"))
+        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
@@ -3936 +3947 @@
     static QString Suffixes [7];
     Suffixes[0] = tr ("B", "size suffix Bytes");
-    Suffixes[1] = tr ("KB", "size suffix KBytes=1024 Bytes");
-    Suffixes[2] = tr ("MB", "size suffix MBytes=1024 KBytes");
-    Suffixes[3] = tr ("GB", "size suffix GBytes=1024 MBytes");
-    Suffixes[4] = tr ("TB", "size suffix TBytes=1024 GBytes");
-    Suffixes[5] = tr ("PB", "size suffix PBytes=1024 TBytes");
+    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));
@@ -4003 +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/globals/VBoxProblemReporter.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -894 +894 @@
 }
 
-bool VBoxProblemReporter::askAboutSnapshotDeletingFreeSpace (const QString &aSnapshotName,
-                                                             const QString &aTargetImageName,
-                                                             const QString &aTargetImageMaxSize,
-                                                             const QString &aTargetFilesystemFree)
-{
-    return messageOkCancel (mainWindowShown(), Question,
-        tr ("<p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, "
-            "however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in "
-            "corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting "
-            "the snapshot at your own risk.</p>")
-            .arg (aSnapshotName)
-            .arg (aTargetImageName)
-            .arg (aTargetImageMaxSize)
-            .arg (aTargetFilesystemFree),
-        /* Do NOT allow this message to be disabled! */
-        NULL /* aAutoConfirmId */,
-        tr ("Delete"), tr ("Cancel"));
-}
-
 void VBoxProblemReporter::cannotRestoreSnapshot (const CConsole &aConsole,
                                                  const QString &aSnapshotName)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2010 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -215 +215 @@
     bool askAboutSnapshotRestoring (const QString &aSnapshotName);
     bool askAboutSnapshotDeleting (const QString &aSnapshotName);
-    bool askAboutSnapshotDeletingFreeSpace (const QString &aSnapshotName,
-                                            const QString &aTargetImageName,
-                                            const QString &aTargetImageMaxSize,
-                                            const QString &aTargetFilesystemFree);
     void cannotRestoreSnapshot (const CConsole &aConsole, const QString &aSnapshotName);
     void cannotRestoreSnapshot (const CProgress &aProgress, const QString &aSnapshotName);

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.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

@@ -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

@@ -220 +220 @@
                             }
                         case KVirtualSystemDescriptionType_OS: v = vboxGlobal().vmGuestOSTypeDescription (mConfigValue); break;
-                        case KVirtualSystemDescriptionType_Memory: v = mConfigValue + " " + VBoxApplianceEditorWgt::tr ("MB", "size suffix MBytes=1024 KBytes"); 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", "size suffix MBytes=1024KBytes"));
+                    e->setSuffix (" " + VBoxApplianceEditorWgt::tr ("MiB", "size suffix MiBytes"));
                     editor = e;
                     break;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWzd.cpp

@@ -220 +220 @@
 
     /* Setup size-editor field */
-    m_pSizeEditor->setFixedWidthByText("88888.88 MB");
+    m_pSizeEditor->setFixedWidthByText("88888.88 MiB");
     m_pSizeEditor->setAlignment(Qt::AlignRight);
     m_pSizeEditor->setValidator(new QRegExpValidator(QRegExp(vboxGlobal().sizeRegexp()), this));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -281 +281 @@
     QString strRecommendedRAM = field("type").value<CGuestOSType>().isNull() ? QString() :
                                 QString::number(field("type").value<CGuestOSType>().GetRecommendedRAM());
-    m_pPage3Text2->setText(tr("The recommended base memory size is <b>%1</b> MB.").arg(strRecommendedRAM));
+    m_pPage3Text2->setText(tr("The recommended base memory size is <b>%1</b> MiB.").arg(strRecommendedRAM));
 
     /* Translate minimum & maximum 'ram' field values */
-    m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(tr("MB", "size suffix MBytes=1024 KBytes")));
-    m_pRamMax->setText(QString("%1 %2").arg(m_pRamSlider->maxRAM()).arg(tr("MB", "size suffix MBytes=1024 KBytes")));
+    m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(tr("MiB", "size suffix MiBytes")));
+    m_pRamMax->setText(QString("%1 %2").arg(m_pRamSlider->maxRAM()).arg(tr("MiB", "size suffix MiBytes")));
 }
 
@@ -374 +374 @@
     QString strRecommendedHDD = field("type").value<CGuestOSType>().isNull() ? QString() :
                                 QString::number(field("type").value<CGuestOSType>().GetRecommendedHDD());
-    m_pPage4Text2->setText (tr ("The recommended size of the boot hard disk is <b>%1</b> MB.").arg (strRecommendedHDD));
+    m_pPage4Text2->setText (tr ("The recommended size of the boot hard disk is <b>%1</b> MiB.").arg (strRecommendedHDD));
 }
 
@@ -585 +585 @@
     .arg(tr("Name", "summary"), name)
     .arg(tr("OS Type", "summary"), type)
-    .arg(tr("Base Memory", "summary"), ram, tr("MB", "size suffix MBytes=1024KBytes"))
+    .arg(tr("Base Memory", "summary"), ram, tr("MiB", "size suffix MiBytes"))
     ;
     /* Feat summary to 3 lines */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage3.ui

@@ -96 +96 @@
        <widget class="QLabel" name="m_pRamUnits">
         <property name="text">
-         <string>MB</string>
+         <string>MiB</string>
         </property>
        </widget>