Changeset 104394 in vbox

Timestamp:

Apr 22, 2024 1:07:03 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10622. Using new UITranslationEventListener in the UIWindowMenuManager class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• UIWindowMenuManager.cpp (modified) (4 diffs)
• UIWindowMenuManager.h (modified) (4 diffs)

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

@@ -32 +32 @@
 
 /* GUI includes: */
+#include "UITranslationEventListener.h"
 #include "UIWindowMenuManager.h"
 
@@ -290 +291 @@
 }
 
-void UIWindowMenuManager::retranslateUi()
+void UIWindowMenuManager::sltRetranslateUI()
 {
     /* Translate all the helpers: */
@@ -304 +305 @@
     /* Install global event-filter: */
     qApp->installEventFilter(this);
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIWindowMenuManager::sltRetranslateUI);
 }
 
@@ -362 +365 @@
         QWidget *pWidget = qobject_cast<QWidget*>(pObject);
         if (pWidget && m_helpers.contains(pWidget))
-            retranslateUi();
+            sltRetranslateUI();
     }
 
     /* Call to base-class: */
-    return QIWithRetranslateUI3<QObject>::eventFilter(pObject, pEvent);
+    return QObject::eventFilter(pObject, pEvent);
 }
 

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

@@ -36 +36 @@
 #include <QObject>
 
-/* GUI includes: */
-#include "QIWithRetranslateUI.h"
-
 /* Forward declarations: */
 class QMenu;
@@ -45 +42 @@
 /** Singleton QObject extension
   * used as Mac OS X 'Window' menu Manager. */
-class SHARED_LIBRARY_STUFF UIWindowMenuManager : public QIWithRetranslateUI3<QObject>
+class SHARED_LIBRARY_STUFF UIWindowMenuManager : public QObject
 {
     Q_OBJECT;
@@ -68 +65 @@
     void removeWindow(QWidget *pWindow);
 
-    /** Handles translation event. */
-    virtual void retranslateUi() RT_OVERRIDE;
-
 protected:
 
@@ -80 +74 @@
     /** Preprocesses any Qt @a pEvent for passed @a pObject. */
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
+
+private slots:
+
+    /** Handles translation event. */
+    virtual void sltRetranslateUI();
 
 private: