diff options
Diffstat (limited to 'kcontrol')
-rw-r--r-- | kcontrol/access/kcmaccess.cpp | 8 | ||||
-rw-r--r-- | kcontrol/keys/kde4.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/keys/main.cpp | 1 | ||||
-rw-r--r-- | kcontrol/keys/shortcuts.cpp | 1 | ||||
-rw-r--r-- | kcontrol/keys/trinity.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/keys/unix3.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/keys/win3.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/keys/win4.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/keys/wm3.kksrc | 6 | ||||
-rw-r--r-- | kcontrol/style/kcmstyle.cpp | 2 |
10 files changed, 31 insertions, 17 deletions
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 374bec295..e8c41accc 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -320,7 +320,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); durationSlider = new ExtendedIntNumInput(grp); - durationSlider->setRange(100, 2000, 100); + durationSlider->setRange(10, 2000, 10); durationSlider->setLabel(i18n("Duration:")); durationSlider->setSuffix(i18n(" msec")); hbox->addWidget(durationSlider); @@ -424,7 +424,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); slowKeysDelay = new ExtendedIntNumInput(grp); slowKeysDelay->setSuffix(i18n(" msec")); - slowKeysDelay->setRange(50, 10000, 100); + slowKeysDelay->setRange(10, 10000, 10); slowKeysDelay->setLabel(i18n("Acceptance dela&y:")); hbox->addWidget(slowKeysDelay); @@ -456,7 +456,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); bounceKeysDelay = new ExtendedIntNumInput(grp); bounceKeysDelay->setSuffix(i18n(" msec")); - bounceKeysDelay->setRange(100, 5000, 100); + bounceKeysDelay->setRange(10, 5000, 10); bounceKeysDelay->setLabel(i18n("D&ebounce time:")); hbox->addWidget(bounceKeysDelay); @@ -513,7 +513,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addSpacing(24); timeoutDelay = new KIntNumInput(grp); timeoutDelay->setSuffix(i18n(" min")); - timeoutDelay->setRange(1, 30, 4); + timeoutDelay->setRange(1, 30, 1); timeoutDelay->setLabel(i18n("Timeout:")); hbox->addWidget(timeoutDelay); diff --git a/kcontrol/keys/kde4.kksrc b/kcontrol/keys/kde4.kksrc index 367bc41d6..a35eaafbd 100644 --- a/kcontrol/keys/kde4.kksrc +++ b/kcontrol/keys/kde4.kksrc @@ -75,8 +75,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Win+Ctrl+Delete Lock Session=Win+ScrollLock -Logout=Win+Escape -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Win+Escape +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Win+Ctrl+R Mouse Emulation=none Popup Launch Menu=Win+Menu @@ -85,6 +86,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=Win+Ctrl+V Show Taskmanager=Win+Ctrl+Pause Show Window List=Win+0 +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index bba777adb..db7416c28 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -26,6 +26,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <ksimpleconfig.h> +#include <dcopref.h> #include "commandShortcuts.h" #include "main.h" diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 18f6803ab..4fb58a9b5 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -41,6 +41,7 @@ #include <tdeshortcutlist.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> +#include <dcopref.h> ShortcutsModule::ShortcutsModule( TQWidget *parent, const char *name ) : TQWidget( parent, name ) diff --git a/kcontrol/keys/trinity.kksrc b/kcontrol/keys/trinity.kksrc index 57681b60f..2339b9186 100644 --- a/kcontrol/keys/trinity.kksrc +++ b/kcontrol/keys/trinity.kksrc @@ -75,8 +75,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+Ctrl+Escape Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -86,6 +87,7 @@ Show Klipper Popup-Menu=Alt+Ctrl+V Show Taskmanager=Ctrl+Escape Show Window List=Alt+F5 Start Screen Saver=Alt+Ctrl+S +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/unix3.kksrc b/kcontrol/keys/unix3.kksrc index 8ac722ec6..de091abc7 100644 --- a/kcontrol/keys/unix3.kksrc +++ b/kcontrol/keys/unix3.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+F9 Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Ctrl+Escape Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/win3.kksrc b/kcontrol/keys/win3.kksrc index 926f83670..a7ae3adbc 100644 --- a/kcontrol/keys/win3.kksrc +++ b/kcontrol/keys/win3.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=none Lock Session=none -Logout=none -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=none +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=none Mouse Emulation=none Popup Launch Menu=Ctrl+Escape @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Alt+Ctrl+Delete Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/win4.kksrc b/kcontrol/keys/win4.kksrc index 1abb69313..3c53ecd25 100644 --- a/kcontrol/keys/win4.kksrc +++ b/kcontrol/keys/win4.kksrc @@ -81,8 +81,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=none Lock Session=none -Logout=none -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=none +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=none Mouse Emulation=none Popup Launch Menu=Ctrl+Escape @@ -91,6 +92,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=none Show Taskmanager=Alt+Ctrl+Delete Show Window List=none +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/keys/wm3.kksrc b/kcontrol/keys/wm3.kksrc index 6c6ef61e5..70abfbf94 100644 --- a/kcontrol/keys/wm3.kksrc +++ b/kcontrol/keys/wm3.kksrc @@ -71,8 +71,9 @@ Halt Computer=none Halt without Confirmation=none Kill Window=Alt+Ctrl+Escape Lock Session=Alt+Ctrl+L -Logout=Alt+Ctrl+Delete -Logout without Confirmation=none +Lock Session (Hotkey)=XF86ScreenSaver +Log Out=Alt+Ctrl+Delete +Log Out Without Confirmation=none Manually Invoke Action on Current Clipboard=Alt+Ctrl+R Mouse Emulation=Alt+F12 Popup Launch Menu=Alt+F1 @@ -81,6 +82,7 @@ Reboot without Confirmation=none Show Klipper Popup-Menu=Alt+Ctrl+V Show Taskmanager=Ctrl+Escape Show Window List=Alt+F5 +Suspend=XF86Sleep Switch One Desktop Down=none Switch One Desktop to the Left=none Switch One Desktop to the Right=none diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 9dd53616c..53f4fe048 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -197,7 +197,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) m_popupMenuDelay = new KIntNumInput(250, gbWidgetStyle); m_popupMenuDelay->setLabel(i18n("Menu popup delay:")); - m_popupMenuDelay->setRange(0, 5000, 50); + m_popupMenuDelay->setRange(0, 5000, 10); m_popupMenuDelay->setSuffix(i18n(" msec")); m_popupMenuDelay->setSteps(50, 50); gbWidgetStyleLayout->addWidget(m_popupMenuDelay); |