author | mickeyl <mickeyl> | 2003-10-19 19:47:13 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-19 19:47:13 (UTC) |
commit | b96ee77f28d8d2e697528290204f15913c3f4c3e (patch) (unidiff) | |
tree | 603b15d584bfcd9ee90b2e95a6852c028d7d5247 /core/launcher/inputmethods.h | |
parent | 38d72acc2225b88b2f561fa59565d4c66261f1c3 (diff) | |
download | opie-b96ee77f28d8d2e697528290204f15913c3f4c3e.zip opie-b96ee77f28d8d2e697528290204f15913c3f4c3e.tar.gz opie-b96ee77f28d8d2e697528290204f15913c3f4c3e.tar.bz2 |
This patch finish the work on the resizable inputmethods.
- in "floating" mode, input methods now remember their geometry
- if closed via (x), the inputmethod button is toggled accordingly
- eliminated the focus problem
-rw-r--r-- | core/launcher/inputmethods.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/launcher/inputmethods.h b/core/launcher/inputmethods.h index 246661a..55ac020 100644 --- a/core/launcher/inputmethods.h +++ b/core/launcher/inputmethods.h | |||
@@ -52,48 +52,49 @@ struct InputMethod | |||
52 | inline QPixmap *icon() const { return newIM ? extInterface->icon() : interface->icon(); } | 52 | inline QPixmap *icon() const { return newIM ? extInterface->icon() : interface->icon(); } |
53 | inline QUnknownInterface *iface() { return newIM ? (QUnknownInterface *)extInterface : (QUnknownInterface *)interface; } | 53 | inline QUnknownInterface *iface() { return newIM ? (QUnknownInterface *)extInterface : (QUnknownInterface *)interface; } |
54 | inline void resetState() { if ( !newIM ) interface->resetState(); } | 54 | inline void resetState() { if ( !newIM ) interface->resetState(); } |
55 | 55 | ||
56 | int operator <(const InputMethod& o) const; | 56 | int operator <(const InputMethod& o) const; |
57 | int operator >(const InputMethod& o) const; | 57 | int operator >(const InputMethod& o) const; |
58 | int operator <=(const InputMethod& o) const; | 58 | int operator <=(const InputMethod& o) const; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | class InputMethods : public QWidget | 61 | class InputMethods : public QWidget |
62 | { | 62 | { |
63 | Q_OBJECT | 63 | Q_OBJECT |
64 | public: | 64 | public: |
65 | InputMethods( QWidget * ); | 65 | InputMethods( QWidget * ); |
66 | ~InputMethods(); | 66 | ~InputMethods(); |
67 | 67 | ||
68 | QRect inputRect() const; | 68 | QRect inputRect() const; |
69 | bool shown() const; | 69 | bool shown() const; |
70 | QString currentShown() const; // name of interface | 70 | QString currentShown() const; // name of interface |
71 | void showInputMethod(const QString& id); | 71 | void showInputMethod(const QString& id); |
72 | void showInputMethod(); | 72 | void showInputMethod(); |
73 | void hideInputMethod(); | 73 | void hideInputMethod(); |
74 | void unloadInputMethods(); | 74 | void unloadInputMethods(); |
75 | void loadInputMethods(); | 75 | void loadInputMethods(); |
76 | virtual bool eventFilter( QObject *, QEvent * ); | ||
76 | 77 | ||
77 | signals: | 78 | signals: |
78 | void inputToggled( bool on ); | 79 | void inputToggled( bool on ); |
79 | 80 | ||
80 | private slots: | 81 | private slots: |
81 | void chooseKbd(); | 82 | void chooseKbd(); |
82 | void chooseIm(); | 83 | void chooseIm(); |
83 | void showKbd( bool ); | 84 | void showKbd( bool ); |
84 | void resetStates(); | 85 | void resetStates(); |
85 | void sendKey( ushort unicode, ushort scancode, ushort modifiers, bool, bool ); | 86 | void sendKey( ushort unicode, ushort scancode, ushort modifiers, bool, bool ); |
86 | void qcopReceive( const QCString &msg, const QByteArray &data ); | 87 | void qcopReceive( const QCString &msg, const QByteArray &data ); |
87 | 88 | ||
88 | private: | 89 | private: |
89 | void setPreferedHandlers(); | 90 | void setPreferedHandlers(); |
90 | /*static */QStringList plugins()const; | 91 | /*static */QStringList plugins()const; |
91 | /*static */void installTranslator( const QString& ); | 92 | /*static */void installTranslator( const QString& ); |
92 | void unloadMethod( QValueList<InputMethod>& ); | 93 | void unloadMethod( QValueList<InputMethod>& ); |
93 | void chooseMethod(InputMethod* im); | 94 | void chooseMethod(InputMethod* im); |
94 | void chooseKeyboard(InputMethod* im); | 95 | void chooseKeyboard(InputMethod* im); |
95 | void updateKeyboards(InputMethod *im); | 96 | void updateKeyboards(InputMethod *im); |
96 | 97 | ||
97 | private: | 98 | private: |
98 | QToolButton *kbdButton; | 99 | QToolButton *kbdButton; |
99 | QToolButton *kbdChoice; | 100 | QToolButton *kbdChoice; |