Changeset 1922 in vbox for trunk

Timestamp:

Apr 4, 2007 10:59:48 AM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Use our own logic to detect the system language setting (in Qt, LC_NUMERIC takes precedence over other lcoale settings on Linux).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (4 diffs)
• src/main.cpp (modified) (1 diff)

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

@@ -375 +375 @@
     bool openURL (const QString &aURL);
 
-    QString languageID() const;
     QString languageName() const;
     QString languageCountry() const;
@@ -409 +408 @@
 
     static QString highlight (const QString &aStr, bool aToolTip = false);
+
+    static QString systemLanguageID();
 
     static QString getExistingDirectory (const QString &aDir, QWidget *aParent,

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

@@ -1603 +1603 @@
 
 /**
- *  Shortcut to QLocale::system().name().
- */
-QString VBoxGlobal::languageID() const
-{
-    return  QLocale::system().name();
-}
-
-/**
  *  Native language name of the currently installed translation.
  *  Returns "English [built-in]" if no translation is installed
@@ -2208 +2200 @@
 
 /**
+ *  This does exactly the same as QLocale::system().name() but corrects its
+ *  wrong behavior on Linux systems (LC_NUMERIC for some strange reason takes
+ *  precedence over any other locale setting in the QLocale::system()
+ *  implementation). This implementation first looks at LC_MESSAGES which is
+ *  designed to define a language for program messages in case if it differs
+ *  from the language for other locale categories. Then it looks for LC_ALL,
+ *  then for LANG and finally falls back to QLocale::system().name().
+ */
+/* static */
+QString VBoxGlobal::systemLanguageID()
+{
+#ifdef Q_OS_UNIX
+    const char *s = getenv ("LC_MESSAGES");
+    if (s == 0)
+        s = getenv ("LC_ALL");
+    if (s == 0)
+        s = getenv ("LANG");
+    if (s != 0)
+        return QLocale (s).name();
+#endif
+    return  QLocale::system().name();
+}
+
+/**
  *  Reimplementation of QFileDialog::getExistingDirectory() that removes some
  *  oddities and limitations.
@@ -2279 +2295 @@
             bi.lpfn = winGetExistDirCallbackProc;
             bi.lParam = Q_ULONG (&mDir);
-            if (mParent) mParent->setEnabled (false);
+
+            /* Qt is uncapable to properly handle modal state if the modal
+             * window is not a QWidget. For example, if we have the W1->W2->N
+             * ownership where Wx are QWidgets (W2 is modal), and N is a
+             * native modal window, cliking on the title bar of W1 will still
+             * activate W2 and redirect keyboard/mouse to it. The dirty hack
+             * to prevent it is to disable the entire widget... */
+            if (mParent)
+                mParent->setEnabled (false);
+
             LPITEMIDLIST itemIdList = SHBrowseForFolder (&bi);
             if (itemIdList)
@@ -2297 +2322 @@
                 result = QString::null;
             QApplication::postEvent (mTarget, new VBoxGetExistDirectoryEvent (result));
-            if (mParent) mParent->setEnabled (true);
+
+            /* Enable the parent widget again. */
+            if (mParent)
+                mParent->setEnabled (true);
         }
 

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

@@ -162 +162 @@
     /* load a translation based on the current locale */
     QTranslator translator;
-    QString lang = QLocale::system().name();
+    QString lang = VBoxGlobal::systemLanguageID();
     QString nlsPath = a.applicationDirPath() + "/nls";
     LogFlowFunc (("lang=%S, nlsPath=\"%S\"\n",