Diffstat (limited to 'inputmethods/multikey/configdlg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 89 |
1 files changed, 73 insertions, 16 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index 157714c..a6e4dad 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -8,2 +8,4 @@ | |||
8 | 8 | ||
9 | #include <iostream.h> | ||
10 | |||
9 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
@@ -24,3 +26,4 @@ | |||
24 | #include <opie/ofiledialog.h> | 26 | #include <opie/ofiledialog.h> |
25 | #include <iostream.h> | 27 | #include <qdir.h> |
28 | #include <qfileinfo.h> | ||
26 | #include "configdlg.h" | 29 | #include "configdlg.h" |
@@ -32,2 +35,4 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
32 | Config config ("multikey"); | 35 | Config config ("multikey"); |
36 | config.setGroup("keymaps"); | ||
37 | QString current_map = config.readEntry("current", 0); | ||
33 | 38 | ||
@@ -48,9 +53,38 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
48 | keymaps->insertItem(cur); | 53 | keymaps->insertItem(cur); |
54 | keymaps->setSelected(0, true); | ||
49 | 55 | ||
50 | config.setGroup ("keymaps"); | 56 | QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); |
51 | QStringList maps = config.readListEntry("maps", QChar('|')); | 57 | default_maps = map_dir.entryList(); // so i can access it in other places |
58 | |||
59 | for (uint i = 0; i <map_dir.count(); i++) { | ||
60 | |||
61 | keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); | ||
62 | if (map_dir.absPath() + "/" + map_dir[i] == current_map) { | ||
63 | |||
64 | keymaps->setSelected(i + 1, true); | ||
65 | } | ||
66 | |||
67 | } | ||
68 | |||
69 | custom_maps = config.readListEntry("maps", QChar('|')); | ||
70 | |||
71 | for (uint i = 0; i < custom_maps.count(); i++) { | ||
72 | |||
73 | if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) | ||
74 | || !QFile::exists(custom_maps[i])) { | ||
75 | |||
76 | custom_maps.remove(custom_maps.at(i)); | ||
77 | |||
78 | // remove it from the list too | ||
79 | config.writeEntry("maps", custom_maps.join("|")); | ||
52 | 80 | ||
53 | for (unsigned int i = 0; i < maps.count(); i++) { | ||
54 | 81 | ||
55 | keymaps->insertItem(maps[i]); | 82 | } else { |
83 | |||
84 | keymaps->insertItem(custom_maps[i]); | ||
85 | if (custom_maps[i] == current_map) { | ||
86 | |||
87 | keymaps->setSelected(map_dir.count() + i + 1, true); | ||
88 | } | ||
89 | } | ||
56 | } | 90 | } |
@@ -58,3 +92,2 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
58 | // have to "+1" because the "current language" listItem... remember? | 92 | // have to "+1" because the "current language" listItem... remember? |
59 | keymaps->setSelected(config.readNumEntry("current", 0) + 1, true); | ||
60 | 93 | ||
@@ -73,2 +106,3 @@ ConfigDlg::ConfigDlg () : QTabWidget () | |||
73 | remove_button->setFlat((bool)1); | 106 | remove_button->setFlat((bool)1); |
107 | connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); | ||
74 | 108 | ||
@@ -128,6 +162,4 @@ void ConfigDlg::pickTog() { | |||
128 | * first element in the QStringList, but here it's the "Current Language" | 162 | * first element in the QStringList, but here it's the "Current Language" |
129 | * listItem. therefor you have to minus one to the index before you access | 163 | * listItem. therefor you have to minus one to the index before you access it. |
130 | * it from the config file. | ||
131 | * | 164 | * |
132 | * and later on, the "current language" setting should be -1 in the config file | ||
133 | */ | 165 | */ |
@@ -138,3 +170,2 @@ void ConfigDlg::setMap(int index) { | |||
138 | 170 | ||
139 | if (remove_button->isEnabled()) | ||
140 | remove_button->setDisabled(true); | 171 | remove_button->setDisabled(true); |
@@ -143,8 +174,11 @@ void ConfigDlg::setMap(int index) { | |||
143 | } | 174 | } |
144 | else { | 175 | else if ((uint)index <= default_maps.count()) { |
176 | |||
177 | remove_button->setDisabled(true); | ||
178 | |||
179 | } else { | ||
145 | 180 | ||
146 | if (!remove_button->isEnabled()) | ||
147 | remove_button->setEnabled(true); | 181 | remove_button->setEnabled(true); |
148 | 182 | ||
149 | emit setMapToFile(index - 1); | 183 | emit setMapToFile(keymaps->text(index)); |
150 | } | 184 | } |
@@ -154,4 +188,13 @@ void ConfigDlg::addMap() { | |||
154 | 188 | ||
155 | QString map = OFileDialog::getOpenFileName(2, QPEApplication::qpeDir() + "/share/multikey"); | 189 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); |
156 | cout << "added file " << map << "!\n"; | 190 | Config config ("multikey"); |
191 | config.setGroup("keymaps"); | ||
192 | QStringList maps = config.readListEntry("maps", QChar('|')); | ||
193 | maps.append(map); | ||
194 | keymaps->insertItem(map); | ||
195 | keymaps->setSelected(keymaps->count() - 1, true); | ||
196 | |||
197 | |||
198 | config.writeEntry("maps", maps.join("|")); | ||
199 | config.writeEntry("current", map); | ||
157 | 200 | ||
@@ -159,4 +202,18 @@ void ConfigDlg::addMap() { | |||
159 | 202 | ||
160 | void ConfigDlg::removeMap(int index) { | 203 | void ConfigDlg::removeMap() { |
204 | |||
205 | cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n"; | ||
206 | cout << "currentItem : " << keymaps->currentItem() << "\n"; | ||
161 | 207 | ||
208 | // move selection up one | ||
209 | keymaps->setSelected(keymaps->currentItem() - 1, true); | ||
210 | // delete the next selected item cus you just moved it up | ||
211 | keymaps->removeItem(keymaps->currentItem() + 1); | ||
212 | |||
213 | custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]); | ||
214 | |||
215 | // write the changes | ||
216 | Config config ("multikey"); | ||
217 | config.setGroup("keymaps"); | ||
218 | config.writeEntry("maps", custom_maps.join("|")); | ||
162 | } | 219 | } |