Changeset 35735 in vbox

Timestamp:

Jan 27, 2011 12:15:53 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5245: GUI support for complex host-key combinations: Host-key combination size limited to 3 keys.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (modified) (5 diffs)

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

@@ -243 +243 @@
 
 
+namespace UIHotKeyCombination
+{
+    int m_iMaxComboSize = 3;
+}
+
 QString UIHotKeyCombination::toReadableString(const QString &strKeyCombo)
 {
@@ -266 +271 @@
 {
     QList<int> keyCodeList = toKeyCodeList(strKeyCombo);
+    if (keyCodeList.size() > m_iMaxComboSize)
+        return false;
     for (int i = 0; i < keyCodeList.size(); ++i)
         if (!UIHotKey::isValidKey(keyCodeList[i]))
@@ -382 +389 @@
                     m_shownKeys.clear();
 
-                /* Remember pressed symbol: */
-                m_pressedKeys << pMsg->wParam;
-                m_shownKeys.insert(iKeyCode, UIHotKey::toString(iKeyCode));
-
-                /* Remember what we already started a sequence: */
-                m_fStartNewSequence = false;
+                /* Check maximum combo size: */
+                if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
+                {
+                    /* Remember pressed symbol: */
+                    m_pressedKeys << pMsg->wParam;
+                    m_shownKeys.insert(iKeyCode, UIHotKey::toString(iKeyCode));
+
+                    /* Remember what we already started a sequence: */
+                    m_fStartNewSequence = false;
+                }
             }
             /* Key release: */
@@ -438 +449 @@
                     m_shownKeys.clear();
 
-                /* Remember pressed symbol: */
-                m_pressedKeys << iKeySym;
-                m_shownKeys.insert(iKeySym, UIHotKey::toString(iKeySym));
-
-                /* Remember what we already started a sequence: */
-                m_fStartNewSequence = false;
+                /* Check maximum combo size: */
+                if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
+                {
+                    /* Remember pressed symbol: */
+                    m_pressedKeys << iKeySym;
+                    m_shownKeys.insert(iKeySym, UIHotKey::toString(iKeySym));
+
+                    /* Remember what we already started a sequence: */
+                    m_fStartNewSequence = false;
+                }
             }
             /* Key release: */
@@ -528 +543 @@
                         m_shownKeys.clear();
 
-                    /* Remember pressed symbol: */
-                    m_pressedKeys << iKeyCode;
-                    m_shownKeys.insert(iKeyCode, UIHotKey::toString(iKeyCode));
-
-                    /* Remember what we already started a sequence: */
-                    m_fStartNewSequence = false;
+                    /* Check maximum combo size: */
+                    if (m_shownKeys.size() < UIHotKeyCombination::m_iMaxComboSize)
+                    {
+                        /* Remember pressed symbol: */
+                        m_pressedKeys << iKeyCode;
+                        m_shownKeys.insert(iKeyCode, UIHotKey::toString(iKeyCode));
+
+                        /* Remember what we already started a sequence: */
+                        m_fStartNewSequence = false;
+                    }
                 }
             }