Changeset 82187 in vbox for trunk/src

Timestamp:

Nov 25, 2019 5:18:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9609: Rework UIShortcut interface to support standard shortcut sequence; Update code accordingly to handle both default and standard sequences simultaneously.

Location:

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

Files:

• UIActionPool.h (modified) (1 diff)
• UIShortcutPool.cpp (modified) (7 diffs)
• UIShortcutPool.h (modified) (4 diffs)

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

@@ -247 +247 @@
     /** Returns default keyboard shortcut for this action. */
     virtual QKeySequence defaultShortcut(UIActionPoolType) const { return QKeySequence(); }
+    /** Returns standard keyboard shortcut for this action. */
+    virtual QKeySequence standardShortcut(UIActionPoolType) const { return QKeySequence(); }
 
     /** Defines current keyboard shortcuts for this action. */

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

@@ -71 +71 @@
 }
 
+void UIShortcut::setStandardSequence(const QKeySequence &standardSequence)
+{
+    m_standardSequence = standardSequence;
+}
+
+const QKeySequence &UIShortcut::standardSequence() const
+{
+    return m_standardSequence;
+}
+
 QString UIShortcut::primaryToNativeText() const
 {
@@ -130 +140 @@
     newShortcut.setDescription(pAction->name());
     const QKeySequence &defaultSequence = pAction->defaultShortcut(pActionPool->type());
-    newShortcut.setSequences(QList<QKeySequence>() << defaultSequence);
+    const QKeySequence &standardSequence = pAction->standardShortcut(pActionPool->type());
+    newShortcut.setSequences(QList<QKeySequence>() << defaultSequence << standardSequence);
     newShortcut.setDefaultSequence(defaultSequence);
+    newShortcut.setStandardSequence(standardSequence);
     return newShortcut;
 }
@@ -181 +193 @@
             pAction->setShortcuts(existingShortcut.sequences());
             pAction->retranslateUi();
-            /* Copy default sequence from the action to the shortcut: */
+            /* Copy default and standard sequences from the action to the shortcut: */
             existingShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
+            existingShortcut.setStandardSequence(pAction->standardShortcut(pActionPool->type()));
         }
         /* If shortcut key is NOT known yet: */
@@ -191 +204 @@
             /* Copy the action's default sequence to both the shortcut & the action: */
             const QKeySequence &defaultSequence = pAction->defaultShortcut(pActionPool->type());
-            newShortcut.setSequences(QList<QKeySequence>() << defaultSequence);
+            const QKeySequence &standardSequence = pAction->standardShortcut(pActionPool->type());
+            newShortcut.setSequences(QList<QKeySequence>() << defaultSequence << standardSequence);
             newShortcut.setDefaultSequence(defaultSequence);
+            newShortcut.setStandardSequence(standardSequence);
             pAction->setShortcuts(newShortcut.sequences());
             pAction->retranslateUi();
@@ -299 +314 @@
                                       QApplication::translate("UIActionPool", "Popup Menu"),
                                       QList<QKeySequence>() << QString("Home"),
-                                      QString("Home")));
+                                      QString("Home"),
+                                      QString()));
     }
 }
@@ -340 +356 @@
                                           QString(),
                                           QList<QKeySequence>() << strShortcutSequence,
+                                          QString(),
                                           QString()));
         else
@@ -381 +398 @@
         /* Get corresponding shortcut: */
         const UIShortcut &shortcut = m_shortcuts[strShortcutKey];
-        /* Check if the sequence for that shortcut differs from default: */
-        if (shortcut.sequences().contains(shortcut.defaultSequence()))
+        /* Check if the sequence for that shortcut differs from default or standard: */
+        if (   shortcut.sequences().contains(shortcut.defaultSequence())
+            || shortcut.sequences().contains(shortcut.standardSequence()))
             continue;
         /* Add the shortcut sequence into overrides list: */

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

@@ -47 +47 @@
         , m_sequences(QList<QKeySequence>())
         , m_defaultSequence(QKeySequence())
+        , m_standardSequence(QKeySequence())
     {}
     /** Constructs shortcut descriptor.
@@ -52 +53 @@
       * @param  strDescription    Brings the shortcut description.
       * @param  sequences         Brings the shortcut sequences.
-      * @param  defaultSequence   Brings the default shortcut sequence. */
+      * @param  defaultSequence   Brings the default shortcut sequence.
+      * @param  standardSequence  Brings the standard shortcut sequence. */
     UIShortcut(const QString &strScope,
                const QString &strDescription,
                const QList<QKeySequence> &sequences,
-               const QKeySequence &defaultSequence)
+               const QKeySequence &defaultSequence,
+               const QKeySequence &standardSequence)
         : m_strScope(strScope)
         , m_strDescription(strDescription)
         , m_sequences(sequences)
         , m_defaultSequence(defaultSequence)
+        , m_standardSequence(standardSequence)
     {}
 
@@ -82 +86 @@
     /** Returns the default shortcut sequence. */
     const QKeySequence &defaultSequence() const;
+
+    /** Defines the standard shortcut @a sequence. */
+    void setStandardSequence(const QKeySequence &sequence);
+    /** Returns the standard shortcut sequence. */
+    const QKeySequence &standardSequence() const;
 
     /** Converts primary shortcut sequence to native text. */
@@ -98 +107 @@
     /** Holds the default shortcut sequence. */
     QKeySequence         m_defaultSequence;
+    /** Holds the standard shortcut sequence. */
+    QKeySequence         m_standardSequence;
 };