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

List:       kde-commits
Subject:    [kde-workspace/amourphious/porting5] kcontrol/keyboard: setTristate implemented testing done
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-02-24 11:53:10
Message-ID: E1WHu5u-0005EY-E6 () scm ! kde ! org
[Download RAW message or body]

Git commit e52ca3213e6aa3514fbda116551c6b15d6002885 by shivam makkar.
Committed on 24/02/2014 at 11:52.
Pushed by makkar into branch 'amourphious/porting5'.

setTristate implemented testing done

M  +18   -1    kcontrol/keyboard/kcmmisc.cpp

http://commits.kde.org/kde-workspace/e52ca3213e6aa3514fbda116551c6b15d6002885

diff --git a/kcontrol/keyboard/kcmmisc.cpp b/kcontrol/keyboard/kcmmisc.cpp
index 5a7211e..d14ac2e 100644
--- a/kcontrol/keyboard/kcmmisc.cpp
+++ b/kcontrol/keyboard/kcmmisc.cpp
@@ -32,6 +32,7 @@
 #include <QCheckBox>
 #include <QWhatsThis>
 #include <QX11Info>
+#include <QDebug>
 
 #include <klocale.h>
 #include <kconfig.h>
@@ -63,6 +64,16 @@ KCMiscKeyboardWidget::KCMiscKeyboardWidget(QWidget *parent)
   ui.rateSlider->setPageStep(500);
   ui.rateSlider->setTickInterval(498);
 
+  QList <QAbstractButton*> btns = ui.kbRepButtonGroup->buttons();
+  for(int i = 0; i < btns.size(); i++){
+      ui.kbRepButtonGroup->setId(btns[i], i);
+  }
+
+  btns = ui.numButtonGroup->buttons();
+  for(int i = 0; i < btns.size(); i++){
+      ui.numButtonGroup->setId(btns[i], i);
+  }
+
   connect(ui.kbRepButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(changed()));
   connect(ui.kbRepButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(keyboardRepeatStateChanged(int)));
   connect(ui.delay, SIGNAL(valueChanged(int)), this, SLOT(delaySpinboxChanged(int)));
@@ -117,9 +128,14 @@ TriState TriStateHelper::getTriState(const QButtonGroup* group)
 
 void TriStateHelper::setTriState(QButtonGroup* group, TriState state)
 {
-    /*needs to be done*/
+    QAbstractButton* checked = group->button(getInt(state));
+    if(checked){
+        checked->setChecked(true);
+        //qDebug()<<"button: "<<checked->text();
+    }
 }
 
+
 void KCMiscKeyboardWidget::load()
 {
   KConfigGroup config(KSharedConfig::openConfig("kcminputrc", KConfig::NoGlobals), "Keyboard");
@@ -168,6 +184,7 @@ void KCMiscKeyboardWidget::save()
   keyboardRepeat = TriStateHelper::getTriState(ui.kbRepButtonGroup);
   numlockState = TriStateHelper::getTriState(ui.numButtonGroup);
 
+  //qDebug()<<"kb: "<<keyboardRepeat<<" nmlck: "<<numlockState;
   config.writeEntry("ClickVolume",clickVolume);
   config.writeEntry("KeyboardRepeating", TriStateHelper::getInt(keyboardRepeat));
   config.writeEntry("RepeatRate", ui.rate->value() );
[prev in list] [next in list] [prev in thread] [next in thread]