[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/access
From:       Laurent Montel <montel () kde ! org>
Date:       2007-10-17 7:02:20
Message-ID: 1192604540.921884.32016.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 726197 by mlaurent:

Deprecated--


 M  +33 -34    kaccess.cpp  
 M  +43 -44    kcmaccess.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/access/kaccess.cpp #726196:726197
@@ -147,9 +147,8 @@
     XkbChangeEnabledControls(QX11Info::display(), XkbUseCoreKbd, XkbAudibleBellMask, \
XkbAudibleBellMask);  
   // keyboard -------------------------------------------------------------
+  KConfigGroup keyboardGroup(_config,"Keyboard");
 
-  cg.changeGroup("Keyboard");
-
   // get keyboard state
   XkbDescPtr xkb = XkbGetMap(QX11Info::display(), 0, XkbUseCoreKbd);
   if (!xkb)
@@ -158,17 +157,17 @@
     return;
 
   // sticky keys
-  if (cg.readEntry("StickyKeys", false))
+  if (keyboardGroup.readEntry("StickyKeys", false))
     {
-      if (cg.readEntry("StickyKeysLatch", true))
+      if (keyboardGroup.readEntry("StickyKeysLatch", true))
         xkb->ctrls->ax_options |= XkbAX_LatchToLockMask;
       else
         xkb->ctrls->ax_options &= ~XkbAX_LatchToLockMask;
-      if (cg.readEntry("StickyKeysAutoOff", false))
+      if (keyboardGroup.readEntry("StickyKeysAutoOff", false))
          xkb->ctrls->ax_options |= XkbAX_TwoKeysMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask;
-      if (cg.readEntry("StickyKeysBeep", false))
+      if (keyboardGroup.readEntry("StickyKeysBeep", false))
          xkb->ctrls->ax_options |= XkbAX_StickyKeysFBMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_StickyKeysFBMask;
@@ -178,22 +177,22 @@
     xkb->ctrls->enabled_ctrls &= ~XkbStickyKeysMask;
 
   // toggle keys
-  if (cg.readEntry("ToggleKeysBeep", false))
+  if (keyboardGroup.readEntry("ToggleKeysBeep", false))
      xkb->ctrls->ax_options |= XkbAX_IndicatorFBMask;
   else
      xkb->ctrls->ax_options &= ~XkbAX_IndicatorFBMask;
 
   // slow keys
-  if (cg.readEntry("SlowKeys", false)) {
-      if (cg.readEntry("SlowKeysPressBeep", false))
+  if (keyboardGroup.readEntry("SlowKeys", false)) {
+      if (keyboardGroup.readEntry("SlowKeysPressBeep", false))
          xkb->ctrls->ax_options |= XkbAX_SKPressFBMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_SKPressFBMask;
-      if (cg.readEntry("SlowKeysAcceptBeep", false))
+      if (keyboardGroup.readEntry("SlowKeysAcceptBeep", false))
          xkb->ctrls->ax_options |= XkbAX_SKAcceptFBMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_SKAcceptFBMask;
-      if (cg.readEntry("SlowKeysRejectBeep", false))
+      if (keyboardGroup.readEntry("SlowKeysRejectBeep", false))
          xkb->ctrls->ax_options |= XkbAX_SKRejectFBMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_SKRejectFBMask;
@@ -201,11 +200,11 @@
     }
   else
       xkb->ctrls->enabled_ctrls &= ~XkbSlowKeysMask;
-  xkb->ctrls->slow_keys_delay = cg.readEntry("SlowKeysDelay", 500);
+  xkb->ctrls->slow_keys_delay = keyboardGroup.readEntry("SlowKeysDelay", 500);
 
   // bounce keys
-  if (cg.readEntry("BounceKeys", false)) {
-      if (cg.readEntry("BounceKeysRejectBeep", false))
+  if (keyboardGroup.readEntry("BounceKeys", false)) {
+      if (keyboardGroup.readEntry("BounceKeysRejectBeep", false))
          xkb->ctrls->ax_options |= XkbAX_BKRejectFBMask;
       else
          xkb->ctrls->ax_options &= ~XkbAX_BKRejectFBMask;
@@ -213,19 +212,19 @@
     }
   else
       xkb->ctrls->enabled_ctrls &= ~XkbBounceKeysMask;
-  xkb->ctrls->debounce_delay = cg.readEntry("BounceKeysDelay", 500);
+  xkb->ctrls->debounce_delay = keyboardGroup.readEntry("BounceKeysDelay", 500);
 
   // gestures for enabling the other features
-  _gestures = cg.readEntry("Gestures", true);
+  _gestures = keyboardGroup.readEntry("Gestures", true);
   if (_gestures)
       xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask;
   else
       xkb->ctrls->enabled_ctrls &= ~XkbAccessXKeysMask;
 
   // timeout
-  if (cg.readEntry("AccessXTimeout", false))
+  if (keyboardGroup.readEntry("AccessXTimeout", false))
     {
-      xkb->ctrls->ax_timeout = cg.readEntry("AccessXTimeoutDelay", 30)*60;
+      xkb->ctrls->ax_timeout = keyboardGroup.readEntry("AccessXTimeoutDelay", \
30)*60;  xkb->ctrls->axt_opts_mask = 0;
       xkb->ctrls->axt_opts_values = 0;
       xkb->ctrls->axt_ctrls_mask = XkbStickyKeysMask | XkbSlowKeysMask;
@@ -236,39 +235,39 @@
     xkb->ctrls->enabled_ctrls &= ~XkbAccessXTimeoutMask;
 
   // gestures for enabling the other features
-  if (cg.readEntry("AccessXBeep", true))
+  if (keyboardGroup.readEntry("AccessXBeep", true))
      xkb->ctrls->ax_options |= XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask;
   else
      xkb->ctrls->ax_options &= ~(XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
 
-  _gestureConfirmation = cg.readEntry("GestureConfirmation", true);
+  _gestureConfirmation = keyboardGroup.readEntry("GestureConfirmation", true);
 
-  _kNotifyModifiers = cg.readEntry("kNotifyModifiers", false);
-  _kNotifyAccessX = cg.readEntry("kNotifyAccessX", false);
+  _kNotifyModifiers = keyboardGroup.readEntry("kNotifyModifiers", false);
+  _kNotifyAccessX = keyboardGroup.readEntry("kNotifyAccessX", false);
 
   // mouse-by-keyboard ----------------------------------------------
 
-  cg.changeGroup("Mouse");
+  KConfigGroup mouseGroup(_config,"Mouse");
 
-  if (cg.readEntry("MouseKeys", false))
+  if (mouseGroup.readEntry("MouseKeys", false))
     {
-      xkb->ctrls->mk_delay = cg.readEntry("MKDelay", 160);
+      xkb->ctrls->mk_delay = mouseGroup.readEntry("MKDelay", 160);
 
       // Default for initial velocity: 200 pixels/sec
-      int interval = cg.readEntry("MKInterval", 5);
+      int interval = mouseGroup.readEntry("MKInterval", 5);
       xkb->ctrls->mk_interval = interval;
 
       // Default time to reach maximum speed: 5000 msec
-      xkb->ctrls->mk_time_to_max = cg.readEntry("MKTimeToMax",
+      xkb->ctrls->mk_time_to_max = mouseGroup.readEntry("MKTimeToMax",
                                              (5000+interval/2)/interval);
 
       // Default maximum speed: 1000 pixels/sec
       //     (The old default maximum speed from KDE <= 3.4
       //     (100000 pixels/sec) was way too fast)
-      xkb->ctrls->mk_max_speed = cg.readEntry("MKMaxSpeed", interval);
+      xkb->ctrls->mk_max_speed = mouseGroup.readEntry("MKMaxSpeed", interval);
 
-      xkb->ctrls->mk_curve = cg.readEntry("MKCurve", 0);
-      xkb->ctrls->mk_dflt_btn = cg.readEntry("MKDefaultButton", 0);
+      xkb->ctrls->mk_curve = mouseGroup.readEntry("MKCurve", 0);
+      xkb->ctrls->mk_dflt_btn = mouseGroup.readEntry("MKDefaultButton", 0);
 
       xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask;
     }
@@ -828,13 +827,13 @@
    else if (disabled & XkbStickyKeysMask)
       config.writeEntry("StickyKeys", false);
 
-   config.changeGroup("Mouse");
+   KConfigGroup mousegrp(KGlobal::config(),"Mouse");
 
    if (enabled & XkbMouseKeysMask)
-      config.writeEntry("MouseKeys", true);
+      mousegrp.writeEntry("MouseKeys", true);
    else if (disabled & XkbMouseKeysMask)
-      config.writeEntry("MouseKeys", false);
-
+      mousegrp.writeEntry("MouseKeys", false);
+   mousegrp.sync();
    config.sync();
 }
 
--- trunk/KDE/kdebase/workspace/kcontrol/access/kcmaccess.cpp #726196:726197
@@ -673,34 +673,33 @@
 
   durationSlider->setValue(cg.readEntry("VisibleBellPause", 500));
 
+  KConfigGroup keyboardGroup(KSharedConfig::openConfig("kaccessrc"),"Keyboard");
 
-  cg.changeGroup("Keyboard");
+  stickyKeys->setChecked(keyboardGroup.readEntry("StickyKeys", false));
+  stickyKeysLock->setChecked(keyboardGroup.readEntry("StickyKeysLatch", true));
+  stickyKeysAutoOff->setChecked(keyboardGroup.readEntry("StickyKeysAutoOff", \
false)); +  stickyKeysBeep->setChecked(keyboardGroup.readEntry("StickyKeysBeep", \
true)); +  toggleKeysBeep->setChecked(keyboardGroup.readEntry("ToggleKeysBeep", \
false)); +  kNotifyModifiers->setChecked(keyboardGroup.readEntry("kNotifyModifiers", \
false));  
-  stickyKeys->setChecked(cg.readEntry("StickyKeys", false));
-  stickyKeysLock->setChecked(cg.readEntry("StickyKeysLatch", true));
-  stickyKeysAutoOff->setChecked(cg.readEntry("StickyKeysAutoOff", false));
-  stickyKeysBeep->setChecked(cg.readEntry("StickyKeysBeep", true));
-  toggleKeysBeep->setChecked(cg.readEntry("ToggleKeysBeep", false));
-  kNotifyModifiers->setChecked(cg.readEntry("kNotifyModifiers", false));
+  slowKeys->setChecked(keyboardGroup.readEntry("SlowKeys", false));
+  slowKeysDelay->setValue(keyboardGroup.readEntry("SlowKeysDelay", 500));
+  slowKeysPressBeep->setChecked(keyboardGroup.readEntry("SlowKeysPressBeep", true));
+  slowKeysAcceptBeep->setChecked(keyboardGroup.readEntry("SlowKeysAcceptBeep", \
true)); +  slowKeysRejectBeep->setChecked(keyboardGroup.readEntry("SlowKeysRejectBeep", \
true));  
-  slowKeys->setChecked(cg.readEntry("SlowKeys", false));
-  slowKeysDelay->setValue(cg.readEntry("SlowKeysDelay", 500));
-  slowKeysPressBeep->setChecked(cg.readEntry("SlowKeysPressBeep", true));
-  slowKeysAcceptBeep->setChecked(cg.readEntry("SlowKeysAcceptBeep", true));
-  slowKeysRejectBeep->setChecked(cg.readEntry("SlowKeysRejectBeep", true));
+  bounceKeys->setChecked(keyboardGroup.readEntry("BounceKeys", false));
+  bounceKeysDelay->setValue(keyboardGroup.readEntry("BounceKeysDelay", 500));
+  bounceKeysRejectBeep->setChecked(keyboardGroup.readEntry("BounceKeysRejectBeep", \
true));  
-  bounceKeys->setChecked(cg.readEntry("BounceKeys", false));
-  bounceKeysDelay->setValue(cg.readEntry("BounceKeysDelay", 500));
-  bounceKeysRejectBeep->setChecked(cg.readEntry("BounceKeysRejectBeep", true));
+  gestures->setChecked(keyboardGroup.readEntry("Gestures", true));
+  timeout->setChecked(keyboardGroup.readEntry("AccessXTimeout", false));
+  timeoutDelay->setValue(keyboardGroup.readEntry("AccessXTimeoutDelay", 30));
 
-  gestures->setChecked(cg.readEntry("Gestures", true));
-  timeout->setChecked(cg.readEntry("AccessXTimeout", false));
-  timeoutDelay->setValue(cg.readEntry("AccessXTimeoutDelay", 30));
+  accessxBeep->setChecked(keyboardGroup.readEntry("AccessXBeep", true));
+  gestureConfirmation->setChecked(keyboardGroup.readEntry("GestureConfirmation", \
false)); +  kNotifyAccessX->setChecked(keyboardGroup.readEntry("kNotifyAccessX", \
false));  
-  accessxBeep->setChecked(cg.readEntry("AccessXBeep", true));
-  gestureConfirmation->setChecked(cg.readEntry("GestureConfirmation", false));
-  kNotifyAccessX->setChecked(cg.readEntry("kNotifyAccessX", false));
-
   checkAccess();
 
   emit changed(false);
@@ -721,37 +720,37 @@
 
   cg.writeEntry("VisibleBellPause", durationSlider->value());
 
+  KConfigGroup keyboardGroup(KSharedConfig::openConfig("kaccessrc"),"Keyboard");
 
-  cg.changeGroup("Keyboard");
+  keyboardGroup.writeEntry("StickyKeys", stickyKeys->isChecked());
+  keyboardGroup.writeEntry("StickyKeysLatch", stickyKeysLock->isChecked());
+  keyboardGroup.writeEntry("StickyKeysAutoOff", stickyKeysAutoOff->isChecked());
+  keyboardGroup.writeEntry("StickyKeysBeep", stickyKeysBeep->isChecked());
+  keyboardGroup.writeEntry("ToggleKeysBeep", toggleKeysBeep->isChecked());
+  keyboardGroup.writeEntry("kNotifyModifiers", kNotifyModifiers->isChecked());
 
-  cg.writeEntry("StickyKeys", stickyKeys->isChecked());
-  cg.writeEntry("StickyKeysLatch", stickyKeysLock->isChecked());
-  cg.writeEntry("StickyKeysAutoOff", stickyKeysAutoOff->isChecked());
-  cg.writeEntry("StickyKeysBeep", stickyKeysBeep->isChecked());
-  cg.writeEntry("ToggleKeysBeep", toggleKeysBeep->isChecked());
-  cg.writeEntry("kNotifyModifiers", kNotifyModifiers->isChecked());
+  keyboardGroup.writeEntry("SlowKeys", slowKeys->isChecked());
+  keyboardGroup.writeEntry("SlowKeysDelay", slowKeysDelay->value());
+  keyboardGroup.writeEntry("SlowKeysPressBeep", slowKeysPressBeep->isChecked());
+  keyboardGroup.writeEntry("SlowKeysAcceptBeep", slowKeysAcceptBeep->isChecked());
+  keyboardGroup.writeEntry("SlowKeysRejectBeep", slowKeysRejectBeep->isChecked());
 
-  cg.writeEntry("SlowKeys", slowKeys->isChecked());
-  cg.writeEntry("SlowKeysDelay", slowKeysDelay->value());
-  cg.writeEntry("SlowKeysPressBeep", slowKeysPressBeep->isChecked());
-  cg.writeEntry("SlowKeysAcceptBeep", slowKeysAcceptBeep->isChecked());
-  cg.writeEntry("SlowKeysRejectBeep", slowKeysRejectBeep->isChecked());
 
+  keyboardGroup.writeEntry("BounceKeys", bounceKeys->isChecked());
+  keyboardGroup.writeEntry("BounceKeysDelay", bounceKeysDelay->value());
+  keyboardGroup.writeEntry("BounceKeysRejectBeep", \
bounceKeysRejectBeep->isChecked());  
-  cg.writeEntry("BounceKeys", bounceKeys->isChecked());
-  cg.writeEntry("BounceKeysDelay", bounceKeysDelay->value());
-  cg.writeEntry("BounceKeysRejectBeep", bounceKeysRejectBeep->isChecked());
+  keyboardGroup.writeEntry("Gestures", gestures->isChecked());
+  keyboardGroup.writeEntry("AccessXTimeout", timeout->isChecked());
+  keyboardGroup.writeEntry("AccessXTimeoutDelay", timeoutDelay->value());
 
-  cg.writeEntry("Gestures", gestures->isChecked());
-  cg.writeEntry("AccessXTimeout", timeout->isChecked());
-  cg.writeEntry("AccessXTimeoutDelay", timeoutDelay->value());
+  keyboardGroup.writeEntry("AccessXBeep", accessxBeep->isChecked());
+  keyboardGroup.writeEntry("GestureConfirmation", gestureConfirmation->isChecked());
+  keyboardGroup.writeEntry("kNotifyAccessX", kNotifyAccessX->isChecked());
 
-  cg.writeEntry("AccessXBeep", accessxBeep->isChecked());
-  cg.writeEntry("GestureConfirmation", gestureConfirmation->isChecked());
-  cg.writeEntry("kNotifyAccessX", kNotifyAccessX->isChecked());
 
-
   cg.sync();
+  keyboardGroup.sync();
 
   if (systemBell->isChecked() ||
       customBell->isChecked() ||


[prev in list] [next in list] [prev in thread] [next in thread]