Differential D22823 Diff 62837 kcms/access/kcmaccess.cpp

Changeset View

Standalone View

View Options

kcms/access/kcmaccess.cpp

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Line(s)161{
232 connect(ui.timeout, &QCheckBox::clicked, this, &KAccessConfig::checkAccess); 232​ connect(ui.timeout, &QCheckBox::clicked, this, &KAccessConfig::checkAccess);
233 connect(ui.timeoutDelay, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged); 233​ connect(ui.timeoutDelay, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
234 connect(ui.accessxBeep, &QCheckBox::clicked, this, &KAccessConfig::configChanged); 234​ connect(ui.accessxBeep, &QCheckBox::clicked, this, &KAccessConfig::configChanged);
235 connect(ui.gestureConfirmation, &QCheckBox::clicked, this, &KAccessConfig::configChanged); 235​ connect(ui.gestureConfirmation, &QCheckBox::clicked, this, &KAccessConfig::configChanged);
236 connect(ui.kNotifyAccess, &QCheckBox::clicked, this, &KAccessConfig::configChanged); 236​ connect(ui.kNotifyAccess, &QCheckBox::clicked, this, &KAccessConfig::configChanged);
237 connect(ui.kNotifyAccess, &QCheckBox::clicked, this, &KAccessConfig::checkAccess); 237​ connect(ui.kNotifyAccess, &QCheckBox::clicked, this, &KAccessConfig::checkAccess);
238 connect(ui.kNotifyAccessButton, &QPushButton::clicked, this, &KAccessConfig::configureKNotify); 238​ connect(ui.kNotifyAccessButton, &QPushButton::clicked, this, &KAccessConfig::configureKNotify);
239 239​
240​ // keynboard navigation
241​ connect(ui.mouseKeys, &QCheckBox::clicked, this, &KAccessConfig::configChanged);
242​ connect(ui.mk_delay, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
243​ connect(ui.mk_interval, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
244​ connect(ui.mk_time_to_max, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
245​ connect(ui.mk_max_speed, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
246​ connect(ui.mk_curve, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &KAccessConfig::configChanged);
247​
240 // screen reader 248​ // screen reader
241 connect(ui.screenReaderEnabled, &QCheckBox::clicked, this, &KAccessConfig::configChanged); 249​ connect(ui.screenReaderEnabled, &QCheckBox::clicked, this, &KAccessConfig::configChanged);
242 connect(ui.launchOrcaConfiguration, &QPushButton::clicked, this, &KAccessConfig::launchOrcaConfiguration); 250​ connect(ui.launchOrcaConfiguration, &QPushButton::clicked, this, &KAccessConfig::launchOrcaConfiguration);
243} 251​}
244 252​
245 253​
246KAccessConfig::~KAccessConfig() 254​KAccessConfig::~KAccessConfig()
247{ 255​{
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Line(s)306{
331 ui.gestures->setChecked(keyboardGroup.readEntry("Gestures", false)); 339​ ui.gestures->setChecked(keyboardGroup.readEntry("Gestures", false));
332 ui.timeout->setChecked(keyboardGroup.readEntry("AccessXTimeout", false)); 340​ ui.timeout->setChecked(keyboardGroup.readEntry("AccessXTimeout", false));
333 ui.timeoutDelay->setValue(keyboardGroup.readEntry("AccessXTimeoutDelay", 30)); 341​ ui.timeoutDelay->setValue(keyboardGroup.readEntry("AccessXTimeoutDelay", 30));
334 342​
335 ui.accessxBeep->setChecked(keyboardGroup.readEntry("AccessXBeep", true)); 343​ ui.accessxBeep->setChecked(keyboardGroup.readEntry("AccessXBeep", true));
336 ui.gestureConfirmation->setChecked(keyboardGroup.readEntry("GestureConfirmation", false)); 344​ ui.gestureConfirmation->setChecked(keyboardGroup.readEntry("GestureConfirmation", false));
337 ui.kNotifyAccess->setChecked(keyboardGroup.readEntry("kNotifyAccess", false)); 345​ ui.kNotifyAccess->setChecked(keyboardGroup.readEntry("kNotifyAccess", false));
338 346​
347​ KConfigGroup mouseGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "Mouse");
348​ ui.mouseKeys->setChecked(mouseGroup.readEntry("MouseKeys", false));
349​ ui.mk_delay->setValue(mouseGroup.readEntry("MKDelay", 160));
350​
351​ const int interval = mouseGroup.readEntry("MKInterval", 5);
352​ ui.mk_interval->setValue(interval);
353​
354​ // Default time to reach maximum speed: 5000 msec
355​ int time_to_max = mouseGroup.readEntry("MKTimeToMax", (5000+interval/2)/interval);
356​ time_to_max = mouseGroup.readEntry("MK-TimeToMax", time_to_max*interval);
357​ ui.mk_time_to_max->setValue(time_to_max);
358​
359​ // Default maximum speed: 1000 pixels/sec
360​ // (The old default maximum speed from KDE <= 3.4
361​ // (100000 pixels/sec) was way too fast)
362​ long max_speed = mouseGroup.readEntry("MKMaxSpeed", interval);
363​ max_speed = max_speed * 1000 / interval;
364​ if (max_speed > 2000) {
365​ max_speed = 2000;
366​ }
367​ max_speed = mouseGroup.readEntry("MK-MaxSpeed", int(max_speed));
368​ ui.mk_max_speed->setValue(max_speed);
369​
370​ ui.mk_curve->setValue(mouseGroup.readEntry("MKCurve", 0));
371​
339 KConfigGroup screenReaderGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "ScreenReader"); 372​ KConfigGroup screenReaderGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "ScreenReader");
340 ui.screenReaderEnabled->setChecked(screenReaderGroup.readEntry("Enabled", false)); 373​ ui.screenReaderEnabled->setChecked(screenReaderGroup.readEntry("Enabled", false));
341 374​
342 checkAccess(); 375​ checkAccess();
343 376​
344 emit changed(false); 377​ emit changed(false);
345} 378​}
346 379​
Show All 39 Lines382{
386 419​
387 keyboardGroup.writeEntry("AccessXBeep", ui.accessxBeep->isChecked()); 420​ keyboardGroup.writeEntry("AccessXBeep", ui.accessxBeep->isChecked());
388 keyboardGroup.writeEntry("GestureConfirmation", ui.gestureConfirmation->isChecked()); 421​ keyboardGroup.writeEntry("GestureConfirmation", ui.gestureConfirmation->isChecked());
389 keyboardGroup.writeEntry("kNotifyAccess", ui.kNotifyAccess->isChecked()); 422​ keyboardGroup.writeEntry("kNotifyAccess", ui.kNotifyAccess->isChecked());
390 423​
391 424​
392 keyboardGroup.sync(); 425​ keyboardGroup.sync();
393 426​
427​ KConfigGroup mouseGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "Mouse");
428​ const int interval = ui.mk_interval->value();
429​ mouseGroup.writeEntry("MouseKeys", ui.mouseKeys->isChecked());
430​ mouseGroup.writeEntry("MKDelay", ui.mk_delay->value());
431​ mouseGroup.writeEntry("MKInterval", interval);
432​ mouseGroup.writeEntry("MK-TimeToMax", ui.mk_time_to_max->value());
433​ mouseGroup.writeEntry("MKTimeToMax", (ui.mk_time_to_max->value() + interval/2)/interval);
434​ mouseGroup.writeEntry("MK-MaxSpeed", ui.mk_max_speed->value());
435​ mouseGroup.writeEntry("MKMaxSpeed", (ui.mk_max_speed->value()*interval + 500)/1000);
436​ mouseGroup.writeEntry("MKCurve", ui.mk_curve->value());
437​ mouseGroup.sync();
438​
394 KConfigGroup screenReaderGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "ScreenReader"); 439​ KConfigGroup screenReaderGroup(KSharedConfig::openConfig(QStringLiteral("kaccessrc")), "ScreenReader");
395 screenReaderGroup.writeEntry("Enabled", ui.screenReaderEnabled->isChecked()); 440​ screenReaderGroup.writeEntry("Enabled", ui.screenReaderEnabled->isChecked());
396 441​
397 if (ui.systemBell->isChecked() || 442​ if (ui.systemBell->isChecked() ||
398 ui.customBell->isChecked() || 443​ ui.customBell->isChecked() ||
399 ui.visibleBell->isChecked()) { 444​ ui.visibleBell->isChecked()) {
400 KConfig _cfg(QStringLiteral("kdeglobals"), KConfig::NoGlobals); 445​ KConfig _cfg(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
401 KConfigGroup cfg(&_cfg, "General"); 446​ KConfigGroup cfg(&_cfg, "General");
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s)461{
445 ui.gestures->setChecked(false); 490​ ui.gestures->setChecked(false);
446 ui.timeout->setChecked(false); 491​ ui.timeout->setChecked(false);
447 ui.timeoutDelay->setValue(30); 492​ ui.timeoutDelay->setValue(30);
448 493​
449 ui.accessxBeep->setChecked(true); 494​ ui.accessxBeep->setChecked(true);
450 ui.gestureConfirmation->setChecked(true); 495​ ui.gestureConfirmation->setChecked(true);
451 ui.kNotifyAccess->setChecked(false); 496​ ui.kNotifyAccess->setChecked(false);
452 497​
498​ ui.mouseKeys->setChecked(false);
499​ ui.mk_delay->setValue(160);
500​ ui.mk_interval->setValue(5);
501​ ui.mk_time_to_max->setValue(5000);
502​ ui.mk_max_speed->setValue(1000);
503​ ui.mk_curve->setValue(0);
504​
453 ui.screenReaderEnabled->setChecked(false); 505​ ui.screenReaderEnabled->setChecked(false);
454 506​
455 checkAccess(); 507​ checkAccess();
456 508​
457 emit changed(true); 509​ emit changed(true);
458} 510​}
459 511​
460 512​
▲ Show 20 Lines • Show All 57 Lines • Show Last 20 Lines