Changeset 44712 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 15, 2013 1:12:31 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6065: Extend UIHotKey with type access API, using it in UIHotKeyTableModel.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)
• widgets/UIHotKeyEditor.cpp (modified) (3 diffs)
• widgets/UIHotKeyEditor.h (modified) (5 diffs)

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

@@ -260 +260 @@
                 case UIHotKeyTableSection_Value: return m_filteredShortcuts[iIndex].key == UIHostCombo::hostComboCacheKey() ?
                                                         QVariant::fromValue(UIHostComboWrapper(m_filteredShortcuts[iIndex].currentSequence)) :
-                                                        QVariant::fromValue(UIHotKey(m_filteredShortcuts[iIndex].currentSequence,
+                                                        QVariant::fromValue(UIHotKey(m_type == UIActionPoolType_Runtime ?
+                                                                                     UIHotKeyType_Simple : UIHotKeyType_WithModifiers,
+                                                                                     m_filteredShortcuts[iIndex].currentSequence,
                                                                                      m_filteredShortcuts[iIndex].defaultSequence));
                 default: break;

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

@@ -103 +103 @@
 UIHotKeyEditor::UIHotKeyEditor(QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_fIsModifiersAllowed(false)
     , m_pMainLayout(new QHBoxLayout(this))
     , m_pLineEdit(new UIHotKeyLineEdit(this))
@@ -251 +252 @@
 void UIHotKeyEditor::fetchModifiersState()
 {
+    /* Make sure modifiers allowed: */
+    if (!m_fIsModifiersAllowed)
+        return;
+
     /* If full sequence was not yet taken: */
     if (!m_fSequenceTaken)
@@ -386 +391 @@
 void UIHotKeyEditor::setHotKey(const UIHotKey &hotKey)
 {
+    m_fIsModifiersAllowed = hotKey.type() == UIHotKeyType_WithModifiers;
     m_hotKey = hotKey;
     m_pLineEdit->setText(hotKey.sequence());

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

@@ -33 +33 @@
 class UIHotKeyLineEdit;
 
+/* Host key type enumerator: */
+enum UIHotKeyType
+{
+    UIHotKeyType_Simple,
+    UIHotKeyType_WithModifiers
+};
+
 /* A string pair wrapper for hot-key sequence: */
 class UIHotKey
@@ -39 +46 @@
 
     /* Constructors: */
-    UIHotKey() {}
-    UIHotKey(const QString &strSequence,
+    UIHotKey()
+        : m_type(UIHotKeyType_Simple)
+    {}
+    UIHotKey(UIHotKeyType type,
+             const QString &strSequence,
              const QString &strDefaultSequence)
-        : m_strSequence(strSequence)
+        : m_type(type)
+        , m_strSequence(strSequence)
         , m_strDefaultSequence(strDefaultSequence)
     {}
     UIHotKey(const UIHotKey &other)
-        : m_strSequence(other.sequence())
+        : m_type(other.type())
+        , m_strSequence(other.sequence())
         , m_strDefaultSequence(other.defaultSequence())
     {}
@@ -58 +70 @@
     }
 
-    /* API: Access stuff: */
+    /* API: Type access stuff: */
+    UIHotKeyType type() const { return m_type; }
+
+    /* API: Sequence access stuff: */
     const QString& sequence() const { return m_strSequence; }
     const QString& defaultSequence() const { return m_strDefaultSequence; }
@@ -66 +81 @@
 
     /* Variables: */
+    UIHotKeyType m_type;
     QString m_strSequence;
     QString m_strDefaultSequence;
@@ -117 +133 @@
     /* Variables: */
     mutable UIHotKey m_hotKey;
+    mutable bool m_fIsModifiersAllowed;
     QHBoxLayout *m_pMainLayout;
     UIHotKeyLineEdit *m_pLineEdit;