From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 2 Jun 2010 12:57:25 +0000 (+0200)
Subject: Fix modifier names for Mac
X-Git-Tag: 0.7-beta1~56
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1ee776b44047785839ac9657c371459750d9cfdd;hp=e223b940bbb059f9fb56db1aa70cd72bcabf1d0b

Fix modifier names for Mac
---

diff --git a/src/qtui/settingspages/keysequencewidget.cpp b/src/qtui/settingspages/keysequencewidget.cpp
index 4673a185..b37d98b2 100644
--- a/src/qtui/settingspages/keysequencewidget.cpp
+++ b/src/qtui/settingspages/keysequencewidget.cpp
@@ -241,9 +241,14 @@ bool KeySequenceWidget::isShiftAsModifierAllowed(int keyQt) const {
 
 void KeySequenceWidget::updateShortcutDisplay() {
   // make translators happy
+#if defined(Q_WS_MAC)
+  static QString metaKey = tr("Ctrl", "Ctrl key on Mac");
+  static QString ctrlKey = tr("⌘", "Cmd key on Mac");
+#else
   static QString metaKey = tr("Meta", "Meta key");
-  static QString altKey = tr("Alt", "Alt key");
   static QString ctrlKey = tr("Ctrl", "Ctrl key");
+#endif
+  static QString altKey = tr("Alt", "Alt key");
   static QString shiftKey = tr("Shift", "Shift key");
 
   QString s = _keySequence.toString(QKeySequence::NativeText);
@@ -252,13 +257,8 @@ void KeySequenceWidget::updateShortcutDisplay() {
   if(_isRecording) {
     if(_modifierKeys) {
       if(_modifierKeys & Qt::META)  s += metaKey + '+';
-#if defined(Q_WS_MAC)
-      if(_modifierKeys & Qt::ALT)   s += altKey + '+';
-      if(_modifierKeys & Qt::CTRL)  s += ctrlKey + '+';
-#elif defined(Q_WS_X11)
       if(_modifierKeys & Qt::CTRL)  s += ctrlKey + '+';
       if(_modifierKeys & Qt::ALT)   s += altKey + '+';
-#endif
       if(_modifierKeys & Qt::SHIFT) s += shiftKey + '+';
 
     } else {