Changeset 2802 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 23, 2007 12:57:12 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21412

Message:

Fixed the host key name display in the X11 GUI

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• include/QIHotKeyEdit.h (modified) (3 diffs)
• src/QIHotKeyEdit.cpp (modified) (4 diffs)
• src/VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -24 +24 @@
 TEMPLATE        = app
 LANGUAGE        = C++
+
+SOURCES = src/QIHotKeyEdit.cpp
 
 FORMS   = ui/VBoxDiskImageManagerDlg.ui \

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

@@ -25 +25 @@
 
 #include <qlabel.h>
-#ifdef Q_WS_MAC
+#if defined(Q_WS_X11)
+#include <qmap.h>
+#endif
+#if defined(Q_WS_MAC)
 #include <Carbon/Carbon.h>
 #endif
@@ -47 +50 @@
     QSize minimumSizeHint() const;
 
+#if defined(Q_WS_X11)
+    static void languageChange(void);
+#endif
     static QString keyName (int key);
     static bool isValidKey (int k);
@@ -80 +86 @@
     QColorGroup true_acg;
 
+#if defined(Q_WS_X11)
+    static QMap<QString, QString> keyNames;
+#endif
+
 #if defined(Q_WS_MAC)
     /** Event handler reference. NULL if the handler isn't installed. */

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

@@ -60 +60 @@
 #endif
 #include "XKeyboard.h"
+QMap<QString, QString> QIHotKeyEdit::keyNames;
 #endif
 
@@ -224 +225 @@
     return QSize( w + m, h + m );
 }
+
+#if defined(Q_WS_X11)
+/**
+ * Updates the associative array containing the translations of X11 key strings to human
+ * readable key names.
+ */
+// static
+void QIHotKeyEdit::languageChange(void)
+{
+    keyNames["Shift_L"]          = tr ("Left Shift");
+    keyNames["Shift_R"]          = tr ("Right Shift");
+    keyNames["Control_L"]        = tr ("Left Ctrl");
+    keyNames["Control_R"]        = tr ("Right Ctrl");
+    keyNames["Alt_L"]            = tr ("Left Alt");
+    keyNames["Alt_R"]            = tr ("Right Alt");
+    keyNames["Super_L"]          = tr ("Left WinKey");
+    keyNames["Super_R"]          = tr ("Right WinKey");
+    keyNames["Menu"]             = tr ("Menu key");
+    keyNames["ISO_Level3_Shift"] = tr ("Alt Gr");
+    keyNames["Caps_Lock"]        = tr ("Caps Lock");
+    keyNames["Scroll_Lock"]      = tr ("Scroll Lock");
+}
+#endif
 
 /**
@@ -260 +284 @@
         char *sn = ::XKeysymToString( (KeySym) key );
         if ( sn )
-            name = sn;
+        {
+            if ( keyNames.contains(sn) )
+                name = keyNames[sn];
+            else
+                name = sn;
+        }
         else
-            name = QString( "<key_%1>" ).arg( key );
+            name = QString( tr ("<key_%1>") ).arg( key );
 #elif defined(Q_WS_MAC)
         UInt32 modMask = DarwinKeyCodeToDarwinModifierMask( key );
@@ -437 +466 @@
             char *name = ::XKeysymToString( ks );
             if ( name )
-                symbname = name;
+            {
+                if ( keyNames.contains(name) )
+                    symbname = keyNames[name];
+                else
+                    symbname = name;
+            }
             else
-                symbname = QString( "<key_%1>" ).arg( (int) ks );
+                symbname = QString( tr ("<key_%1>") ).arg( (int) ks );
             // update the display
             updateText();

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

@@ -27 +27 @@
 #include "VBoxConsoleWnd.h"
 #include "VBoxProblemReporter.h"
+#include "QIHotKeyEdit.h"
 
 #include <qapplication.h>
@@ -1850 +1851 @@
 
     detailReportTemplatesReady = false;
+#if defined(Q_WS_X11)
+    /* As X11 does not (to my knowledge) have functionality for providing human readable
+     * key names, we keep a table of them, which must be updated when the language is
+     * changed. */
+    QIHotKeyEdit::languageChange();
+#endif
 }