Changeset 65701 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 9, 2017 2:54:41 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: Input page: Separate shortcut search functor for ease of access; this allowed to make default shortcut comparison full (e.g. to include sequence).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (modified) (6 diffs)

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

@@ -147 +147 @@
     bool operator==(const UIDataShortcutRow &other) const
     {
-        /* Compare by the key only: */
-        return m_strKey == other.key();
+        /* Compare by the key and the current sequence: */
+        return true
+               && (m_strKey == other.key())
+               && (m_strCurrentSequence == other.currentSequence())
+               ;
     }
 
@@ -297 +300 @@
 
 
+/** Global settings: Input page: Shortcut search functor. */
+class UIFunctorFindShortcut
+{
+public:
+
+    /** Search match level enumerator. */
+    enum UIMatchLevel { Base, Full };
+
+    /** Constructs shortcut search functor.
+      * @param  matchLevel  Brings the search match level. */
+    UIFunctorFindShortcut(UIMatchLevel enmMatchLevel)
+        : m_enmMatchLevel(enmMatchLevel)
+    {}
+
+    /** Returns the position of the 1st occurrence of the
+      * @a shortcut in the @a shortcuts list, or -1 otherwise. */
+    int operator()(const UIShortcutCache &shortcuts, const UIDataShortcutRow &shortcut)
+    {
+        for (int i = 0; i < shortcuts.size(); ++i)
+        {
+            const UIDataShortcutRow &iteratedShortcut = shortcuts.at(i);
+            switch (m_enmMatchLevel)
+            {
+                case Base:
+                {
+                    if (iteratedShortcut.key() == shortcut.key())
+                        return i;
+                    break;
+                }
+                case Full:
+                {
+                    if (   iteratedShortcut.key() == shortcut.key()
+                        && iteratedShortcut.currentSequence() == shortcut.currentSequence())
+                        return i;
+                    break;
+                }
+            }
+        }
+        return -1;
+    }
+
+private:
+
+    /** Holds the search match level. */
+    const UIMatchLevel m_enmMatchLevel;
+};
+
+
 /* A model representing hot-key combination table: */
 class UIHotKeyTableModel : public QAbstractTableModel
@@ -436 +487 @@
     {
         /* Search for corresponding cache item index: */
-        int iIndexOfCacheItem = shortcuts.indexOf(item);
+        int iIndexOfCacheItem = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(shortcuts, item);
         /* Make sure index is valid: */
         if (iIndexOfCacheItem == -1)
@@ -639 +690 @@
                     /* Set sequence to shortcut: */
                     UIDataShortcutRow &filteredShortcut = m_filteredShortcuts[iIndex];
-                    int iShortcutIndex = m_shortcuts.indexOf(filteredShortcut);
+                    int iShortcutIndex = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_shortcuts, filteredShortcut);
                     if (iShortcutIndex != -1)
                     {
@@ -667 +718 @@
     /* Make sure host-combo item is always the first one: */
     UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
-    int iIndexOfHostComboItem = m_shortcuts.indexOf(fakeHostComboItem);
+    int iIndexOfHostComboItem = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_shortcuts, fakeHostComboItem);
     if (iIndexOfHostComboItem != -1)
     {
@@ -952 +1003 @@
     UISettingsPageGlobal::fetchData(data);
 
-    // WORKAROUND:
-    // For now we are using out-of-the-box Qt functions to search for a corresponding shortcuts.
-    // Those functions assumes that container elements implement operator==() which we can use
-    // either for "index-match" (to just find shortcut item independent on parameters) or for
-    // "full-match" (to find exact shortcut item including all parameters) but not for both,
-    // so since "index-match" is most commonly used, we need separate "full-match" functor
-    // to check whether the shortcut item was changed, for now we can't do that.
-
-    /* Save host-combo shortcut from cache: */
-    UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
-    //const int iIndexOfHostComboItemBase = m_pCache->base().shortcuts().indexOf(fakeHostComboItem);
-    const int iIndexOfHostComboItemData = m_pCache->data().shortcuts().indexOf(fakeHostComboItem);
-    if (   iIndexOfHostComboItemData != -1
-        //&& iIndexOfHostComboItemData != iIndexOfHostComboItemBase
-        )
-        m_settings.setHostCombo(m_pCache->data().shortcuts().at(iIndexOfHostComboItemData).currentSequence());
-
-    /* Save other shortcut sequences from cache: */
-    QMap<QString, QString> sequencesBase;
-    QMap<QString, QString> sequencesData;
-    foreach (const UIDataShortcutRow &item, m_pCache->base().shortcuts())
-        sequencesBase.insert(item.key(), item.currentSequence());
-    foreach (const UIDataShortcutRow &item, m_pCache->data().shortcuts())
-        sequencesData.insert(item.key(), item.currentSequence());
-    if (sequencesData != sequencesBase)
-        gShortcutPool->setOverrides(sequencesData);
-
     /* Save new data from cache: */
     if (m_pCache->wasChanged())
     {
+        /* Save host-combo shortcut from cache: */
+        UIDataShortcutRow fakeHostComboItem(0, UIHostCombo::hostComboCacheKey(), QString(), QString(), QString());
+        const int iHostComboItemBase = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_pCache->base().shortcuts(), fakeHostComboItem);
+        const int iHostComboItemData = UIFunctorFindShortcut(UIFunctorFindShortcut::Base)(m_pCache->data().shortcuts(), fakeHostComboItem);
+        const QString strHostComboBase = iHostComboItemBase != -1 ? m_pCache->base().shortcuts().at(iHostComboItemBase).currentSequence() : QString();
+        const QString strHostComboData = iHostComboItemData != -1 ? m_pCache->data().shortcuts().at(iHostComboItemData).currentSequence() : QString();
+        if (strHostComboData != strHostComboBase)
+            m_settings.setHostCombo(strHostComboData);
+
+        /* Save other shortcut sequences from cache: */
+        QMap<QString, QString> sequencesBase;
+        QMap<QString, QString> sequencesData;
+        foreach (const UIDataShortcutRow &item, m_pCache->base().shortcuts())
+            sequencesBase.insert(item.key(), item.currentSequence());
+        foreach (const UIDataShortcutRow &item, m_pCache->data().shortcuts())
+            sequencesData.insert(item.key(), item.currentSequence());
+        if (sequencesData != sequencesBase)
+            gShortcutPool->setOverrides(sequencesData);
+
         /* Save other things from cache: */
         if (m_pCache->data().autoCapture() != m_pCache->base().autoCapture())