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

Timestamp:

Sep 25, 2015 2:00:38 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Window menu Manager cleanup/rework (step 6): Translation fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp

@@ -115 +115 @@
     {
         /* Translate menu: */
-        m_pWindowMenu->setTitle(tr("&Window"));
+        m_pWindowMenu->setTitle(QApplication::translate("UIActionPool", "&Window"));
 
         /* Translate menu 'Minimize' action: */
-        m_pMinimizeAction->setText(tr("Minimize"));
+        m_pMinimizeAction->setText(QApplication::translate("UIActionPool", "&Minimize"));
         m_pMinimizeAction->setShortcut(QKeySequence("Ctrl+M"));
+
+        /* Translate other menu-actions: */
+        foreach (QAction *pAction, m_windows.values())
+        {
+            /* Get corresponding window from action's data: */
+            QWidget *pWindow = pAction->data().value<QWidget*>();
+            /* Use the window's title as the action's text: */
+            pAction->setText(pWindow->windowTitle());
+        }
     }
 
@@ -313 +322 @@
     }
 
+    /* Besides our own retranslation, we should also retranslate
+     * everything on any registered widget title change event: */
+    if (pObject && type == QEvent::WindowTitleChange)
+    {
+        QWidget *pWidget = qobject_cast<QWidget*>(pObject);
+        if (pWidget && m_helpers.contains(pWidget))
+            retranslateUi();
+    }
+
     /* Call to base-class: */
     return QIWithRetranslateUI3<QObject>::eventFilter(pObject, pEvent);