Changeset 50042 in vbox

Timestamp:

Jan 9, 2014 4:25:41 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: 7118: Make sure corresponding Devices menu action (VRDE Server) is disabled if extension-pack is not installed/usable.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (3 diffs)
• runtime/UISession.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -473 +473 @@
     {
         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
+        if (!m_pSession->isExtensionPackUsable())
+            gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)->setEnabled(false);
         fSeparator2 = true;
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -77 +77 @@
 #include "CSnapshot.h"
 #include "CMedium.h"
+#include "CExtPack.h"
+#include "CExtPackManager.h"
 
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
@@ -128 +130 @@
     , m_machineStatePrevious(KMachineState_Null)
     , m_machineState(session().GetMachine().GetState())
+    , m_fIsExtensionPackUsable(false)
     , m_requestedVisualStateType(UIVisualStateType_Invalid)
 #ifdef Q_WS_WIN
@@ -1107 +1110 @@
     /* Load extra-data settings: */
     {
+        /* Extension pack stuff: */
+        CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+        m_fIsExtensionPackUsable = !extPack.isNull() && extPack.GetUsable();
+
         /* Runtime menu settings: */
 #ifdef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -94 +94 @@
     QCursor cursor() const { return m_cursor; }
 
+    /** @name Extension Pack stuff.
+     ** @{ */
+    /** Determines whether extension pack installed and usable. */
+    bool isExtensionPackUsable() const { return m_fIsExtensionPackUsable; }
+    /** @} */
+
     /** @name Runtime menus configuration stuff.
      ** @{ */
@@ -333 +339 @@
     QCursor m_cursor;
 
+    /** @name Extension Pack variables.
+     ** @{ */
+    /** Determines whether extension pack installed and usable. */
+    bool m_fIsExtensionPackUsable;
+    /** @} */
+
     /** @name Runtime menus configuration variables.
      ** @{ */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -399 +399 @@
                                  "Please install the Extension Pack from the VirtualBox download site as "
                                  "otherwise your VM will be started with Remote Display disabled.")
-                                .arg(GUI_ExtPackName);
+                                 .arg(GUI_ExtPackName);
         }
-#endif
+#endif VBOX_WITH_EXTPACK
 
         /* Check VRDE server port: */