diff options
Diffstat (limited to 'kxkb/kcmmisc.cpp')
| -rw-r--r-- | kxkb/kcmmisc.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 358d10450..0fb62a466 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -42,12 +42,13 @@ #include <knuminput.h> #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <kdialog.h> #include "kcmmisc.h" #include "kcmmiscwidget.h" +#include "x11helper.h" #include <X11/Xlib.h> KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *) @@ -60,25 +61,27 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *) lay->addStretch(); ui->click->setRange(0, 100, 10); - ui->delay->setRange(100, 5000, 50, false); + ui->delay->setRange(0, 5000, 10, false); ui->rate->setRange(5, 50, 5, false); - ui->delaySlider->setRange(1000, 50000); + // Values multiplied by 10 compated to the integer input field + ui->delaySlider->setRange(0, 50000); ui->delaySlider->setSteps(50, 500); ui->delaySlider->setTickInterval(2500); + // Values multiplied by 100 compated to the integer input field ui->rateSlider->setRange(500, 5000); - ui->rateSlider->setSteps(50, 500); + ui->rateSlider->setSteps(100, 500); ui->rateSlider->setTickInterval(500); - connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int))); - connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int))); - connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double))); - connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int))); + connect(ui->repeatBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(ui->delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySpinboxChanged(int))); + connect(ui->delaySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySliderChanged(int))); + connect(ui->rate, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(rateSpinboxChanged(double))); + connect(ui->rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateSliderChanged(int))); - connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed())); + connect(ui->click, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(ui->numlockGroup, TQ_SIGNAL(released(int)), this, TQ_SLOT(changed())); #if !defined(HAVE_XTEST) && !defined(HAVE_XKB) ui->numlockGroup->setDisabled( true ); @@ -126,7 +129,7 @@ void KeyboardConfig::load() XKeyboardState kbd; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); config.setGroup("Keyboard"); bool key = config.readBoolEntry("KeyboardRepeating", true); @@ -153,7 +156,7 @@ void KeyboardConfig::save() kbd.key_click_percent = clickVolume; kbd.auto_repeat_mode = keyboardRepeat; - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBKeyClickPercent | KBAutoRepeatMode, &kbd); if( keyboardRepeat ) { @@ -535,12 +538,12 @@ void KeyboardConfig::init_keyboard() XKeyboardState kbd; XKeyboardControl kbdc; - XGetKeyboardControl(kapp->getDisplay(), &kbd); + XGetKeyboardControl(tdeApp->getDisplay(), &kbd); bool key = config->readBoolEntry("KeyboardRepeating", true); kbdc.key_click_percent = config->readNumEntry("ClickVolume", kbd.key_click_percent); kbdc.auto_repeat_mode = (key ? AutoRepeatModeOn : AutoRepeatModeOff); - XChangeKeyboardControl(kapp->getDisplay(), + XChangeKeyboardControl(tdeApp->getDisplay(), KBKeyClickPercent | KBAutoRepeatMode, &kbdc); |