Changeset 46761 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 24, 2013 5:03:16 PM (12 years ago)

Author:

vboxsync

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

86689

Message:

FE/Qt: UI converter: Conversions for the global/machine settings-page-type enums: Renaming 'extension' => 'extensions'.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.h (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)

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

@@ -380 +380 @@
     switch (globalSettingsPageType)
     {
-        case GlobalSettingsPageType_General:   strResult = "General"; break;
-        case GlobalSettingsPageType_Input:     strResult = "Input"; break;
-        case GlobalSettingsPageType_Update:    strResult = "Update"; break;
-        case GlobalSettingsPageType_Language:  strResult = "Language"; break;
-        case GlobalSettingsPageType_Display:   strResult = "Display"; break;
-        case GlobalSettingsPageType_USB:       strResult = "USB"; break;
-        case GlobalSettingsPageType_Network:   strResult = "Network"; break;
-        case GlobalSettingsPageType_Extension: strResult = "Extension"; break;
-        case GlobalSettingsPageType_Proxy:     strResult = "Proxy"; break;
+        case GlobalSettingsPageType_General:    strResult = "General"; break;
+        case GlobalSettingsPageType_Input:      strResult = "Input"; break;
+        case GlobalSettingsPageType_Update:     strResult = "Update"; break;
+        case GlobalSettingsPageType_Language:   strResult = "Language"; break;
+        case GlobalSettingsPageType_Display:    strResult = "Display"; break;
+        case GlobalSettingsPageType_USB:        strResult = "USB"; break;
+        case GlobalSettingsPageType_Network:    strResult = "Network"; break;
+        case GlobalSettingsPageType_Extensions: strResult = "Extensions"; break;
+        case GlobalSettingsPageType_Proxy:      strResult = "Proxy"; break;
         default:
         {
@@ -404 +404 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;    QList<GlobalSettingsPageType> values;
-    keys << "General";   values << GlobalSettingsPageType_General;
-    keys << "Input";     values << GlobalSettingsPageType_Input;
-    keys << "Update";    values << GlobalSettingsPageType_Update;
-    keys << "Language";  values << GlobalSettingsPageType_Language;
-    keys << "Display";   values << GlobalSettingsPageType_Display;
-    keys << "USB";       values << GlobalSettingsPageType_USB;
-    keys << "Network";   values << GlobalSettingsPageType_Network;
-    keys << "Extension"; values << GlobalSettingsPageType_Extension;
-    keys << "Proxy";     values << GlobalSettingsPageType_Proxy;
+    keys << "General";    values << GlobalSettingsPageType_General;
+    keys << "Input";      values << GlobalSettingsPageType_Input;
+    keys << "Update";     values << GlobalSettingsPageType_Update;
+    keys << "Language";   values << GlobalSettingsPageType_Language;
+    keys << "Display";    values << GlobalSettingsPageType_Display;
+    keys << "USB";        values << GlobalSettingsPageType_USB;
+    keys << "Network";    values << GlobalSettingsPageType_Network;
+    keys << "Extensions"; values << GlobalSettingsPageType_Extensions;
+    keys << "Proxy";      values << GlobalSettingsPageType_Proxy;
     /* Invalid type for unknown words: */
     if (!keys.contains(strGlobalSettingsPageType, Qt::CaseInsensitive))

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

@@ -253 +253 @@
     GlobalSettingsPageType_USB,
     GlobalSettingsPageType_Network,
-    GlobalSettingsPageType_Extension,
+    GlobalSettingsPageType_Extensions,
     GlobalSettingsPageType_Proxy,
     GlobalSettingsPageType_Max

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -381 +381 @@
                     break;
                 }
-                /* Extension page: */
-                case GlobalSettingsPageType_Extension:
+                /* Extensions page: */
+                case GlobalSettingsPageType_Extensions:
                 {
                     pSettingsPage = new UIGlobalSettingsExtension;
                     addItem(":/extension_pack_32px.png", ":/extension_pack_disabled_32px.png",
                             ":/extension_pack_16px.png", ":/extension_pack_disabled_16px.png",
-                            iPageIndex, "#extension", pSettingsPage);
+                            iPageIndex, "#extensions", pSettingsPage);
                     break;
                 }
@@ -499 +499 @@
 
     /* Extension page: */
-    m_pSelector->setItemText(GlobalSettingsPageType_Extension, tr("Extensions"));
+    m_pSelector->setItemText(GlobalSettingsPageType_Extensions, tr("Extensions"));
 
     /* Proxy page: */