Changeset 2319 in vbox

Timestamp:

Apr 23, 2007 12:01:26 PM (18 years ago)

Author:

vboxsync

Message:

VBoxGlobal event filter to process all of the LanguageChange events passed to QDesktopWidget implemented. Removed local VBoxSelectorWnd & VBoxConsoleWnd VBoxGlobal::languageChange() launchers.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -470 +470 @@
 
     bool event (QEvent *e);
+    bool eventFilter (QObject *, QEvent *);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1135 +1135 @@
 #endif
 
-    vboxGlobal().languageChange();
-
     /*
      *  Note: All action shortcuts should be added to the menu text in the

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2803 +2803 @@
 }
 
+bool VBoxGlobal::eventFilter (QObject *aObject, QEvent *aEvent)
+{
+    if (aObject == QApplication::desktop() &&
+        aEvent->type() == QEvent::LanguageChange)
+        languageChange();
+    return QObject::eventFilter (aObject, aEvent);
+}
+
 // Private members
 ////////////////////////////////////////////////////////////////////////////////
@@ -2918 +2926 @@
     vm_state_color.insert (CEnums::Discarding,          &Qt::green);
 
-    languageChange();
+    QApplication::desktop()->installEventFilter (this);
 
     // create default non-null global settings
@@ -2935 +2943 @@
     if (!languageId.isNull())
         loadLanguage (languageId);
+
+    languageChange();
 
     // process command line

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -487 +487 @@
 #ifdef Q_WS_MAC
     vmTools->setMacStyle();
-#endif 
+#endif
 
     /* add actions to menubar */
@@ -1010 +1010 @@
 #endif
 
-    vboxGlobal().languageChange();
-
     vmTabWidget->changeTab (vmDetailsView, tr ("&Details"));
     /* note: Snapshots and Details tabs are changed dynamically by