Changeset 44585 in vbox

Timestamp:

Feb 7, 2013 1:44:00 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6065: Extend UIShortcut with the default-sequence information.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIShortcutPool.cpp (modified) (6 diffs)
• UIShortcutPool.h (modified) (4 diffs)

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

@@ -42 +42 @@
 }
 
+void UIShortcut::setDefaultSequence(const QKeySequence &defaultSequence)
+{
+    m_defaultSequence = defaultSequence;
+}
+
+const QKeySequence& UIShortcut::defaultSequence() const
+{
+    return m_defaultSequence;
+}
+
 QString UIShortcut::toString() const
 {
@@ -94 +104 @@
     newShortcut.setDescription(pAction->name());
     newShortcut.setSequence(pAction->defaultShortcut(pActionPool->type()));
+    newShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
     return newShortcut;
 }
@@ -124 +135 @@
             /* Copy the sequence from the shortcut to the action: */
             pAction->setShortcut(existingShortcut.sequence());
+            /* Copy the default sequence from the action to the shortcut: */
+            existingShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
         }
         /* If shortcut key is NOT known yet: */
@@ -132 +145 @@
             /* Copy the action's default to both the shortcut & the action: */
             newShortcut.setSequence(pAction->defaultShortcut(pActionPool->type()));
+            newShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
             pAction->setShortcut(newShortcut.sequence());
             /* Copy the description from the action to the shortcut: */
@@ -202 +216 @@
     /* Default shortcut for the Runtime Popup Menu invokation: */
     m_shortcuts.insert(strRuntimeShortcutKeyTemplate.arg("PopupMenu"),
-                       UIShortcut(QApplication::translate("UIActonPool", "Popup Menu"), QString("Home")));
+                       UIShortcut(QApplication::translate("UIActonPool", "Popup Menu"), QString("Home"), QString("Home")));
 }
 
@@ -234 +248 @@
         /* Modify map with composed key/value: */
         if (!m_shortcuts.contains(strShortcutKey))
-            m_shortcuts.insert(strShortcutKey, UIShortcut(QString(), strShortcutSequence));
+            m_shortcuts.insert(strShortcutKey, UIShortcut(QString(), strShortcutSequence, QString()));
         else
         {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h

@@ -35 +35 @@
 public:
 
-    /* Constructor: */
-    UIShortcut(const QString &strDescription = QString(),
-               const QKeySequence &sequence = QKeySequence())
-        : m_strDescription(strDescription), m_sequence(sequence) {}
+    /* Constructors: */
+    UIShortcut()
+        : m_strDescription(QString())
+        , m_sequence(QKeySequence())
+        , m_defaultSequence(QKeySequence())
+    {}
+    UIShortcut(const QString &strDescription,
+               const QKeySequence &sequence,
+               const QKeySequence &defaultSequence)
+        : m_strDescription(strDescription)
+        , m_sequence(sequence)
+        , m_defaultSequence(defaultSequence)
+    {}
 
     /* API: Description stuff: */
@@ -48 +57 @@
     const QKeySequence& sequence() const;
 
+    /* API: Default sequence stuff: */
+    void setDefaultSequence(const QKeySequence &defaultSequence);
+    const QKeySequence& defaultSequence() const;
+
     /* API: Conversion stuff: */
     QString toString() const;
@@ -56 +69 @@
     QString m_strDescription;
     QKeySequence m_sequence;
+    QKeySequence m_defaultSequence;
 };
 
@@ -106 +120 @@
     void loadDefaults();
     void loadOverrides();
-    void loadOverridesFor(const QString &strExtraDataID);
+    void loadOverridesFor(const QString &strPoolExtraDataID);
 
     /* Helper: Shortcut stuff: */