[beryl-commits] r2219 - branches/kberylsettings/kberylsettings

[natural at server.beryl-project.org]

Author: natural
Date: 2007-01-01 13:27:01 +0000 (Mon, 01 Jan 2007)
New Revision: 2219

Modified:
   branches/kberylsettings/kberylsettings/settingwidget.py
Log:
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.



Modified: branches/kberylsettings/kberylsettings/settingwidget.py
===================================================================
--- branches/kberylsettings/kberylsettings/settingwidget.py	2007-01-01 13:26:40 UTC (rev 2218)
+++ branches/kberylsettings/kberylsettings/settingwidget.py	2007-01-01 13:27:01 UTC (rev 2219)
@@ -138,8 +138,8 @@
         """
         current = self.value()
         self.initial = self.setting.ResetToDefault()
+        self.reset()
         self.setting.set(current)
-        self.reset()
         self.initial = current
 
     def cbText(self, widget):
@@ -905,7 +905,7 @@
         """
         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 @@
 
         @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(), ))