author | erik <erik> | 2007-01-12 19:12:57 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-12 19:12:57 (UTC) |
commit | e9768d9a498037195b8ca3bb5155db7419f30e1a (patch) (unidiff) | |
tree | 55effb9a63d0533292d6c8989691c6050c23e032 /inputmethods/multikey | |
parent | 37d5f4aeb353f4a3e48f5c739b7797e788687b77 (diff) | |
download | opie-e9768d9a498037195b8ca3bb5155db7419f30e1a.zip opie-e9768d9a498037195b8ca3bb5155db7419f30e1a.tar.gz opie-e9768d9a498037195b8ca3bb5155db7419f30e1a.tar.bz2 |
Various comment changes to make them grammatically correct. Also changed the
behavior of the remove button. Only when a custom keymap is selected is the
remove button ever shown. Added 'keymap...' to the add button to make it
more clear that one is add a keymap and that a dialog to add it will come
next. This should follow the Opie UI convention.
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 18 | ||||
-rw-r--r-- | inputmethods/multikey/configdlg.h | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index 52c498b..24fdb7f 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -80,13 +80,13 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
80 | 80 | ||
81 | QString cur(tr("Current Language")); | 81 | QString cur(tr("Current Language")); |
82 | keymaps->insertItem(cur); | 82 | keymaps->insertItem(cur); |
83 | keymaps->setSelected(0, true); | 83 | keymaps->setSelected(0, true); |
84 | 84 | ||
85 | QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap"); | 85 | QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap"); |
86 | default_maps = map_dir.entryList(); // so i can access it in other places | 86 | default_maps = map_dir.entryList(); // so the object can access keymaps in other places |
87 | custom_maps = config.readListEntry("maps", QChar('|')); | 87 | custom_maps = config.readListEntry("maps", QChar('|')); |
88 | sw_maps = ConfigDlg::loadSw(); | 88 | sw_maps = ConfigDlg::loadSw(); |
89 | 89 | ||
90 | QStringList sw_copy(sw_maps); | 90 | QStringList sw_copy(sw_maps); |
91 | for (uint i = 0; i < sw_copy.count(); i++) { | 91 | for (uint i = 0; i < sw_copy.count(); i++) { |
92 | 92 | ||
@@ -141,20 +141,22 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
141 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); | 141 | connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); |
142 | 142 | ||
143 | QGrid *add_remove_grid = new QGrid(2, map_group); | 143 | QGrid *add_remove_grid = new QGrid(2, map_group); |
144 | add_remove_grid->setMargin(3); | 144 | add_remove_grid->setMargin(3); |
145 | add_remove_grid->setSpacing(3); | 145 | add_remove_grid->setSpacing(3); |
146 | 146 | ||
147 | add_button = new QPushButton(tr("Add"), add_remove_grid); | 147 | add_button = new QPushButton(tr("Add keymap..."), add_remove_grid); |
148 | add_button->setFlat(TRUE); | 148 | add_button->setFlat(TRUE); |
149 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); | 149 | connect(add_button, SIGNAL(clicked()), SLOT(addMap())); |
150 | 150 | ||
151 | remove_button = new QPushButton(tr("Remove"), add_remove_grid); | 151 | remove_button = new QPushButton(tr("Remove keymap"), add_remove_grid); |
152 | remove_button->setFlat(TRUE); | 152 | remove_button->setFlat(TRUE); |
153 | if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) | 153 | if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) { |
154 | remove_button->setDisabled(true); | 154 | remove_button->setDisabled(true); |
155 | remove_button->hide(); | ||
156 | } | ||
155 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); | 157 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); |
156 | 158 | ||
157 | gen_lay->addWidget(map_group); | 159 | gen_lay->addWidget(map_group); |
158 | 160 | ||
159 | // make a box that will contain the buttons on the bottom | 161 | // make a box that will contain the buttons on the bottom |
160 | QGrid *other_grid = new QGrid(2, gen_box); | 162 | QGrid *other_grid = new QGrid(2, gen_box); |
@@ -302,21 +304,23 @@ void ConfigDlg::accept() | |||
302 | delete config; | 304 | delete config; |
303 | 305 | ||
304 | int index = keymaps->currentItem(); | 306 | int index = keymaps->currentItem(); |
305 | if (index == 0) { | 307 | if (index == 0) { |
306 | 308 | ||
307 | remove_button->setDisabled(true); | 309 | remove_button->setDisabled(true); |
310 | remove_button->hide(); | ||
308 | emit setMapToDefault(); | 311 | emit setMapToDefault(); |
309 | } | 312 | } |
310 | else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) { | 313 | else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) { |
311 | 314 | ||
312 | remove_button->setDisabled(true); | 315 | remove_button->setDisabled(true); |
316 | remove_button->hide(); | ||
313 | emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]); | 317 | emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]); |
314 | 318 | ||
315 | } else { | 319 | } else { |
316 | 320 | remove_button->show(); | |
317 | remove_button->setEnabled(true); | 321 | remove_button->setEnabled(true); |
318 | emit setMapToFile(sw_maps[index - 1]); | 322 | emit setMapToFile(sw_maps[index - 1]); |
319 | } | 323 | } |
320 | 324 | ||
321 | emit pickboardToggled(pick_button->isChecked()); | 325 | emit pickboardToggled(pick_button->isChecked()); |
322 | emit repeatToggled(repeat_button->isChecked()); | 326 | emit repeatToggled(repeat_button->isChecked()); |
@@ -365,13 +369,15 @@ void ConfigDlg::closeEvent(QCloseEvent *) { | |||
365 | } | 369 | } |
366 | 370 | ||
367 | void ConfigDlg::setMap(int index) { | 371 | void ConfigDlg::setMap(int index) { |
368 | 372 | ||
369 | if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) { | 373 | if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) { |
370 | remove_button->setDisabled(true); | 374 | remove_button->setDisabled(true); |
375 | remove_button->hide(); | ||
371 | } else { | 376 | } else { |
377 | remove_button->show(); | ||
372 | remove_button->setEnabled(true); | 378 | remove_button->setEnabled(true); |
373 | } | 379 | } |
374 | } | 380 | } |
375 | 381 | ||
376 | // ConfigDlg::addMap() {{{1 | 382 | // ConfigDlg::addMap() {{{1 |
377 | void ConfigDlg::addMap() { | 383 | void ConfigDlg::addMap() { |
diff --git a/inputmethods/multikey/configdlg.h b/inputmethods/multikey/configdlg.h index 8e96e9b..f900a14 100644 --- a/inputmethods/multikey/configdlg.h +++ b/inputmethods/multikey/configdlg.h | |||
@@ -49,13 +49,13 @@ private: | |||
49 | QListBox *keymaps; | 49 | QListBox *keymaps; |
50 | QPushButton *add_button; | 50 | QPushButton *add_button; |
51 | QPushButton *remove_button; | 51 | QPushButton *remove_button; |
52 | 52 | ||
53 | QStringList default_maps; // the maps in your share/multikey/ dir | 53 | QStringList default_maps; // the maps in your share/multikey/ dir |
54 | QStringList custom_maps; // maps you added with the 'add' button | 54 | QStringList custom_maps; // maps you added with the 'add' button |
55 | QStringList sw_maps; // maps, which used in keyboard switch rotation ring | 55 | QStringList sw_maps; // maps used in keyboard switch rotation ring |
56 | 56 | ||
57 | /* color buttons */ | 57 | /* color buttons */ |
58 | QPushButton *keycolor_button; | 58 | QPushButton *keycolor_button; |
59 | QPushButton *keycolor_pressed_button; | 59 | QPushButton *keycolor_pressed_button; |
60 | QPushButton *keycolor_lines_button; | 60 | QPushButton *keycolor_lines_button; |
61 | QPushButton *textcolor_button; | 61 | QPushButton *textcolor_button; |