summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp18
-rw-r--r--inputmethods/multikey/configdlg.h2
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 ()
QString cur(tr("Current Language"));
keymaps->insertItem(cur);
keymaps->setSelected(0, true);
QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap");
- default_maps = map_dir.entryList(); // so i can access it in other places
+ default_maps = map_dir.entryList(); // so the object can access keymaps in other places
custom_maps = config.readListEntry("maps", QChar('|'));
sw_maps = ConfigDlg::loadSw();
QStringList sw_copy(sw_maps);
for (uint i = 0; i < sw_copy.count(); i++) {
@@ -141,20 +141,22 @@ ConfigDlg::ConfigDlg () : QDialog ()
connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int)));
QGrid *add_remove_grid = new QGrid(2, map_group);
add_remove_grid->setMargin(3);
add_remove_grid->setSpacing(3);
- add_button = new QPushButton(tr("Add"), add_remove_grid);
+ add_button = new QPushButton(tr("Add keymap..."), add_remove_grid);
add_button->setFlat(TRUE);
connect(add_button, SIGNAL(clicked()), SLOT(addMap()));
- remove_button = new QPushButton(tr("Remove"), add_remove_grid);
+ remove_button = new QPushButton(tr("Remove keymap"), add_remove_grid);
remove_button->setFlat(TRUE);
- if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end())
- remove_button->setDisabled(true);
+ if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) {
+ remove_button->setDisabled(true);
+ remove_button->hide();
+ }
connect(remove_button, SIGNAL(clicked()), SLOT(removeMap()));
gen_lay->addWidget(map_group);
// make a box that will contain the buttons on the bottom
QGrid *other_grid = new QGrid(2, gen_box);
@@ -302,21 +304,23 @@ void ConfigDlg::accept()
delete config;
int index = keymaps->currentItem();
if (index == 0) {
remove_button->setDisabled(true);
+ remove_button->hide();
emit setMapToDefault();
}
else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) {
remove_button->setDisabled(true);
+ remove_button->hide();
emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]);
} else {
-
+ remove_button->show();
remove_button->setEnabled(true);
emit setMapToFile(sw_maps[index - 1]);
}
emit pickboardToggled(pick_button->isChecked());
emit repeatToggled(repeat_button->isChecked());
@@ -365,13 +369,15 @@ void ConfigDlg::closeEvent(QCloseEvent *) {
}
void ConfigDlg::setMap(int index) {
if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) {
remove_button->setDisabled(true);
+ remove_button->hide();
} else {
+ remove_button->show();
remove_button->setEnabled(true);
}
}
// ConfigDlg::addMap() {{{1
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:
QListBox *keymaps;
QPushButton *add_button;
QPushButton *remove_button;
QStringList default_maps; // the maps in your share/multikey/ dir
QStringList custom_maps; // maps you added with the 'add' button
- QStringList sw_maps; // maps, which used in keyboard switch rotation ring
+ QStringList sw_maps; // maps used in keyboard switch rotation ring
/* color buttons */
QPushButton *keycolor_button;
QPushButton *keycolor_pressed_button;
QPushButton *keycolor_lines_button;
QPushButton *textcolor_button;