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

Timestamp:

Jun 10, 2014 5:06:58 PM (11 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIKeyboardHandler.cpp (modified) (4 diffs)
• runtime/UIKeyboardHandler.h (modified) (1 diff)

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

@@ -405 +405 @@
 bool UIExtraDataManager::selectorWindowToolBarVisible() const
 {
-    /* Show unless feature restricted: */
+    /* 'True' unless feature restricted: */
     return !isFeatureRestricted(GUI_Toolbar);
 }
@@ -417 +417 @@
 bool UIExtraDataManager::selectorWindowStatusBarVisible() const
 {
-    /* Show unless feature restricted: */
+    /* 'True' unless feature restricted: */
     return !isFeatureRestricted(GUI_Statusbar);
 }
@@ -941 +941 @@
 {
     return gpConverter->fromInternalString<HiDPIOptimizationType>(extraDataString(GUI_HiDPI_Optimization, strID));
+}
+
+bool UIExtraDataManager::passCADtoGuest(const QString &strID) const
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_PassCAD, strID);
 }
 

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

@@ -271 +271 @@
     HiDPIOptimizationType hiDPIOptimizationType(const QString &strID) const;
 
+    /** Returns whether VM should pass CAD to guest. */
+    bool passCADtoGuest(const QString &strID) const;
+
 private slots:
 

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

@@ -39 +39 @@
 #include "UIMachineView.h"
 #include "UIHostComboEditor.h"
+#include "UIExtraDataManager.h"
 
 /* Other VBox includes: */
@@ -762 +763 @@
     , m_bIsHostComboAlone(false)
     , m_bIsHostComboProcessed(false)
-    , m_fPassCAD(false)
+    , m_fPassCADtoGuest(false)
     , m_fDebuggerActive(false)
 #if defined(Q_WS_WIN)
@@ -810 +811 @@
     /* Extra data settings: */
     {
-        /* CAD settings: */
-        QString passCAD = session().GetConsole().GetMachine().GetExtraData(GUI_PassCAD);
-        if (!passCAD.isEmpty() && passCAD != "false" && passCAD != "no")
-            m_fPassCAD = true;
+        /* CAD setting: */
+        m_fPassCADtoGuest = gEDataManager->passCADtoGuest(vboxGlobal().managedVMUuid());
     }
 }
@@ -1228 +1227 @@
 bool UIKeyboardHandler::keyEventCADHandled(uint8_t uScan)
 {
-    /* Check if it's C-A-D and GUI/PassCAD is not true: */
-    if (!m_fPassCAD &&
+    /* Check if it's C-A-D and GUI/PassCAD is not set/allowed: */
+    if (!m_fPassCADtoGuest &&
         uScan == 0x53 /* Del */ &&
         ((m_pressedKeys[0x38] & IsKeyPressed) /* Alt */ ||

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

@@ -172 +172 @@
     bool m_bIsHostComboAlone : 1;
     bool m_bIsHostComboProcessed : 1;
-    bool m_fPassCAD : 1;
+    bool m_fPassCADtoGuest : 1;
     /** Whether the debugger is active.
      * Currently only affects auto capturing. */