| author | erik <erik> | 2007-01-12 19:12:57 (UTC) |
|---|---|---|
| committer | erik <erik> | 2007-01-12 19:12:57 (UTC) |
| commit | e9768d9a498037195b8ca3bb5155db7419f30e1a (patch) (side-by-side diff) | |
| tree | 55effb9a63d0533292d6c8989691c6050c23e032 /inputmethods | |
| 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 @@ -85,3 +85,3 @@ ConfigDlg::ConfigDlg () : QDialog () 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('|')); @@ -146,3 +146,3 @@ ConfigDlg::ConfigDlg () : QDialog () - add_button = new QPushButton(tr("Add"), add_remove_grid); + add_button = new QPushButton(tr("Add keymap..."), add_remove_grid); add_button->setFlat(TRUE); @@ -150,6 +150,8 @@ ConfigDlg::ConfigDlg () : QDialog () - 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())); @@ -307,2 +309,3 @@ void ConfigDlg::accept() remove_button->setDisabled(true); + remove_button->hide(); emit setMapToDefault(); @@ -312,2 +315,3 @@ void ConfigDlg::accept() remove_button->setDisabled(true); + remove_button->hide(); emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]); @@ -315,3 +319,3 @@ void ConfigDlg::accept() } else { - + remove_button->show(); remove_button->setEnabled(true); @@ -370,3 +374,5 @@ void ConfigDlg::setMap(int index) { remove_button->setDisabled(true); + remove_button->hide(); } else { + remove_button->show(); 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: 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 |