Changeset 46782 in vbox

Timestamp:

Jun 25, 2013 2:58:15 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Extra-data flag (GUI/PreventApplicationUpdate) to prevent application update and hide corresponding action.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• net/UIUpdateManager.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -32 +32 @@
 const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD";
 const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD";
+const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
 
 /* Selector-window definitions: */

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

@@ -104 +104 @@
     extern const char* GUI_RecentListCD;
     extern const char* GUI_RecentListFD;
+    extern const char* GUI_PreventApplicationUpdate;
 
     /* Selector-window declarations: */

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

@@ -3619 +3619 @@
 
 /* static */
-bool VBoxGlobal::isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey)
+bool VBoxGlobal::isApprovedByExtraData(CVirtualBox &vbox, const QString &strExtraDataKey)
 {
     /* Load corresponding extra-data value: */
-    QString strExtraDataValue(machine.GetExtraData(strExtraDataKey));
+    QString strExtraDataValue(vbox.GetExtraData(strExtraDataKey));
 
     /* 'false' if value was not set: */
@@ -3633 +3633 @@
            || strExtraDataValue.compare("on", Qt::CaseInsensitive) == 0
            || strExtraDataValue == "1";
+}
+
+/* static */
+bool VBoxGlobal::isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey)
+{
+    /* Load corresponding extra-data value: */
+    QString strExtraDataValue(machine.GetExtraData(strExtraDataKey));
+
+    /* 'false' if value was not set: */
+    if (strExtraDataValue.isEmpty())
+        return false;
+
+    /* Handle particular values: */
+    return    strExtraDataValue.compare("true", Qt::CaseInsensitive) == 0
+           || strExtraDataValue.compare("yes", Qt::CaseInsensitive) == 0
+           || strExtraDataValue.compare("on", Qt::CaseInsensitive) == 0
+           || strExtraDataValue == "1";
+}
+
+/* static */
+bool VBoxGlobal::shouldWeAllowApplicationUpdate(CVirtualBox &vbox)
+{
+    /* 'true' if disabling is not approved by the extra-data: */
+    return !isApprovedByExtraData(vbox, GUI_PreventApplicationUpdate);
 }
 

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

@@ -375 +375 @@
 
     /* Extra-data settings stuff: */
+    static bool isApprovedByExtraData(CVirtualBox &vbox, const QString &strExtraDataKey);
     static bool isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey);
+    static bool shouldWeAllowApplicationUpdate(CVirtualBox &vbox);
     static bool shouldWeShowMachine(CMachine &machine);
     static bool shouldWeAllowMachineReconfiguration(CMachine &machine,

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -485 +485 @@
 #ifdef VBOX_WITH_UPDATE_REQUEST
     /* Ask updater to check for the first time: */
-    if (!vboxGlobal().isVMConsoleProcess())
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox) &&
+        !vboxGlobal().isVMConsoleProcess())
         QTimer::singleShot(0, this, SLOT(sltCheckIfUpdateIsNecessary()));
 #endif /* VBOX_WITH_UPDATE_REQUEST */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1317 +1317 @@
     pMenu->addAction(m_pNetworkAccessManager);
     m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
-    pMenu->addAction(m_pUpdateAction);
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+        pMenu->addAction(m_pUpdateAction);
+    else
+        m_pUpdateAction->setEnabled(false);
 #ifndef Q_WS_MAC
     pMenu->addSeparator();