summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornatural <natural>2007-01-01 13:27:01 +0000
committernatural <natural>2007-01-01 13:27:01 +0000
commit3348c3e49865c5e6a32073e85a6d7a1574cac244 (patch)
tree615debaf4493b1b65628c376d66949a403ff5128
parent8100c625e1a8d63b3fc434d08dbffb5652a59e69 (diff)
downloadkberylsettings-3348c3e49865c5e6a32073e85a6d7a1574cac244.tar.gz
kberylsettings-3348c3e49865c5e6a32073e85a6d7a1574cac244.tar.bz2
Change to KShortcutDialog handling to pickup keypad key presses.
Fixed bug in key capture parsing to correctly replace Ctrl with Control. Fixed bug in default-value button to correctly set previous value for Reset button.
-rw-r--r--kberylsettings/settingwidget.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/kberylsettings/settingwidget.py b/kberylsettings/settingwidget.py
index 570bd9c..be641ea 100644
--- a/kberylsettings/settingwidget.py
+++ b/kberylsettings/settingwidget.py
@@ -138,8 +138,8 @@ class SettingWidget(QFrame):
"""
current = self.value()
self.initial = self.setting.ResetToDefault()
- self.setting.set(current)
self.reset()
+ self.setting.set(current)
self.initial = current
def cbText(self, widget):
@@ -905,7 +905,7 @@ class Binding(SettingWidget):
"""
skey = str(key.toString())
skey = skey.replace('Win', 'Super')
- skey = skey.replace('Ctl', 'Control')
+ skey = skey.replace('Ctrl', 'Control')
skey = skey.split('+')
if len(skey) == 1:
skey = skey[0]
@@ -1002,8 +1002,8 @@ class GrabKeyButton(KKeyButton):
@return None
"""
- dlg = KShortcutDialog(self.shortcut(), True, self)
- dlg.showButton(KShortcutDialog.Details, False)
+ dlg = KShortcutDialog(self.shortcut(), False, self)
+ dlg.showButton(KShortcutDialog.Details, False)
res = dlg.exec_loop()
if res == KShortcutDialog.Accepted:
self.emit(Signals.capturedShortcut, (dlg.shortcut(), ))