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

Timestamp:

May 6, 2014 2:19:30 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_PreventBetaWarning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -153 +153 @@
 }
 
+QString UIExtraDataManager::preventBETAwarningForVersion() const
+{
+    return extraDataString(GUI_PreventBetaWarning);
+}
+
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 bool UIExtraDataManager::shouldWeAllowApplicationUpdate() const

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

@@ -72 +72 @@
     /** Static Extra-data Manager destructor. */
     static void destroy();
+
+    /** Returns version for which user wants to prevent BETA warning. */
+    QString preventBETAwarningForVersion() const;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -29 +29 @@
 #include "VBoxUtils.h"
 #include "UIModalWindowManager.h"
+#include "UIExtraDataManager.h"
 #ifdef Q_WS_MAC
 # include "UICocoaApplication.h"
@@ -531 +532 @@
                 {
                     /* Allow to prevent this message: */
-                    QString str = vboxGlobal().virtualBox().GetExtraData(GUI_PreventBetaWarning);
-                    if (str != vboxVersion)
+                    if (gEDataManager->preventBETAwarningForVersion() != vboxVersion)
                         msgCenter().showBETAWarning();
                 }