author | hash <hash> | 2002-09-06 21:23:05 (UTC) |
---|---|---|
committer | hash <hash> | 2002-09-06 21:23:05 (UTC) |
commit | fc4808bea669f75af0c28ba65cf2c638c97e99ba (patch) (side-by-side diff) | |
tree | 2ced268c3d31f9dded6d8332698ee8e476a081c0 /inputmethods/multikey/keyboard.h | |
parent | 15992c5f9b24eaf8df6f90d1993c85d73827b98f (diff) | |
download | opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.zip opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.tar.gz opie-fc4808bea669f75af0c28ba65cf2c638c97e99ba.tar.bz2 |
french and other stuff fixed
Diffstat (limited to 'inputmethods/multikey/keyboard.h') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/multikey/keyboard.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 1aa7a35..8af80d0 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h @@ -51,23 +51,26 @@ public: class Keys { public: Keys(); Keys(const char * filename); ~Keys(); + int width(const int row, const int col); + int rows(); ushort uni(const int row, const int col); int qcode(const int row, const int col); - int width(const int row, const int col); bool pressed(const int row, const int col); bool *pressedPtr(const int row, const int col); ushort shift(const ushort); ushort meta(const ushort); + ushort circumflex(const ushort); + ushort diaeresis(const ushort); QImage *pix(const int row, const int col); int numKeys(const int row); void setKeysFromFile(const char *filename); void setKey(const int row, const int qcode, const ushort unicode, const int width, QImage *pix); void setPressed(const int row, const int col, const bool pressed); QString lang; QString label; @@ -82,16 +85,18 @@ private: // only needed for keys like ctrl that can have multiple keys pressed at once bool *pressed; QImage *pix; }; QList<Key> keys[6]; QMap<ushort,ushort> shiftMap; QMap<ushort,ushort> metaMap; + QMap<ushort,ushort> circumflexMap; + QMap<ushort,ushort> diaeresisMap; }; class Keyboard : public QFrame { Q_OBJECT public: Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 ); @@ -112,29 +117,33 @@ signals: void key( ushort scancode, ushort unicode, ushort modifiers, bool, bool ); private slots: void repeat(); void togglePickboard(bool on_off); void toggleRepeat(bool on_off); void setMapToDefault(); void setMapToFile(QString map); + void cleanupConfigDlg(); // used to redraw keyboard after edited colors void reloadKeyboard(); private: int getKey( int &w, int j = -1 ); void clearHighlight(); bool *shift; bool *lock; bool *ctrl; bool *alt; bool *meta; + bool *circumflex; + bool *diaeresis; + uint useLargeKeys:1; uint usePicks:1; uint useRepeat:1; int pressedKeyRow; int pressedKeyCol; KeyboardPicks *picks; |