Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / CustomizedWidgets.cpp

diff --git a/src/frontends/qt4/CustomizedWidgets.cpp b/src/frontends/qt4/CustomizedWidgets.cpp
index 0154472fb261948d41779fa856e81e37359cff9b..9a8152bf41875c67ec0be3691909cd1341b2b9c1 100644 (file)
--- a/src/frontends/qt4/CustomizedWidgets.cpp
+++ b/src/frontends/qt4/CustomizedWidgets.cpp
@@ -22,18 +22,70 @@
 #include <config.h>
 
 #include "CustomizedWidgets.h"
+#include "FuncRequest.h"
 #include "GuiKeySymbol.h"
 
+#include <QApplication>
+#include <QKeyEvent>
+#include <QShowEvent>
+
 #include "support/qstring_helpers.h"
 
 
 using lyx::KeySymbol;
+using lyx::KeySequence;
+using lyx::KeyModifier;
 using lyx::toqstr;
 
+namespace lyx {
+namespace frontend {
+
+ShortcutLineEdit::ShortcutLineEdit(QWidget * parent)
+       : QLineEdit(parent), keysequence_()
+{
+       QApplication::instance()->installEventFilter(this);
+       has_cursor_ = false;
+}
+
+
+void ShortcutLineEdit::reset()
+{
+       clear();
+       keysequence_ = KeySequence();
+}
+
+
+bool ShortcutLineEdit::eventFilter(QObject * obj, QEvent * e)
+{
+       if (!has_cursor_)
+               return false;
+
+       switch (e->type()) {
+               // swallow these if we have focus and they come from elsewhere
+               case QEvent::Shortcut:
+               case QEvent::ShortcutOverride:
+                       if (obj != this)
+                               return true;
+               default: 
+                       break;
+       }        
+       return false;
+}
+
+
+KeySequence const ShortcutLineEdit::getKeySequence() const
+{
+       return keysequence_;
+}
+
+
 void ShortcutLineEdit::keyPressEvent(QKeyEvent * e)
 {
-       int keyQt = e->key();
-       switch (e->key()) {
+       int const keyQt = e->key();
+       if (!keyQt)
+               return;
+
+       switch(keyQt) {
                case Qt::Key_AltGr: //or else we get unicode salad
                case Qt::Key_Shift:
                case Qt::Key_Control:
@@ -41,63 +93,46 @@ void ShortcutLineEdit::keyPressEvent(QKeyEvent * e)
                case Qt::Key_Meta:
                        break;
                default:
-                       if (keyQt) {
-                               uint modifierKeys = e->modifiers();
-
-                               QString txt;
-                               if (modifierKeys & Qt::SHIFT)
-                                       txt += "S-";
-                               if (modifierKeys & Qt::CTRL)
-                                       txt += "C-";
-                               if (modifierKeys & Qt::ALT)
-                                       txt += "M-";
-
-                               KeySymbol sym;
-                               setKeySymbol(&sym, e);
-                               txt += toqstr(sym.getSymbolName());
-
-                               if (text().isEmpty())
-                                       setText(txt);
-                               else
-                                       setText(text() + " " + txt);
-                       }
+                       appendToSequence(e);
+                       setText(toqstr(keysequence_.print(KeySequence::ForGui)));
        }
 }
 
 
-//prevent Qt from special casing Tab and Backtab
-bool ShortcutLineEdit::event(QEvent* e)
+bool ShortcutLineEdit::event(QEvent * e)
 {
-       if (e->type() == QEvent::ShortcutOverride)
-               return false;
-
-       if (e->type() == QEvent::KeyPress) {
-               keyPressEvent(static_cast<QKeyEvent *>(e));
-               return true;
+       switch (e->type()) {
+               case QEvent::FocusOut:
+                       has_cursor_ = false;
+                       break;
+               case QEvent::FocusIn:
+                       has_cursor_ = true;
+                       break;
+               case QEvent::ShortcutOverride:
+                       keyPressEvent(static_cast<QKeyEvent *>(e));
+                       return true;
+               case QEvent::KeyRelease:
+               case QEvent::Shortcut:
+               case QEvent::KeyPress:
+                       return true;
+               default: 
+                       break;
        }
-
        return QLineEdit::event(e);
 }
 
 
-QString const SearchLineEdit::hintMessage() const
-{
-       return toqstr("Search ...");
-}
-
-
-void SearchLineEdit::focusInEvent(QFocusEvent * e)
+void ShortcutLineEdit::appendToSequence(QKeyEvent * e)
 {
-       if (text() == hintMessage())
-               clear();
-}
+       KeySymbol sym;
+       setKeySymbol(&sym, e);
 
-
-void SearchLineEdit::focusOutEvent(QFocusEvent * e)
-{
-       if (text().isEmpty())
-               setText(hintMessage());
+       KeyModifier mod = lyx::q_key_state(e->modifiers());
+       
+       keysequence_.addkey(sym, mod, lyx::NoModifier);
 }
 
+} // namespace frontend
+} // namespace lyx
 
 #include "CustomizedWidgets_moc.cpp"