Changeset 66589 in vbox for trunk/src

Timestamp:

Apr 17, 2017 2:00:39 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving remapped scan codes handling into extra-data manager (it's X11 stuff generally).

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) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIKeyboardHandler.cpp (modified) (1 diff)
• widgets/UIHostComboEditor.cpp (modified) (2 diffs)

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

@@ -51 +51 @@
 {
     /* default settings */
-    remapScancodes = QString::null;
     proxySettings = QString::null;
     hostScreenSaverDisabled = false;
@@ -58 +57 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    remapScancodes = that.remapScancodes;
     proxySettings = that.proxySettings;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
@@ -70 +68 @@
 {
     return this == &that ||
-        (remapScancodes == that.remapScancodes &&
-         proxySettings == that.proxySettings &&
+        (proxySettings == that.proxySettings &&
          hostScreenSaverDisabled == that.hostScreenSaverDisabled
         );
@@ -91 +88 @@
 gPropertyMap[] =
 {
-    { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
     { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }

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

@@ -37 +37 @@
 private:
 
-    QString remapScancodes;
     QString proxySettings;
     bool hostScreenSaverDisabled;
@@ -49 +48 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
     Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
@@ -65 +63 @@
 
     // Properties
-
-    QString remapScancodes() const { return data()->remapScancodes; }
-    void setRemapScancodes (const QString &aRemapScancodes)
-    {
-        mData()->remapScancodes = aRemapScancodes;
-    }
 
     QString proxySettings() const { return data()->proxySettings; }

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

@@ -60 +60 @@
 const char* UIExtraDataDefs::GUI_Input_HostKeyCombination = "GUI/Input/HostKeyCombination";
 const char* UIExtraDataDefs::GUI_Input_AutoCapture = "GUI/Input/AutoCapture";
+const char* UIExtraDataDefs::GUI_RemapScancodes = "GUI/RemapScancodes";
 
 /* Settings: Storage: */

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

@@ -94 +94 @@
         /** Holds whether Runtime UI auto-capture is enabled. */
         extern const char* GUI_Input_AutoCapture;
+        /** Holds Runtime UI remapped scan codes. */
+        extern const char* GUI_RemapScancodes;
     /** @} */
 

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

@@ -2480 +2480 @@
 }
 
+QString UIExtraDataManager::remappedScanCodes()
+{
+    /* Acquire remapped scan codes: */
+    QString strRemappedScanCodes = extraDataString(GUI_RemapScancodes);
+    /* Clear the record if it's absolutely wrong: */
+    QRegularExpression reTemplate("(\\d+=\\d+,)*\\d+=\\d+");
+    if (!reTemplate.match(strRemappedScanCodes).hasMatch())
+        strRemappedScanCodes.clear();
+    /* Return remapped scan codes: */
+    return strRemappedScanCodes;
+}
+
 QString UIExtraDataManager::recentFolderForHardDrives()
 {

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

@@ -228 +228 @@
         /** Defines whether the Runtime UI auto-capture is @a fEnabled. */
         void setAutoCaptureEnabled(bool fEnabled);
+
+        /** Returns the Runtime UI remapped scan codes. */
+        QString remappedScanCodes();
     /** @} */
 

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

@@ -1603 +1603 @@
 #ifdef VBOX_WS_X11
     /* Initialize the X keyboard subsystem: */
-    initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
+    initMappedX11Keyboard(QX11Info::display(), gEDataManager->remappedScanCodes());
 #endif /* VBOX_WS_X11 */
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -32 +32 @@
 /* GUI includes: */
 # include "UIHostComboEditor.h"
-# include "UIExtraDataDefs.h"
+# include "UIExtraDataManager.h"
 # include "UIIconPool.h"
 # include "VBoxGlobal.h"
@@ -584 +584 @@
 #elif defined(VBOX_WS_X11)
     /* Initialize the X keyboard subsystem: */
-    initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
+    initMappedX11Keyboard(QX11Info::display(), gEDataManager->remappedScanCodes());
 #endif /* VBOX_WS_X11 */
 }