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

Timestamp:

May 5, 2014 3:12:07 PM (11 years ago)

Author:

vboxsync

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

93562

Message:

FE/Qt: 6660: Advanced extra-data management framework: Some cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (5 diffs)
• extradata/UIExtraDataDefs.h (modified) (5 diffs)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -21 +21 @@
 /* Global definitions: */
 const char* UIExtraDataDefs::GUI_LanguageId = "GUI/LanguageID";
-const char* UIExtraDataDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
 const char* UIExtraDataDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
 const char* UIExtraDataDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
@@ -53 +52 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
-#ifdef Q_WS_X11
-/* License GUI definitions: */
-const char* UIExtraDataDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
-#endif /* Q_WS_X11 */
-
 /* Selector UI definitions: */
 const char* UIExtraDataDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
@@ -66 +60 @@
 const char* UIExtraDataDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
 const char* UIExtraDataDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
-const char* UIExtraDataDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
-const char* UIExtraDataDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
 const char* UIExtraDataDefs::GUI_LastItemSelected = "GUI/LastItemSelected";
 const char* UIExtraDataDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";
@@ -111 +103 @@
 const char* UIExtraDataDefs::GUI_HidLedsSync = "GUI/HidLedsSync";
 const char* UIExtraDataDefs::GUI_GuruMeditationHandler = "GUI/GuruMeditationHandler";
-const char* UIExtraDataDefs::GUI_HiDPIOptimization = "GUI/HiDPI/Optimization";
+const char* UIExtraDataDefs::GUI_HiDPI_Optimization = "GUI/HiDPI/Optimization";
 
 /* Runtime UI: Mini-toolbar definitions: */
@@ -144 +136 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
 /* Runtime UI: Debugger GUI definitions: */
-const char* UIExtraDataDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
-const char* UIExtraDataDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
+const char* UIExtraDataDefs::GUI_Dbg_Enabled = "GUI/Dbg/Enabled";
+const char* UIExtraDataDefs::GUI_Dbg_AutoShow = "GUI/Dbg/AutoShow";
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -29 +29 @@
     /* Global declarations: */
     extern const char* GUI_LanguageId;
-    extern const char* GUI_ExtPackName;
     extern const char* GUI_PreventBetaWarning;
     extern const char* GUI_RecentFolderHD;
@@ -60 +59 @@
     extern const char* GUI_UpdateCheckCount;
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
-#ifdef Q_WS_X11
-    /* License GUI declarations: */
-    extern const char* GUI_LicenseKey;
-#endif /* Q_WS_X11 */
 
     /* Selector UI declarations: */
@@ -74 +68 @@
     extern const char* GUI_PreviewUpdate;
     extern const char* GUI_DetailsPageBoxes;
-    extern const char* GUI_SelectorVMPositions;
-    extern const char* GUI_LastVMSelected;
     extern const char* GUI_LastItemSelected;
     extern const char* GUI_GroupDefinitions;
@@ -119 +111 @@
     extern const char* GUI_HidLedsSync;
     extern const char* GUI_GuruMeditationHandler;
-    extern const char* GUI_HiDPIOptimization;
+    extern const char* GUI_HiDPI_Optimization;
 
     /* Runtime UI: Mini-toolbar declarations: */
@@ -152 +144 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
     /* Runtime UI: Debugger GUI declarations: */
-    extern const char* GUI_DbgEnabled;
-    extern const char* GUI_DbgAutoShow;
+    extern const char* GUI_Dbg_Enabled;
+    extern const char* GUI_Dbg_AutoShow;
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 }

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -399 +399 @@
 HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID) const
 {
-    return gpConverter->fromInternalString<HiDPIOptimizationType>(extraDataString(GUI_HiDPIOptimization, strID));
+    return gpConverter->fromInternalString<HiDPIOptimizationType>(extraDataString(GUI_HiDPI_Optimization, strID));
 }
 

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

@@ -19 +19 @@
 #include "UIDefs.h"
 
+/* Extension-pack definitions: */
+const char* UIDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
+
 /* File extensions definitions: */
 QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox";

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

@@ -78 +78 @@
     };
 
+    /* Extension-pack declarations: */
+    extern const char* GUI_ExtPackName;
+
     /* File extensions declarations: */
     extern QStringList VBoxFileExts;

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

@@ -3876 +3876 @@
 bool VBoxGlobal::isDebuggerEnabled(CMachine &aMachine)
 {
-    return isDebuggerWorker(&mDbgEnabled, aMachine, GUI_DbgEnabled);
+    return isDebuggerWorker(&mDbgEnabled, aMachine, GUI_Dbg_Enabled);
 }
 
 bool VBoxGlobal::isDebuggerAutoShowEnabled(CMachine &aMachine)
 {
-    return isDebuggerWorker(&mDbgAutoShow, aMachine, GUI_DbgAutoShow);
+    return isDebuggerWorker(&mDbgAutoShow, aMachine, GUI_Dbg_AutoShow);
 }
 
 bool VBoxGlobal::isDebuggerAutoShowCommandLineEnabled(CMachine &aMachine)
 {
-    return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, GUI_DbgAutoShow);
+    return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, GUI_Dbg_AutoShow);
 }
 
 bool VBoxGlobal::isDebuggerAutoShowStatisticsEnabled(CMachine &aMachine)
 {
-    return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, GUI_DbgAutoShow);
+    return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, GUI_Dbg_AutoShow);
 }
 
@@ -4058 +4058 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
 # ifdef VBOX_WITH_DEBUGGER_GUI_MENU
-    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, true);
+    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_Dbg_Enabled, true);
 # else
-    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, false);
+    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_Dbg_Enabled, false);
 # endif
-    initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", GUI_DbgAutoShow, false);
+    initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", GUI_Dbg_AutoShow, false);
     mDbgAutoShowCommandLine = mDbgAutoShowStatistics = mDbgAutoShow;
     mStartPaused = false;