Changeset 66569 in vbox

Timestamp:

Apr 14, 2017 11:13:47 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114596

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving host-key combination handling into extra-data manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (6 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)
• globals/UIMessageCenter.cpp (modified) (4 diffs)
• globals/UIPopupCenter.cpp (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (2 diffs)
• runtime/UIKeyboardHandler.cpp (modified) (5 diffs)
• settings/global/UIGlobalSettingsInput.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
 # include "UIExtraDataDefs.h"
 # include "VBoxGlobalSettings.h"
-# include "UIHostComboEditor.h"
 
 /* COM includes: */
@@ -52 +51 @@
 {
     /* default settings */
-#if defined (VBOX_WS_WIN)
-    hostCombo = "163"; // VK_RCONTROL
-#elif defined (VBOX_WS_X11)
-    hostCombo = "65508"; // XK_Control_R
-#elif defined (VBOX_WS_MAC)
-    hostCombo = "55"; // QZ_LMETA
-#else
-# warning "port me!"
-#endif
 #if defined(VBOX_WS_X11) && defined(DEBUG)
     autoCapture = false;
@@ -76 +66 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    hostCombo = that.hostCombo;
     autoCapture = that.autoCapture;
     guiFeatures = that.guiFeatures;
@@ -93 +82 @@
 {
     return this == &that ||
-        (hostCombo == that.hostCombo &&
-         autoCapture == that.autoCapture &&
+        (autoCapture == that.autoCapture &&
          guiFeatures == that.guiFeatures &&
          languageId  == that.languageId &&
@@ -122 +110 @@
 gPropertyMap[] =
 {
-    { "GUI/Input/HostKeyCombination",              "hostCombo",               "0|\\d*[1-9]\\d*(,\\d*[1-9]\\d*)?(,\\d*[1-9]\\d*)?", true },
     { "GUI/Input/AutoCapture",                     "autoCapture",             "true|false", true },
     { "GUI/Customizations",                        "guiFeatures",             "\\S+", true },
@@ -131 +118 @@
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }
 };
-
-void VBoxGlobalSettings::setHostCombo (const QString &hostCombo)
-{
-    if (!UIHostCombo::isValidKeyCombo (hostCombo))
-    {
-        last_err = tr ("'%1' is an invalid host-combination code-sequence.").arg (hostCombo);
-        return;
-    }
-    mData()->hostCombo = hostCombo;
-    resetError();
-}
 
 bool VBoxGlobalSettings::isFeatureActive (const char *aFeature) const

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

@@ -37 +37 @@
 private:
 
-    QString hostCombo;
     bool autoCapture;
     QString guiFeatures;
@@ -54 +53 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString hostCombo READ hostCombo WRITE setHostCombo)
     Q_PROPERTY (bool autoCapture READ autoCapture WRITE setAutoCapture)
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
@@ -75 +73 @@
 
     // Properties
-
-    QString hostCombo() const { return data()->hostCombo; }
-    void setHostCombo (const QString &hostCombo);
 
     bool autoCapture() const { return data()->autoCapture; }

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

@@ -54 +54 @@
 const char* UIExtraDataDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
 const char* UIExtraDataDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
+const char* UIExtraDataDefs::GUI_Input_HostKeyCombination = "GUI/Input/HostKeyCombination";
 
 /* Settings: Storage: */

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

@@ -83 +83 @@
         /** Holds Runtime UI shortcut overrides. */
         extern const char* GUI_Input_MachineShortcuts;
+        /** Holds Runtime UI host-key combination. */
+        extern const char* GUI_Input_HostKeyCombination;
     /** @} */
 

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

@@ -40 +40 @@
 # include "UIDesktopWidgetWatchdog.h"
 # include "UIExtraDataManager.h"
+# include "UIHostComboEditor.h"
 # include "UIMainEventListener.h"
 # include "VBoxGlobalSettings.h"
@@ -2337 +2338 @@
 }
 
+QString UIExtraDataManager::hostKeyCombination()
+{
+    /* Acquire host-key combination: */
+    QString strHostCombo = extraDataString(GUI_Input_HostKeyCombination);
+    /* Invent some sane default if it's absolutely wrong or invalid: */
+    QRegularExpression reTemplate("0|[1-9]\\d*(,[1-9]\\d*)?(,[1-9]\\d*)?");
+    if (!reTemplate.match(strHostCombo).hasMatch() || !UIHostCombo::isValidKeyCombo(strHostCombo))
+    {
+#if   defined (VBOX_WS_MAC)
+        strHostCombo = "55"; // QZ_LMETA
+#elif defined (VBOX_WS_WIN)
+        strHostCombo = "163"; // VK_RCONTROL
+#elif defined (VBOX_WS_X11)
+        strHostCombo = "65508"; // XK_Control_R
+#else
+# warning "port me!"
+#endif
+    }
+    /* Return host-combo: */
+    return strHostCombo;
+}
+
+void UIExtraDataManager::setHostKeyCombination(const QString &strHostCombo)
+{
+    /* Do not save anything if it's absolutely wrong or invalid: */
+    QRegularExpression reTemplate("0|[1-9]\\d*(,[1-9]\\d*)?(,[1-9]\\d*)?");
+    if (!reTemplate.match(strHostCombo).hasMatch() || !UIHostCombo::isValidKeyCombo(strHostCombo))
+        return;
+    /* Define host-combo: */
+    setExtraDataString(GUI_Input_HostKeyCombination, strHostCombo);
+}
+
 QStringList UIExtraDataManager::shortcutOverrides(const QString &strPoolExtraDataID)
 {
@@ -3986 +4019 @@
             else if (strKey == GUI_Input_MachineShortcuts)
                 emit sigRuntimeUIShortcutChange();
+            /* Runtime UI host-key combintation changed? */
+            else if (strKey == GUI_Input_HostKeyCombination)
+                emit sigRuntimeUIHostKeyCombinationChange();
         }
     }

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

@@ -67 +67 @@
     /** Notifies about Runtime UI keyboard shortcut change. */
     void sigRuntimeUIShortcutChange();
+    /** Notifies about Runtime UI host-key combination change. */
+    void sigRuntimeUIHostKeyCombinationChange();
 
     /** Notifies about menu-bar configuration change. */
@@ -193 +195 @@
     /** @name Settings: Keyboard
       * @{ */
+        /** Returns the Runtime UI host-key combination. */
+        QString hostKeyCombination();
+        /** Defines the Runtime UI host-key combination. */
+        void setHostKeyCombination(const QString &strHostCombo);
+
         /** Returns shortcut overrides for shortcut-pool with @a strPoolExtraDataID. */
         QStringList shortcutOverrides(const QString &strPoolExtraDataID);

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

@@ -2071 +2071 @@
                          "This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p>") +
                       tr("<p>The host key is currently defined as <b>%1</b>.</p>", "additional message box paragraph")
