opie-multikey: Rename buttons to add/remove custom keymap to be more clear.

* opie-multikey needs usability improvements at all - it may take a user
some effort to figure out that to change language layout, one needs to call
config (which lives on a key marked as shift), select language, and tap
OK at window top. Most people would tap "Add" and present with file selection
dialog with unknown to them purpose. So, name buttons "Add custom..." and
"Remove custom", to correspond to their function.

diff --git a/packages/opie-multikey/files/.mtn2git_empty b/packages/opie-multikey/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/opie-multikey/files/friendly-button-names.patch b/packages/opie-multikey/files/friendly-button-names.patch
new file mode 100644 (file)
index 0000000..148204e
--- /dev/null
+++ b/packages/opie-multikey/files/friendly-button-names.patch
@@ -0,0 +1,16 @@
+--- multikey/configdlg.cpp.org 2005-06-15 22:54:50.000000000 +0000
++++ multikey/configdlg.cpp     2007-01-11 19:51:09.000000000 +0000
+@@ -144,11 +144,11 @@
+     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 custom..."), 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 custom"), 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);

diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb
index 7cd1ac6..702dda0 100644 (file)
--- a/packages/opie-multikey/opie-multikey_1.2.2.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.2.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
-
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           file://friendly-button-names.patch;patch=1"

diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 93d37ed..5080a4d 100644 (file)
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
-           ${HANDHELDS_CVS};module=opie/share"
+           ${HANDHELDS_CVS};module=opie/share \
+           file://friendly-button-names.patch;patch=1"