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

Timestamp:

May 23, 2014 5:54:07 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93889

Message:

FE/Qt: 7386: Translate shortcuts-pool itself as well.

Location:

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

Files:

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

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

@@ -60 +60 @@
 UIShortcutPool* UIShortcutPool::m_pInstance = 0;
 
-const QString UIShortcutPool::m_strShortcutKeyTemplate = QString("%1/%2");
+const QString UIShortcutPool::m_sstrShortcutKeyTemplate = QString("%1/%2");
+const QString UIShortcutPool::m_sstrShortcutKeyTemplateRuntime = m_sstrShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts);
 
 UIShortcutPool* UIShortcutPool::instance()
@@ -96 +97 @@
 {
     /* Compose shortcut key: */
-    const QString strShortcutKey(m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
-                                                              pAction->shortcutExtraDataID()));
+    const QString strShortcutKey(m_sstrShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
+                                                               pAction->shortcutExtraDataID()));
     /* Return existing if any: */
     if (m_shortcuts.contains(strShortcutKey))
@@ -112 +113 @@
 {
     /* Return if present, autocreate if necessary: */
-    return shortcut(m_strShortcutKeyTemplate.arg(strPoolID, strActionID));
+    return shortcut(m_sstrShortcutKeyTemplate.arg(strPoolID, strActionID));
 }
 
@@ -141 +142 @@
 
         /* Compose shortcut key: */
-        const QString strShortcutKey = m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
-                                                                    pAction->shortcutExtraDataID());
+        const QString strShortcutKey = m_sstrShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
+                                                                     pAction->shortcutExtraDataID());
         /* If shortcut key is already known: */
         if (m_shortcuts.contains(strShortcutKey))
@@ -227 +228 @@
 }
 
+void UIShortcutPool::retranslateUi()
+{
+    /* Translate own defaults: */
+    m_shortcuts[m_sstrShortcutKeyTemplateRuntime.arg("PopupMenu")]
+        .setDescription(QApplication::translate("UIActionPool", "Popup Menu"));
+}
+
 void UIShortcutPool::loadDefaults()
 {
-    /* Runtime shortcut key template: */
-    const QString strRuntimeShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts));
     /* Default shortcut for the Runtime Popup Menu invokation: */
-    m_shortcuts.insert(strRuntimeShortcutKeyTemplate.arg("PopupMenu"),
-                       UIShortcut(QApplication::translate("UIActionPool", "Popup Menu"), QString("Home"), QString("Home")));
+    m_shortcuts.insert(m_sstrShortcutKeyTemplateRuntime.arg("PopupMenu"),
+                       UIShortcut(QApplication::translate("UIActionPool", "Popup Menu"),
+                                  QString("Home"), QString("Home")));
 }
 
@@ -247 +254 @@
 {
     /* Compose shortcut key template: */
-    const QString strShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strPoolExtraDataID));
+    const QString strShortcutKeyTemplate(m_sstrShortcutKeyTemplate.arg(strPoolExtraDataID));
     /* Iterate over all the overrides: */
     const QStringList overrides = vboxGlobal().virtualBox().GetExtraDataStringList(strPoolExtraDataID);
@@ -295 +302 @@
 {
     /* Compose shortcut prefix: */
-    const QString strShortcutPrefix(m_strShortcutKeyTemplate.arg(strPoolExtraDataID, QString()));
+    const QString strShortcutPrefix(m_sstrShortcutKeyTemplate.arg(strPoolExtraDataID, QString()));
     /* Populate the list of all the known overrides: */
     QStringList overrides;

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

@@ -25 +25 @@
 /* GUI includes: */
 #include "VBoxGlobal.h"
+#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
@@ -73 +74 @@
 
 /* Singleton shortcut pool: */
-class UIShortcutPool : public QObject
+class UIShortcutPool : public QIWithRetranslateUI3<QObject>
 {
     Q_OBJECT;
@@ -118 +119 @@
     void cleanup() {}
 
+    /** Translation handler. */
+    void retranslateUi();
+
     /* Helpers: Shortcuts stuff: */
     void loadDefaults();
@@ -130 +134 @@
     /* Variables: */
     static UIShortcutPool *m_pInstance;
-    static const QString m_strShortcutKeyTemplate;
+    /** Shortcut key template. */
+    static const QString m_sstrShortcutKeyTemplate;
+    /** Shortcut key template for Runtime UI. */
+    static const QString m_sstrShortcutKeyTemplateRuntime;
     QMap<QString, UIShortcut> m_shortcuts;
 };