-                         .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
+                         .arg(UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())),
                       "confirmInputCapture",
                       AlertButton_Ok | AlertButtonOption_Default,
@@ -2091 +2091 @@
                              "<p>Note that the main menu bar is hidden in full-screen mode. "
                              "You can access it by pressing <b>Host+Home</b>.</p>")
-                             .arg(strHotKey, UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
+                             .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())),
                           "confirmGoingFullscreen",
                           tr("Switch"));
@@ -2104 +2104 @@
                              "<p>Note that the main menu bar is hidden in seamless mode. "
                              "You can access it by pressing <b>Host+Home</b>.</p>")
-                             .arg(strHotKey, UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
+                             .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())),
                           "confirmGoingSeamless",
                           tr("Switch"));
@@ -2117 +2117 @@
                              "<p>Note that the main menu bar is hidden in scaled mode. "
                              "You can access it by pressing <b>Host+Home</b>.</p>")
-                             .arg(strHotKey, UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
+                             .arg(strHotKey, UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())),
                           "confirmGoingScale",
                           tr("Switch"));

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

@@ -434 +434 @@
           QApplication::translate("UIMessageCenter", "<p>The host key is currently defined as <b>%1</b>.</p>",
                                                      "additional message box paragraph")
-                                                     .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())),
+                                                     .arg(UIHostCombo::toReadableString(gEDataManager->hostKeyCombination())),
           true);
 }

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

