Changeset 48826 in vbox for trunk

Timestamp:

Oct 2, 2013 5:43:12 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6936: Crash in worker enumeration thread: Moving static translation stuff to UIConverter framework.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -58 +58 @@
 
 /* Declare global canConvert specializations: */
+template<> bool canConvert<SizeSuffix>();
 template<> bool canConvert<StorageSlot>();
 template<> bool canConvert<RuntimeMenuType>();
@@ -91 +92 @@
 
 /* Declare global conversion specializations: */
+template<> QString toString(const SizeSuffix &sizeSuffix);
+template<> SizeSuffix fromString<SizeSuffix>(const QString &strSizeSuffix);
 template<> QString toString(const StorageSlot &storageSlot);
 template<> StorageSlot fromString<StorageSlot>(const QString &strStorageSlot);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -31 +31 @@
 /* Determines if <Object of type X> can be converted to object of other type.
  * These functions returns 'true' for all allowed conversions. */
+template<> bool canConvert<SizeSuffix>() { return true; }
 template<> bool canConvert<StorageSlot>() { return true; }
 template<> bool canConvert<RuntimeMenuType>() { return true; }
@@ -39 +40 @@
 template<> bool canConvert<IndicatorType>() { return true; }
 template<> bool canConvert<MachineCloseAction>() { return true; }
+
+/* QString <= SizeSuffix: */
+template<> QString toString(const SizeSuffix &sizeSuffix)
+{
+    QString strResult;
+    switch (sizeSuffix)
+    {
+        case SizeSuffix_Byte:     strResult = QApplication::translate("VBoxGlobal", "B", "size suffix Bytes"); break;
+        case SizeSuffix_KiloByte: strResult = QApplication::translate("VBoxGlobal", "KB", "size suffix KBytes=1024 Bytes"); break;
+        case SizeSuffix_MegaByte: strResult = QApplication::translate("VBoxGlobal", "MB", "size suffix MBytes=1024 KBytes"); break;
+        case SizeSuffix_GigaByte: strResult = QApplication::translate("VBoxGlobal", "GB", "size suffix GBytes=1024 MBytes"); break;
+        case SizeSuffix_TeraByte: strResult = QApplication::translate("VBoxGlobal", "TB", "size suffix TBytes=1024 GBytes"); break;
+        case SizeSuffix_PetaByte: strResult = QApplication::translate("VBoxGlobal", "PB", "size suffix PBytes=1024 TBytes"); break;
+        default:
+        {
+            AssertMsgFailed(("No text for size suffix=%d", sizeSuffix));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* SizeSuffix <= QString: */
+template<> SizeSuffix fromString<SizeSuffix>(const QString &strSizeSuffix)
+{
+    QHash<QString, SizeSuffix> list;
+    list.insert(QApplication::translate("VBoxGlobal", "B", "size suffix Bytes"),               SizeSuffix_Byte);
+    list.insert(QApplication::translate("VBoxGlobal", "KB", "size suffix KBytes=1024 Bytes"),  SizeSuffix_KiloByte);
+    list.insert(QApplication::translate("VBoxGlobal", "MB", "size suffix MBytes=1024 KBytes"), SizeSuffix_MegaByte);
+    list.insert(QApplication::translate("VBoxGlobal", "GB", "size suffix GBytes=1024 MBytes"), SizeSuffix_GigaByte);
+    list.insert(QApplication::translate("VBoxGlobal", "TB", "size suffix TBytes=1024 GBytes"), SizeSuffix_TeraByte);
+    list.insert(QApplication::translate("VBoxGlobal", "PB", "size suffix PBytes=1024 TBytes"), SizeSuffix_PetaByte);
+    if (!list.contains(strSizeSuffix))
+    {
+        AssertMsgFailed(("No value for '%s'", strSizeSuffix.toAscii().constData()));
+    }
+    return list.value(strSizeSuffix);
+}
 
 /* QString <= StorageSlot: */

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

@@ -228 +228 @@
 Q_DECLARE_METATYPE(StorageSlot);
 
+/* Common UI size suffixes: */
+enum SizeSuffix
+{
+    SizeSuffix_Byte = 0,
+    SizeSuffix_KiloByte,
+    SizeSuffix_MegaByte,
+    SizeSuffix_GigaByte,
+    SizeSuffix_TeraByte,
+    SizeSuffix_PetaByte,
+    SizeSuffix_Max
+};
+
 /* Runtime UI menu types: */
 enum RuntimeMenuType

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

@@ -2597 +2597 @@
                                 FormatSize aMode /* = FormatSize_Round */)
 {
-    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[6] = (const char *)NULL;
-    AssertCompile(6 < RT_ELEMENTS (Suffixes));
-
     quint64 denom = 0;
     int suffix = 0;
@@ -2667 +2657 @@
             ++ intg;
             /* check if we've got 1024 XB after rounding and scale down if so */
-            if (intg == 1024 && Suffixes [suffix + 1] != NULL)
+            if (intg == 1024 && suffix + 1 < (int)SizeSuffix_Max)
             {
                 intg /= 1024;
@@ -2682 +2672 @@
     }
 
-    return QString ("%1 %2").arg (number).arg (Suffixes [suffix]);
+    return QString ("%1 %2").arg (number).arg (gpConverter->toString(static_cast<SizeSuffix>(suffix)));
 }