author | hash <hash> | 2002-08-19 07:21:51 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-19 07:21:51 (UTC) |
commit | 9cc94030d7f6a04b79da8db83e6c609c1580a3d3 (patch) (unidiff) | |
tree | b7c0fbc543d633ec9bd0f9d2ef762ebb92b2da55 | |
parent | 64a00421be85d223072e087d4d3c9ecdad464095 (diff) | |
download | opie-9cc94030d7f6a04b79da8db83e6c609c1580a3d3.zip opie-9cc94030d7f6a04b79da8db83e6c609c1580a3d3.tar.gz opie-9cc94030d7f6a04b79da8db83e6c609c1580a3d3.tar.bz2 |
parses dir and also lets you add/remove maps located in other places
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 2 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index a6e4dad..ac132d3 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -163,32 +163,34 @@ void ConfigDlg::pickTog() { | |||
163 | * listItem. therefor you have to minus one to the index before you access it. | 163 | * listItem. therefor you have to minus one to the index before you access it. |
164 | * | 164 | * |
165 | */ | 165 | */ |
166 | 166 | ||
167 | void ConfigDlg::setMap(int index) { | 167 | void ConfigDlg::setMap(int index) { |
168 | 168 | ||
169 | if (index == 0) { | 169 | if (index == 0) { |
170 | 170 | ||
171 | remove_button->setDisabled(true); | 171 | remove_button->setDisabled(true); |
172 | 172 | ||
173 | emit setMapToDefault(); | 173 | emit setMapToDefault(); |
174 | } | 174 | } |
175 | else if ((uint)index <= default_maps.count()) { | 175 | else if ((uint)index <= default_maps.count()) { |
176 | 176 | ||
177 | remove_button->setDisabled(true); | 177 | remove_button->setDisabled(true); |
178 | 178 | ||
179 | emit setMapToFile(keymaps->text(index)); | ||
180 | |||
179 | } else { | 181 | } else { |
180 | 182 | ||
181 | remove_button->setEnabled(true); | 183 | remove_button->setEnabled(true); |
182 | 184 | ||
183 | emit setMapToFile(keymaps->text(index)); | 185 | emit setMapToFile(keymaps->text(index)); |
184 | } | 186 | } |
185 | } | 187 | } |
186 | 188 | ||
187 | void ConfigDlg::addMap() { | 189 | void ConfigDlg::addMap() { |
188 | 190 | ||
189 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); | 191 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); |
190 | Config config ("multikey"); | 192 | Config config ("multikey"); |
191 | config.setGroup("keymaps"); | 193 | config.setGroup("keymaps"); |
192 | QStringList maps = config.readListEntry("maps", QChar('|')); | 194 | QStringList maps = config.readListEntry("maps", QChar('|')); |
193 | maps.append(map); | 195 | maps.append(map); |
194 | keymaps->insertItem(map); | 196 | keymaps->insertItem(map); |
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 805f0ed..8c4e666 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h | |||
@@ -56,33 +56,33 @@ public: | |||
56 | Keys(); | 56 | Keys(); |
57 | Keys(const char * filename); | 57 | Keys(const char * filename); |
58 | ~Keys(); | 58 | ~Keys(); |
59 | ushort uni(const int row, const int col); | 59 | ushort uni(const int row, const int col); |
60 | int qcode(const int row, const int col); | 60 | int qcode(const int row, const int col); |
61 | int width(const int row, const int col); | 61 | int width(const int row, const int col); |
62 | bool pressed(const int row, const int col); | 62 | bool pressed(const int row, const int col); |
63 | bool *pressedPtr(const int row, const int col); | 63 | bool *pressedPtr(const int row, const int col); |
64 | ushort shift(const ushort); | 64 | ushort shift(const ushort); |
65 | QPixmap *pix(const int row, const int col); | 65 | QPixmap *pix(const int row, const int col); |
66 | int numKeys(const int row); | 66 | int numKeys(const int row); |
67 | void setKeysFromFile(const char *filename); | 67 | void setKeysFromFile(const char *filename); |
68 | void setKey(const int row, const int qcode, const ushort unicode, | 68 | void setKey(const int row, const int qcode, const ushort unicode, |
69 | const int width, QPixmap *pix); | 69 | const int width, QPixmap *pix); |
70 | void setPressed(const int row, const int col, const bool pressed); | 70 | void setPressed(const int row, const int col, const bool pressed); |
71 | QString lang; | 71 | QString lang; |
72 | QString title; | 72 | QString label; |
73 | 73 | ||
74 | private: | 74 | private: |
75 | 75 | ||
76 | typedef struct Key { | 76 | typedef struct Key { |
77 | int qcode; // are qt key codes just unicode values? | 77 | int qcode; // are qt key codes just unicode values? |
78 | ushort unicode; | 78 | ushort unicode; |
79 | int width; // not pixels but relative key width. normal key is 2 | 79 | int width; // not pixels but relative key width. normal key is 2 |
80 | 80 | ||
81 | // only needed for keys like ctrl that can have multiple keys pressed at once | 81 | // only needed for keys like ctrl that can have multiple keys pressed at once |
82 | bool *pressed; | 82 | bool *pressed; |
83 | QPixmap *pix; | 83 | QPixmap *pix; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | QList<Key> keys[6]; | 86 | QList<Key> keys[6]; |
87 | QMap<ushort,ushort> shiftMap; | 87 | QMap<ushort,ushort> shiftMap; |
88 | 88 | ||