summaryrefslogtreecommitdiff
authorhash <hash>2002-08-23 18:28:03 (UTC)
committer hash <hash>2002-08-23 18:28:03 (UTC)
commit4e1a0d708c7ff0b7b1c3ad15bcae933b76e1ae5e (patch) (unidiff)
tree95731dcac369953c863e93ba0df3c2e90abff7d3
parent3e37e49a35b786e5da747d4e19e898fb7135533c (diff)
downloadopie-4e1a0d708c7ff0b7b1c3ad15bcae933b76e1ae5e.zip
opie-4e1a0d708c7ff0b7b1c3ad15bcae933b76e1ae5e.tar.gz
opie-4e1a0d708c7ff0b7b1c3ad15bcae933b76e1ae5e.tar.bz2
oops, fixed bug in color buttons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 9576579..10bc611 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -180,188 +180,188 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
180 keycolor_lines_button->setFlat((bool)1); 180 keycolor_lines_button->setFlat((bool)1);
181 color = config.readListEntry("keycolor_lines", QChar(',')); 181 color = config.readListEntry("keycolor_lines", QChar(','));
182 keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); 182 keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
183 183
184 184
185 label = new QLabel(tr("Text Color"), color_box); 185 label = new QLabel(tr("Text Color"), color_box);
186 textcolor_button = new QPushButton(color_box); 186 textcolor_button = new QPushButton(color_box);
187 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); 187 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
188 textcolor_button->setFlat((bool)1); 188 textcolor_button->setFlat((bool)1);
189 color = config.readListEntry("textcolor", QChar(',')); 189 color = config.readListEntry("textcolor", QChar(','));
190 textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); 190 textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
191 191
192 192
193 label = new QLabel("", color_box); // a spacer so the above buttons dont expand 193 label = new QLabel("", color_box); // a spacer so the above buttons dont expand
194 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); 194 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
195 195
196} 196}
197 197
198void ConfigDlg::pickTog() { 198void ConfigDlg::pickTog() {
199 199
200 Config config ("multikey"); 200 Config config ("multikey");
201 config.setGroup ("general"); 201 config.setGroup ("general");
202 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed 202 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed
203 203
204 emit pickboardToggled(pick_button->isChecked()); 204 emit pickboardToggled(pick_button->isChecked());
205} 205}
206 206
207void ConfigDlg::repeatTog() { 207void ConfigDlg::repeatTog() {
208 208
209 Config config ("multikey"); 209 Config config ("multikey");
210 config.setGroup ("general"); 210 config.setGroup ("general");
211 config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed 211 config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed
212 212
213 emit repeatToggled(repeat_button->isChecked()); 213 emit repeatToggled(repeat_button->isChecked());
214} 214}
215 215
216// ConfigDlg::setMap {{{1 216// ConfigDlg::setMap {{{1
217 217
218/* 218/*
219 * the index is kinda screwy, because in the config file, index 0 is just the 219 * the index is kinda screwy, because in the config file, index 0 is just the
220 * first element in the QStringList, but here it's the "Current Language" 220 * first element in the QStringList, but here it's the "Current Language"
221 * listItem. therefor you have to minus one to the index before you access it. 221 * listItem. therefor you have to minus one to the index before you access it.
222 * 222 *
223 */ 223 */
224 224
225void ConfigDlg::setMap(int index) { 225void ConfigDlg::setMap(int index) {
226 226
227 if (index == 0) { 227 if (index == 0) {
228 228
229 remove_button->setDisabled(true); 229 remove_button->setDisabled(true);
230 emit setMapToDefault(); 230 emit setMapToDefault();
231 } 231 }
232 else if ((uint)index <= default_maps.count()) { 232 else if ((uint)index <= default_maps.count()) {
233 233
234 remove_button->setDisabled(true); 234 remove_button->setDisabled(true);
235 emit setMapToFile(keymaps->text(index)); 235 emit setMapToFile(keymaps->text(index));
236 236
237 } else { 237 } else {
238 238
239 remove_button->setEnabled(true); 239 remove_button->setEnabled(true);
240 emit setMapToFile(keymaps->text(index)); 240 emit setMapToFile(keymaps->text(index));
241 } 241 }
242} 242}
243 243
244// ConfigDlg::addMap() {{{1 244// ConfigDlg::addMap() {{{1
245void ConfigDlg::addMap() { 245void ConfigDlg::addMap() {
246 246
247 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); 247 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
248 248
249 if (map.isNull()) return; 249 if (map.isNull()) return;
250 250
251 Config config ("multikey"); 251 Config config ("multikey");
252 config.setGroup("keymaps"); 252 config.setGroup("keymaps");
253 QStringList maps = config.readListEntry("maps", QChar('|')); 253 QStringList maps = config.readListEntry("maps", QChar('|'));
254 maps.append(map); 254 maps.append(map);
255 keymaps->insertItem(map); 255 keymaps->insertItem(map);
256 keymaps->setSelected(keymaps->count() - 1, true); 256 keymaps->setSelected(keymaps->count() - 1, true);
257 257
258 258
259 config.writeEntry("maps", maps, QChar('|')); 259 config.writeEntry("maps", maps, QChar('|'));
260 config.writeEntry("current", map); 260 config.writeEntry("current", map);
261 261
262} 262}
263 263
264// ConfigDlg::removeMap() {{{1 264// ConfigDlg::removeMap() {{{1
265void ConfigDlg::removeMap() { 265void ConfigDlg::removeMap() {
266 266
267 cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n"; 267 cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n";
268 cout << "currentItem : " << keymaps->currentItem() << "\n"; 268 cout << "currentItem : " << keymaps->currentItem() << "\n";
269 269
270 // move selection up one 270 // move selection up one
271 keymaps->setSelected(keymaps->currentItem() - 1, true); 271 keymaps->setSelected(keymaps->currentItem() - 1, true);
272 // delete the next selected item cus you just moved it up 272 // delete the next selected item cus you just moved it up
273 keymaps->removeItem(keymaps->currentItem() + 1); 273 keymaps->removeItem(keymaps->currentItem() + 1);
274 274
275 custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]); 275 custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]);
276 276
277 // write the changes 277 // write the changes
278 Config config ("multikey"); 278 Config config ("multikey");
279 config.setGroup("keymaps"); 279 config.setGroup("keymaps");
280 config.writeEntry("maps", custom_maps, QChar('|')); 280 config.writeEntry("maps", custom_maps, QChar('|'));
281} 281}
282 282
283/* ConfigDlg::slots for the color buttons {{{1 283/* ConfigDlg::slots for the color buttons {{{1
284 * 284 *
285 * these four slots are almost the same, except for the names. i was thinking 285 * these four slots are almost the same, except for the names. i was thinking
286 * of making a map with pointers to the buttons and names of the configEntry 286 * of making a map with pointers to the buttons and names of the configEntry
287 * so it could be one slot, but then there would be no way of telling which 287 * so it could be one slot, but then there would be no way of telling which
288 * of the buttons was clicked if they all connect to the same slot. 288 * of the buttons was clicked if they all connect to the same slot.
289 * 289 *
290 */ 290 */
291 291
292void ConfigDlg::keyColorClicked() { 292void ConfigDlg::keyColorClicked() {
293 293
294 Config config ("multikey"); 294 Config config ("multikey");
295 config.setGroup ("colors"); 295 config.setGroup ("colors");
296 296
297 QStringList color = config.readListEntry("keycolor", QChar(',')); 297 QStringList color = config.readListEntry("keycolor", QChar(','));
298 298
299 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 299 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
300 300
301 color[0].setNum(newcolor.red()); 301 color[0].setNum(newcolor.red());
302 color[1].setNum(newcolor.green()); 302 color[1].setNum(newcolor.green());
303 color[2].setNum(newcolor.blue()); 303 color[2].setNum(newcolor.blue());
304 304
305 config.writeEntry("keycolor", color, QChar(',')); 305 config.writeEntry("keycolor", color, QChar(','));
306 config.write(); 306 config.write();
307 307
308 keycolor_button->setBackgroundColor(newcolor); 308 keycolor_button->setPalette(QPalette(newcolor));
309 emit reloadKeyboard(); 309 emit reloadKeyboard();
310} 310}
311void ConfigDlg::keyColorPressedClicked() { 311void ConfigDlg::keyColorPressedClicked() {
312 312
313 Config config ("multikey"); 313 Config config ("multikey");
314 config.setGroup ("colors"); 314 config.setGroup ("colors");
315 315
316 QStringList color = config.readListEntry("keycolor_pressed", QChar(',')); 316 QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
317 317
318 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 318 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
319 319
320 color[0].setNum(newcolor.red()); 320 color[0].setNum(newcolor.red());
321 color[1].setNum(newcolor.green()); 321 color[1].setNum(newcolor.green());
322 color[2].setNum(newcolor.blue()); 322 color[2].setNum(newcolor.blue());
323 323
324 config.writeEntry("keycolor_pressed", color, QChar(',')); 324 config.writeEntry("keycolor_pressed", color, QChar(','));
325 config.write(); 325 config.write();
326 326
327 keycolor_pressed_button->setBackgroundColor(newcolor); 327 keycolor_pressed_button->setPalette(QPalette(newcolor));
328 emit reloadKeyboard(); 328 emit reloadKeyboard();
329} 329}
330void ConfigDlg::keyColorLinesClicked() { 330void ConfigDlg::keyColorLinesClicked() {
331 331
332 Config config ("multikey"); 332 Config config ("multikey");
333 config.setGroup ("colors"); 333 config.setGroup ("colors");
334 334
335 QStringList color = config.readListEntry("keycolor_lines", QChar(',')); 335 QStringList color = config.readListEntry("keycolor_lines", QChar(','));
336 336
337 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 337 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
338 338
339 color[0].setNum(newcolor.red()); 339 color[0].setNum(newcolor.red());
340 color[1].setNum(newcolor.green()); 340 color[1].setNum(newcolor.green());
341 color[2].setNum(newcolor.blue()); 341 color[2].setNum(newcolor.blue());
342 342
343 config.writeEntry("keycolor_lines", color, QChar(',')); 343 config.writeEntry("keycolor_lines", color, QChar(','));
344 config.write(); 344 config.write();
345 345
346 keycolor_lines_button->setBackgroundColor(newcolor); 346 keycolor_lines_button->setPalette(QPalette(newcolor));
347 emit reloadKeyboard(); 347 emit reloadKeyboard();
348} 348}
349void ConfigDlg::textColorClicked() { 349void ConfigDlg::textColorClicked() {
350 350
351 Config config ("multikey"); 351 Config config ("multikey");
352 config.setGroup ("colors"); 352 config.setGroup ("colors");
353 353
354 QStringList color = config.readListEntry("textcolor", QChar(',')); 354 QStringList color = config.readListEntry("textcolor", QChar(','));
355 355
356 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 356 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
357 357
358 color[0].setNum(newcolor.red()); 358 color[0].setNum(newcolor.red());
359 color[1].setNum(newcolor.green()); 359 color[1].setNum(newcolor.green());
360 color[2].setNum(newcolor.blue()); 360 color[2].setNum(newcolor.blue());
361 361
362 config.writeEntry("textcolor", color, QChar(',')); 362 config.writeEntry("textcolor", color, QChar(','));
363 config.write(); 363 config.write();
364 364
365 textcolor_button->setBackgroundColor(newcolor); 365 textcolor_button->setPalette(QPalette(newcolor));
366 emit reloadKeyboard(); 366 emit reloadKeyboard();
367} 367}