-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 | |||
@@ -85,3 +85,3 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
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('|')); |
@@ -146,3 +146,3 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
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); |
@@ -150,6 +150,8 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
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())); |
@@ -307,2 +309,3 @@ void ConfigDlg::accept() | |||
307 | remove_button->setDisabled(true); | 309 | remove_button->setDisabled(true); |
310 | remove_button->hide(); | ||
308 | emit setMapToDefault(); | 311 | emit setMapToDefault(); |
@@ -312,2 +315,3 @@ void ConfigDlg::accept() | |||
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]); |
@@ -315,3 +319,3 @@ void ConfigDlg::accept() | |||
315 | } else { | 319 | } else { |
316 | 320 | remove_button->show(); | |
317 | remove_button->setEnabled(true); | 321 | remove_button->setEnabled(true); |
@@ -370,3 +374,5 @@ void ConfigDlg::setMap(int index) { | |||
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); |
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 | |||
@@ -54,3 +54,3 @@ private: | |||
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 | ||