Changeset 66571 in vbox

Timestamp:

Apr 14, 2017 12:39:44 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving auto-capture feature handling into extra-data manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• runtime/UIKeyboardHandler.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.cpp (modified) (3 diffs)

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

@@ -51 +51 @@
 {
     /* default settings */
-#if defined(VBOX_WS_X11) && defined(DEBUG)
-    autoCapture = false;
-#else
-    autoCapture = true;
-#endif
     guiFeatures = QString::null;
     languageId  = QString::null;
@@ -66 +61 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    autoCapture = that.autoCapture;
     guiFeatures = that.guiFeatures;
     languageId  = that.languageId;
@@ -82 +76 @@
 {
     return this == &that ||
-        (autoCapture == that.autoCapture &&
-         guiFeatures == that.guiFeatures &&
+        (guiFeatures == that.guiFeatures &&
          languageId  == that.languageId &&
          maxGuestRes == that.maxGuestRes &&
@@ -110 +103 @@
 gPropertyMap[] =
 {
-    { "GUI/Input/AutoCapture",                     "autoCapture",             "true|false", true },
     { "GUI/Customizations",                        "guiFeatures",             "\\S+", true },
     { "GUI/LanguageID",                            "languageId",              gVBoxLangIDRegExp, true },

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -37 +37 @@
 private:
 
-    bool autoCapture;
     QString guiFeatures;
     QString languageId;
@@ -53 +52 @@
 {
     Q_OBJECT
-    Q_PROPERTY (bool autoCapture READ autoCapture WRITE setAutoCapture)
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
     Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
@@ -73 +71 @@
 
     // Properties
-
-    bool autoCapture() const { return data()->autoCapture; }
-    void setAutoCapture (bool aAutoCapture)
-    {
-        mData()->autoCapture = aAutoCapture;
-        resetError();
-    }
 
     QString guiFeatures() const { return data()->guiFeatures; }

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

@@ -55 +55 @@
 const char* UIExtraDataDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
 const char* UIExtraDataDefs::GUI_Input_HostKeyCombination = "GUI/Input/HostKeyCombination";
+const char* UIExtraDataDefs::GUI_Input_AutoCapture = "GUI/Input/AutoCapture";
 
 /* Settings: Storage: */

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

@@ -85 +85 @@
         /** Holds Runtime UI host-key combination. */
         extern const char* GUI_Input_HostKeyCombination;
+        /** Holds whether Runtime UI auto-capture is enabled. */
+        extern const char* GUI_Input_AutoCapture;
     /** @} */
 

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

@@ -2357 +2357 @@
 #endif
     }
-    /* Return host-combo: */
+    /* Return host-key combination: */
     return strHostCombo;
 }
@@ -2378 +2378 @@
         return extraDataStringList(GUI_Input_MachineShortcuts);
     return QStringList();
+}
+
+bool UIExtraDataManager::autoCaptureEnabled()
+{
+    /* Prepare auto-capture flag: */
+    bool fAutoCapture = true /* indifferently */;
+    /* Acquire whether the auto-capture is restricted: */
+    QString strAutoCapture = extraDataString(GUI_Input_AutoCapture);
+    /* Invent some sane default if it's empty: */
+    if (strAutoCapture.isEmpty())
+    {
+#if defined(VBOX_WS_X11) && defined(DEBUG)
+        fAutoCapture = false;
+#else
+        fAutoCapture = true;
+#endif
+    }
+    /* 'True' unless feature restricted: */
+    else
+        fAutoCapture = !isFeatureRestricted(GUI_Input_AutoCapture);
+    /* Return auto-capture flag: */
+    return fAutoCapture;
+}
+
+void UIExtraDataManager::setAutoCaptureEnabled(bool fEnabled)
+{
+    /* Store actual feature state, whether it is "true" or "false",
+     * because absent state means default, different on various hosts: */
+    setExtraDataString(GUI_Input_AutoCapture, toFeatureState(fEnabled));
 }
 
@@ -4230 +4259 @@
 }
 
+QString UIExtraDataManager::toFeatureState(bool fState)
+{
+    return fState ? QString("true") : QString("false");
+}
+
 QString UIExtraDataManager::toFeatureAllowed(bool fAllowed)
 {

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

@@ -202 +202 @@
         /** Returns shortcut overrides for shortcut-pool with @a strPoolExtraDataID. */
         QStringList shortcutOverrides(const QString &strPoolExtraDataID);
+
+        /** Returns whether the Runtime UI auto-capture is enabled. */
+        bool autoCaptureEnabled();
+        /** Defines whether the Runtime UI auto-capture is @a fEnabled. */
+        void setAutoCaptureEnabled(bool fEnabled);
     /** @} */
 
@@ -619 +624 @@
     bool isFeatureRestricted(const QString &strKey, const QString &strID = GlobalID);
 
+    /** Translates bool flag into QString value. */
+    QString toFeatureState(bool fState);
     /** Translates bool flag into 'allowed' value. */
     QString toFeatureAllowed(bool fAllowed);

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

@@ -1544 +1544 @@
     , m_pMachineLogic(pMachineLogic)
     , m_iKeyboardCaptureViewIndex(-1)
-    , m_globalSettings(vboxGlobal().settings())
     , m_fIsKeyboardCaptured(false)
     , m_bIsHostComboPressed(false)
@@ -2476 +2475 @@
 bool UIKeyboardHandler::autoCaptureSetGlobally()
 {
-    return m_globalSettings.autoCapture() && !m_fDebuggerActive;
+    return gEDataManager->autoCaptureEnabled() && !m_fDebuggerActive;
 }
 

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

@@ -37 +37 @@
 /* Forward declarations: */
 class QWidget;
-class VBoxGlobalSettings;
 class UIActionPool;
 class UISession;
@@ -212 +211 @@
     /* Other keyboard variables: */
     int m_iKeyboardCaptureViewIndex;
-    const VBoxGlobalSettings &m_globalSettings;
 
     uint8_t m_pressedKeys[128];

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

@@ -167 +167 @@
 
     /* Notify user about mouse&keyboard auto-capturing: */
-    if (vboxGlobal().settings().autoCapture())
+    if (gEDataManager->autoCaptureEnabled())
         popupCenter().remindAboutAutoCapture(machineLogic()->activeMachineWindow());
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -36 +36 @@
 # include "UIShortcutPool.h"
 # include "UIExtraDataManager.h"
-# include "VBoxGlobalSettings.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -906 +905 @@
                                                  shortcut.defaultSequence().toString(QKeySequence::NativeText));
     }
-    oldInputData.setAutoCapture(m_settings.autoCapture());
+    oldInputData.setAutoCapture(gEDataManager->autoCaptureEnabled());
 
     /* Cache old input data: */
@@ -972 +971 @@
         /* Save other new things from the cache: */
         if (m_pCache->data().autoCapture() != m_pCache->base().autoCapture())
-            m_settings.setAutoCapture(m_pCache->data().autoCapture());
+            gEDataManager->setAutoCaptureEnabled(m_pCache->data().autoCapture());
     }