Changeset 82713 in vbox

Timestamp:

Jan 10, 2020 12:39:04 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Proper retranslation procedure for Tools popup pane unjustly forgotten.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.h (modified) (1 diff)
• manager/tools/UIToolsItem.cpp (modified) (1 diff)
• manager/tools/UIToolsItem.h (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (5 diffs)
• manager/tools/UIToolsModel.h (modified) (3 diffs)

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

@@ -633 +633 @@
     virtual void updateShortcuts();
 
-    /** Hadles translation event. */
+    /** Handles translation event. */
     virtual void retranslateUi() /* override */;
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -237 +237 @@
     updatePixmap();
 
+    /* Update name finally: */
+    reconfigure(strName);
+}
+
+void UIToolsItem::reconfigure(const QString &strName)
+{
     /* If name is changed: */
     if (m_strName != strName)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.h

@@ -93 +93 @@
         UIToolsModel *model() const;
 
-        /** Reconfigures icon with new @a enmClass, @a enmType, @a icon and @a strName. */
+        /** Reconfigures item with new @a enmClass, @a enmType, @a icon and @a strName. */
         void reconfigure(UIToolClass enmClass, UIToolType enmType,
                          const QIcon &icon, const QString &strName);
+        /** Reconfigures item with @a strName. */
+        void reconfigure(const QString &strName);
 
         /** Returns item class. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -55 +55 @@
 
 UIToolsModel:: UIToolsModel(UITools *pParent)
-    : QObject(pParent)
+    : QIWithRetranslateUI3<QObject>(pParent)
     , m_pTools(pParent)
     , m_pScene(0)
@@ -392 +392 @@
     /* Process only scene events: */
     if (pWatched != scene())
-        return QObject::eventFilter(pWatched, pEvent);
+        return QIWithRetranslateUI3<QObject>::eventFilter(pWatched, pEvent);
 
     /* Process only item focused by model: */
     if (scene()->focusItem())
-        return QObject::eventFilter(pWatched, pEvent);
+        return QIWithRetranslateUI3<QObject>::eventFilter(pWatched, pEvent);
 
     /* Do not handle disabled items: */
     if (!currentItem()->isEnabled())
-        return QObject::eventFilter(pWatched, pEvent);
+        return QIWithRetranslateUI3<QObject>::eventFilter(pWatched, pEvent);
 
     /* Checking event-type: */
@@ -420 +420 @@
 
     /* Call to base-class: */
-    return QObject::eventFilter(pWatched, pEvent);
+    return QIWithRetranslateUI3<QObject>::eventFilter(pWatched, pEvent);
+}
+
+void UIToolsModel::retranslateUi()
+{
+    foreach (UIToolsItem *pItem, m_items)
+    {
+        switch (pItem->itemType())
+        {
+            case UIToolType_Welcome:   pItem->reconfigure(tr("Welcome")); break;
+            case UIToolType_Media:     pItem->reconfigure(tr("Media")); break;
+            case UIToolType_Network:   pItem->reconfigure(tr("Network")); break;
+            case UIToolType_Cloud:     pItem->reconfigure(tr("Cloud")); break;
+            case UIToolType_Details:   pItem->reconfigure(tr("Details")); break;
+            case UIToolType_Snapshots: pItem->reconfigure(tr("Snapshots")); break;
+            case UIToolType_Logs:      pItem->reconfigure(tr("Logs")); break;
+            default: break;
+        }
+    }
 }
 
@@ -438 +456 @@
     /* Prepare connections: */
     prepareConnections();
+    /* Apply language settings: */
+    retranslateUi();
 }
 
@@ -458 +478 @@
 
     /* Welcome: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Welcome, tr("Welcome"),
-                               UIIconPool::iconSet(":/welcome_screen_24px.png", ":/welcome_screen_24px.png")); /// @todo fix icon!
+    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Welcome, QString(),
+                               UIIconPool::iconSet(":/welcome_screen_24px.png", ":/welcome_screen_24px.png"));
 
     /* Media: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Media, tr("Media"),
+    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Media, QString(),
                                UIIconPool::iconSet(":/media_manager_24px.png", ":/media_manager_disabled_24px.png"));
 
     /* Network: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Network, tr("Network"),
+    m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Network, QString(),
                                UIIconPool::iconSet(":/host_iface_manager_24px.png", ":/host_iface_manager_disabled_24px.png"));
 
     /* Cloud: */
     if (fExtPackAccessible)
-        m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, tr("Cloud"),
+        m_items << new UIToolsItem(scene(), UIToolClass_Global, UIToolType_Cloud, QString(),
                                    UIIconPool::iconSet(":/cloud_profile_manager_24px.png", ":/cloud_profile_manager_disabled_24px.png"));
 
     /* Details: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Details, tr("Details"),
+    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Details, QString(),
                                UIIconPool::iconSet(":/machine_details_manager_24px.png", ":/machine_details_manager_disabled_24px.png"));
 
     /* Snapshots: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Snapshots, tr("Snapshots"),
-                               UIIconPool::iconSet(":/snapshot_manager_24px.png",        ":/snapshot_manager_disabled_24px.png"));
+    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Snapshots, QString(),
+                               UIIconPool::iconSet(":/snapshot_manager_24px.png", ":/snapshot_manager_disabled_24px.png"));
 
     /* Logs: */
-    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Logs, tr("Logs"),
+    m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_Logs, QString(),
                                UIIconPool::iconSet(":/vm_show_logs_24px.png", ":/vm_show_logs_disabled_24px.png"));
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -29 +29 @@
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "UIToolsItem.h"
 
@@ -47 +48 @@
 
 /** QObject extension used as VM Tools-pane model: */
-class UIToolsModel : public QObject
+class UIToolsModel : public QIWithRetranslateUI3<QObject>
 {
     Q_OBJECT;
@@ -187 +188 @@
         /** Preprocesses Qt @a pEvent for passed @a pObject. */
         virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
+
+        /** Handles translation event. */
+        virtual void retranslateUi() /* override */;
     /** @} */