summaryrefslogtreecommitdiff
path: root/inputmethods/multikey/configdlg.cpp
authormickeyl <mickeyl>2004-01-03 16:57:51 (UTC)
committer mickeyl <mickeyl>2004-01-03 16:57:51 (UTC)
commitbdabd0e055d494c7546de08348e32cf5622c9074 (patch) (side-by-side diff)
tree97346f3ef40158d31c2e649390a941135890a39b /inputmethods/multikey/configdlg.cpp
parent4f7bf49ba4c0466aa9cea618c9317ac965a1118f (diff)
downloadopie-bdabd0e055d494c7546de08348e32cf5622c9074.zip
opie-bdabd0e055d494c7546de08348e32cf5622c9074.tar.gz
opie-bdabd0e055d494c7546de08348e32cf5622c9074.tar.bz2
add multikey patches courtesy Anton Kachalov <mouse@altlinux.ru>
Diffstat (limited to 'inputmethods/multikey/configdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp238
1 files changed, 162 insertions, 76 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index a8206b7..f127d0e 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -12,2 +12,3 @@
#include <qpe/config.h>
+#include <qpe/resource.h>
@@ -25,2 +26,3 @@
#include <qstringlist.h>
+#include <qtoolbutton.h>
#include <opie/ofiledialog.h>
@@ -50,4 +52,20 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
- keymaps = new QListBox (map_group);
+ QHBox *hbox1 = new QHBox(map_group);
+ keymaps = new QListBox(hbox1);
keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+ QVBox *vbox1 = new QVBox(hbox1);
+
+ QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up"));
+ tb1->setPixmap(Resource::loadPixmap("up"));
+ tb1->setAutoRaise(TRUE);
+ tb1->setFocusPolicy(QWidget::NoFocus);
+ tb1->setToggleButton(FALSE);
+ connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp()));
+
+ QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down"));
+ tb2->setPixmap(Resource::loadPixmap("down"));
+ tb2->setAutoRaise(TRUE);
+ tb2->setFocusPolicy(QWidget::NoFocus);
+ tb2->setToggleButton(FALSE);
+ connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown()));
@@ -59,72 +77,53 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
default_maps = map_dir.entryList(); // so i can access it in other places
-
- for (uint i = 0; i < map_dir.count(); i++) {
-
- QFile map (map_dir.absPath() + "/" + map_dir[i]);
- if (map.open(IO_ReadOnly)) {
-
- QString line; bool found = 0;
-
- map.readLine(line, 1024);
- while (!map.atEnd()) {
-
- if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
-
- keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
- found = 1;
- break;
- }
- map.readLine(line, 1024);
- }
- if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
-
- map.close();
- }
- if (map_dir.absPath() + "/" + map_dir[i] == current_map) {
-
- keymaps->setSelected(i + 1, true);
- }
-
- }
-
custom_maps = config.readListEntry("maps", QChar('|'));
+ sw_maps = ConfigDlg::loadSw();
- for (uint i = 0; i < custom_maps.count(); i++) {
+ QStringList sw_copy(sw_maps);
+ for (uint i = 0; i < sw_copy.count(); i++) {
- if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false)
- || !QFile::exists(custom_maps[i])) {
+ QString keymap_map;
+ if (sw_copy[i][0] != '/') { /* share/multikey */
- custom_maps.remove(custom_maps.at(i));
+ keymap_map = map_dir.absPath() + "/" + sw_copy[i];
+ } else {
- // remove it from the list too
- config.writeEntry("maps", custom_maps.join("|"));
+ if (map_dir.exists(QFileInfo(sw_copy[i]).fileName(), false)
+ || !QFile::exists(sw_copy[i])) {
+ custom_maps.remove(sw_copy[i]);
+ sw_maps.remove(sw_copy[i]);
- } else {
+ // remove it from the list too
+ config.writeEntry("maps", custom_maps.join("|"));
- QFile map (custom_maps[i]);
- if (map.open(IO_ReadOnly)) {
+ continue;
+ }
+ keymap_map = sw_copy[i];
+ }
- QString line; bool found = 0;
+ QFile map(keymap_map);
+ if (map.open(IO_ReadOnly)) {
- map.readLine(line, 1024);
- while (!map.atEnd()) {
+ QString line; bool found = 0;
- if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
-
- keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
- found = 1;
- break;
- }
- map.readLine(line, 1024);
- }
- if (!found) keymaps->insertItem(custom_maps[i]);
-
- map.close();
- }
- if (custom_maps[i] == current_map) {
+ map.readLine(line, 1024);
+ while (!map.atEnd()) {
- keymaps->setSelected(map_dir.count() + i + 1, true);
- }
- }
+ if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
+
+ keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
+ found = 1;
+ break;
+ }
+ map.readLine(line, 1024);
+ }
+ if (!found)
+ keymaps->insertItem(keymap_map);
+
+ map.close();
+ }
+
+ if (keymap_map == current_map) {
+ keymaps->setSelected(i + 1, true);
+ }
}
@@ -135,3 +134,2 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
-
QGrid *add_remove_grid = new QGrid(2, map_group);
@@ -141,3 +139,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
add_button = new QPushButton(tr("Add"), add_remove_grid);
- add_button->setFlat((bool)1);
+ add_button->setFlat(TRUE);
connect(add_button, SIGNAL(clicked()), SLOT(addMap()));
@@ -145,5 +143,5 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
remove_button = new QPushButton(tr("Remove"), add_remove_grid);
- remove_button->setFlat((bool)1);
- if ((int)map_dir.count() >= keymaps->currentItem())
- remove_button->setDisabled(true);
+ remove_button->setFlat(TRUE);
+ if (default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end())
+ remove_button->setDisabled(true);
connect(remove_button, SIGNAL(clicked()), SLOT(removeMap()));
@@ -155,3 +153,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
config.setGroup ("general");
- bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed
+ bool pick_open = config.readBoolEntry ("usePickboard", FALSE); // default closed
if (pick_open) {
@@ -165,3 +163,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
repeat_button = new QCheckBox(tr("Key Repeat"), other_grid);
- bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1);
+ bool repeat_on = config.readBoolEntry ("useRepeat", TRUE);
@@ -173,3 +171,2 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
-
/*
@@ -191,3 +188,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked()));
- keycolor_button->setFlat((bool)1);
+ keycolor_button->setFlat(TRUE);
color = config.readListEntry("keycolor", QChar(','));
@@ -208,3 +205,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked()));
- keycolor_pressed_button->setFlat((bool)1);
+ keycolor_pressed_button->setFlat(TRUE);
color = config.readListEntry("keycolor_pressed", QChar(','));
@@ -215,3 +212,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked()));
- keycolor_lines_button->setFlat((bool)1);
+ keycolor_lines_button->setFlat(TRUE);
color = config.readListEntry("keycolor_lines", QChar(','));
@@ -223,3 +220,3 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
- textcolor_button->setFlat((bool)1);
+ textcolor_button->setFlat(TRUE);
color = config.readListEntry("textcolor", QChar(','));
@@ -227,6 +224,90 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
-
label = new QLabel("", color_box); // a spacer so the above buttons dont expand
label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
+}
+
+ConfigDlg::~ConfigDlg()
+{
+ emit reloadSw();
+}
+
+QStringList ConfigDlg::loadSw()
+{
+ Config *config = new Config("multikey");
+ config->setGroup("keymaps");
+ QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
+ QStringList d_maps = map_dir.entryList(); // so i can access it in other places
+ QStringList c_maps = config->readListEntry("maps", QChar('|'));
+ QStringList s_maps = config->readListEntry("sw", QChar('|'));
+ delete config;
+
+ if (!s_maps.count())
+ {
+ s_maps = d_maps+c_maps;
+ }
+ else
+ {
+ /* Clear non existents entries */
+ QStringList s_copy = s_maps;
+ for (uint i = 0; i < s_copy.count(); ++i) {
+ if (d_maps.find(s_copy[i]) == d_maps.end()
+ && c_maps.find(s_copy[i]) == c_maps.end()) {
+ s_maps.remove(s_copy[i]);
+ }
+ }
+ /* Update sw_maps from default_maps */
+ for (uint i = 0; i < d_maps.count(); ++i) {
+ if (s_maps.find(d_maps[i]) == s_maps.end()) {
+ s_maps.append(d_maps[i]);
+ }
+ }
+ /* Update sw_maps from custom_maps */
+ for (uint i = 0; i < c_maps.count(); ++i) {
+ if (s_maps.find(c_maps[i]) == s_maps.end()) {
+ s_maps.append(c_maps[i]);
+ }
+ }
+ }
+
+ return s_maps;
+}
+
+void ConfigDlg::moveSelectedUp()
+{
+ int i = keymaps->currentItem();
+ /* Ignore Current Language */
+ if (i > 1) {
+ QString t = sw_maps[i-1];
+ sw_maps[i-1] = sw_maps[i-2];
+ sw_maps[i-2] = t;
+
+ QString item = keymaps->currentText();
+ keymaps->removeItem(i);
+ keymaps->insertItem(item, i-1);
+ keymaps->setCurrentItem(i-1);
+
+ Config config("multikey");
+ config.setGroup("keymaps");
+ config.writeEntry("sw", sw_maps, QChar('|'));
+ }
+}
+void ConfigDlg::moveSelectedDown()
+{
+ int i = keymaps->currentItem();
+ /* Ignore Current Language */
+ if (i > 0 && i < (int)keymaps->count() - 1) {
+ QString t = sw_maps[i-1];
+ sw_maps[i-1] = sw_maps[i];
+ sw_maps[i] = t;
+
+ QString item = keymaps->currentText();
+ keymaps->removeItem(i);
+ keymaps->insertItem(item, i+1);
+ keymaps->setCurrentItem(i+1);
+
+ Config config("multikey");
+ config.setGroup("keymaps");
+ config.writeEntry("sw", sw_maps, QChar('|'));
+ }
}
@@ -273,6 +354,6 @@ void ConfigDlg::setMap(int index) {
}
- else if ((uint)index <= default_maps.count()) {
+ else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) {
remove_button->setDisabled(true);
- emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + default_maps[index - 1]);
+ emit setMapToFile(QPEApplication::qpeDir() + "share/multikey/" + sw_maps[index - 1]);
@@ -281,3 +362,3 @@ void ConfigDlg::setMap(int index) {
remove_button->setEnabled(true);
- emit setMapToFile(custom_maps[index - default_maps.count() - 1]);
+ emit setMapToFile(sw_maps[index - 1]);
}
@@ -297,2 +378,4 @@ void ConfigDlg::addMap() {
custom_maps.append(map);
+ if (sw_maps.find(map) == sw_maps.end())
+ sw_maps.append(map);
@@ -323,2 +406,3 @@ void ConfigDlg::addMap() {
config.writeEntry("maps", maps, QChar('|'));
+ config.writeEntry("sw", sw_maps, QChar('|'));
config.writeEntry("current", map);
@@ -335,3 +419,4 @@ void ConfigDlg::removeMap() {
- custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count()));
+ custom_maps.remove(sw_maps[keymaps->currentItem()]);
+ sw_maps.remove(sw_maps.at(keymaps->currentItem()));
@@ -341,2 +426,3 @@ void ConfigDlg::removeMap() {
config.writeEntry("maps", custom_maps, QChar('|'));
+ config.writeEntry("sw", sw_maps, QChar('|'));
}