* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Asger & Jürgen
+ * \author Asger & Jürgen
*
* Full author contact details are available in file CREDITS.
*/
case Qt::Key_Y: return "y";
case Qt::Key_Z: return "z";
+ case Qt::Key_Return: return "Return";
case Qt::Key_Escape: return "Escape";
+ case Qt::Key_Tab: return "Tab";
case Qt::Key_Backspace: return "BackSpace";
case Qt::Key_Insert: return "Insert";
case Qt::Key_Delete: return "Delete";
case Qt::Key_THORN: return "THORN";
case Qt::Key_ssharp: return "ssharp";
case Qt::Key_ydiaeresis: return "ydiaeresis";
+ case Qt::Key_Bar: return "bar";
// FIXME: these ones I don't know the names of ... help !
// what's here is basically guesses ...
case Qt::Key_Hyper_L: return "Hyper_L";
case Qt::Key_Hyper_R: return "Hyper_R";
case Qt::Key_Help: return "Help";
- case Qt::Key_Bar: return "Bar";
case Qt::Key_Backtab: return "BackTab";
default:
bool KeySymbol::isOK() const
{
- bool const ok = !(text_.empty() && key_ == Qt::Key_unknown);
+ bool const ok = !(text_.empty() && qkey_to_string(key_).empty());
LYXERR(Debug::KEY, "isOK is " << ok);
return ok;
}
{
int tmpkey = key_;
- if (mod & ShiftModifier)
+ if (mod & ShiftModifier && !(tmpkey == Qt::Key_Shift))
tmpkey += Qt::ShiftModifier;
- if (mod & ControlModifier)
+ if (mod & ControlModifier && !(tmpkey == Qt::Key_Control))
tmpkey += Qt::ControlModifier;
- if (mod & AltModifier)
+ if (mod & AltModifier && !(tmpkey == Qt::Key_Alt))
tmpkey += Qt::AltModifier;
+ if (mod & MetaModifier && !(tmpkey == Qt::Key_Meta))
+ tmpkey += Qt::MetaModifier;
QKeySequence seq(tmpkey);
+ QString str;
+
+ if (forgui)
+ str = seq.toString(QKeySequence::NativeText);
+ else {
+#ifdef Q_WS_MACX
+ // Qt/Mac does not use Command and friends in the
+ // portable case, but the windows-like Control+x (bug 5421).
+ str = seq.toString(QKeySequence::NativeText);
+ str.replace(QChar(0x21E7), qt_("Shift-"));
+ str.replace(QChar(0x2303), qt_("Control-"));
+ str.replace(QChar(0x2325), qt_("Option-"));
+ str.replace(QChar(0x2318), qt_("Command-"));
+#else
+ str = seq.toString(QKeySequence::PortableText);
+#endif
+ }
- return qstring_to_ucs4(seq.toString(forgui ? QKeySequence::NativeText
- : QKeySequence::PortableText));
+ return qstring_to_ucs4(str);
}
k |= ControlModifier;
if (state & Qt::ShiftModifier)
k |= ShiftModifier;
- if (state & Qt::AltModifier || state & Qt::MetaModifier)
+ if (state & Qt::AltModifier)
k |= AltModifier;
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+ if (state & Qt::MetaModifier)
+ k |= MetaModifier;
+#else
+ if (state & Qt::MetaModifier)
+ k |= AltModifier;
+#endif
return k;
}