@@ -1005 +1005 @@
     {
         /* Make sure host-combination label will be updated: */
-        connect(&vboxGlobal().settings(), SIGNAL(propertyChanged(const char *, const char *)),
+        connect(gEDataManager, SIGNAL(sigRuntimeUIHostKeyCombinationChange()),
                 this, SLOT(sltUpdateAppearance()));
         /* Translate finally: */
@@ -1016 +1016 @@
     void sltUpdateAppearance()
     {
-        setText(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo()));
+        setText(UIHostCombo::toReadableString(gEDataManager->hostKeyCombination()));
     }
 

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

@@ -533 +533 @@
             if (!fSentRESEND)
             {
-                QList <unsigned> shortCodes = UIHostCombo::modifiersToScanCodes(m_globalSettings.hostCombo());
+                QList <unsigned> shortCodes = UIHostCombo::modifiersToScanCodes(gEDataManager->hostKeyCombination());
                 QVector <LONG> codes;
                 foreach (unsigned idxCode, shortCodes)
@@ -572 +572 @@
 #ifdef VBOX_WS_MAC
     unsigned int hostComboModifierMask = 0;
-    QList<int> hostCombo = UIHostCombo::toKeyCodeList(m_globalSettings.hostCombo());
+    QList<int> hostCombo = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination());
     for (int i = 0; i < hostCombo.size(); ++i)
         hostComboModifierMask |= ::DarwinKeyCodeToDarwinModifierMask(hostCombo.at(i));
@@ -1901 +1901 @@
                            ? IsExtKeyPressed : IsKeyPressed;
     if (   (event.flags & 0x80) /* released */
-        && (   (   UIHostCombo::toKeyCodeList(m_globalSettings.hostCombo()).contains(event.vkCode)
+        && (   (   UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination()).contains(event.vkCode)
                 && !m_fIsHostkeyInCapture)
             ||    (  m_pressedKeys[event.scanCode & 0x7F]
@@ -1978 +1978 @@
 {
     /* Get host-combo key list: */
-    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(m_globalSettings.hostCombo()).toSet();
+    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination()).toSet();
     /* Get the type of key - simple or extended: */
     uint8_t uWhatPressed = fFlags & KeyExtended ? IsExtKeyPressed : IsKeyPressed;
@@ -2155 +2155 @@
 {
     /* Get host-combo key list: */
-    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(m_globalSettings.hostCombo()).toSet();
+    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination()).toSet();
 
     /* Update the map of pressed host-combo keys: */

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

@@ -35 +35 @@
 # include "UIHotKeyEditor.h"
 # include "UIShortcutPool.h"
+# include "UIExtraDataManager.h"
 # include "VBoxGlobalSettings.h"
 
@@ -892 +893 @@
 
     /* Gather old input data: */
-    oldInputData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"),  m_settings.hostCombo(), QString());
+    oldInputData.shortcuts() << UIDataShortcutRow(m_pMachineTable, UIHostCombo::hostComboCacheKey(), tr("Host Key Combination"),  gEDataManager->hostKeyCombination(), QString());
     const QMap<QString, UIShortcut> &shortcuts = gShortcutPool->shortcuts();
     const QList<QString> shortcutKeys = shortcuts.keys();
@@ -957 +958 @@
         const QString strHostComboData = iHostComboItemData != -1 ? m_pCache->data().shortcuts().at(iHostComboItemData).currentSequence() : QString();
         if (strHostComboData != strHostComboBase)
-            m_settings.setHostCombo(strHostComboData);
+            gEDataManager->setHostKeyCombination(strHostComboData);
 
         /* Save other new shortcuts from the cache: */