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

Timestamp:

May 23, 2014 3:59:40 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7386: Translate action shortcut descriptions on language-change.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• globals/UIActionPool.h (modified) (3 diffs)
• runtime/UIActionPoolRuntime.cpp (modified) (1 diff)
• runtime/UIActionPoolRuntime.h (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (1 diff)
• selector/UIActionPoolSelector.h (modified) (1 diff)

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

@@ -47 +47 @@
 /* UIAction stuff: */
 UIAction::UIAction(UIActionPool *pParent, UIActionType type)
-    : QIWithRetranslateUI3<QAction>(pParent)
+    : QAction(pParent)
     , m_pActionPool(pParent)
     , m_type(type)

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

@@ -69 +69 @@
 
 /* Basic abstract QAction reimplemetation, extending interface: */
-class UIAction : public QIWithRetranslateUI3<QAction>
+class UIAction : public QAction
 {
     Q_OBJECT;
@@ -97 +97 @@
     void showShortcut();
     void hideShortcut();
+
+    /** Calls for action translation handler. */
+    virtual void retranslateUi() = 0;
 
 protected:
@@ -230 +233 @@
 
 /* Singleton action pool: */
-class UIActionPool : public QObject
+class UIActionPool : public QIWithRetranslateUI3<QObject>
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -1246 +1246 @@
     /* Prepare connections: */
     connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
+}
+
+void UIActionPoolRuntime::retranslateUi()
+{
+    /* Translate all the actions: */
+    foreach (const int iActionPoolKey, m_pool.keys())
+        m_pool[iActionPoolKey]->retranslateUi();
+    /* Re-apply shortcuts: */
+    sltApplyShortcuts();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

@@ -103 +103 @@
     UIActionPoolRuntime();
 
+    /** Translation handler. */
+    void retranslateUi();
+
     /* Helper: Shortcuts stuff: */
     QString shortcutsExtraDataID() const;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -981 +981 @@
 }
 
+void UIActionPoolSelector::retranslateUi()
+{
+    /* Translate all the actions: */
+    foreach (const int iActionPoolKey, m_pool.keys())
+        m_pool[iActionPoolKey]->retranslateUi();
+    /* Re-apply shortcuts: */
+    sltApplyShortcuts();
+}
+
 QString UIActionPoolSelector::shortcutsExtraDataID() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -83 +83 @@
     UIActionPoolSelector();
 
+    /** Translation handler. */
+    void retranslateUi();
+
     /* Helper: Shortcuts stuff: */
     QString shortcutsExtraDataID() const;