Mercurial Repositories > eric / file diff

diff -r 52e8c820d0dd -r c679fb30c8f3 Preferences/Shortcuts.py
--- a/Preferences/Shortcuts.py	Mon Dec 28 18:31:37 2009 +0000
+++ b/Preferences/Shortcuts.py	Wed Dec 30 15:40:33 2009 +0000
@@ -33,12 +33,12 @@
     if act.objectName():
         accel = prefClass.settings.value(
             "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()))
-        if accel.isValid():
-            act.setShortcut(QKeySequence(accel.toString()))
+        if accel is not None:
+            act.setShortcut(QKeySequence(accel))
         accel = prefClass.settings.value(
             "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()))
-        if accel.isValid():
-            act.setAlternateShortcut(QKeySequence(accel.toString()))
+        if accel is not None:
+            act.setAlternateShortcut(QKeySequence(accel))
 
 def readShortcuts(prefClass = Prefs, helpViewer = None, pluginName = None):
     """
@@ -119,10 +119,10 @@
     if act.objectName():
         prefClass.settings.setValue(
             "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()), 
-            QVariant(act.shortcut()))
+            act.shortcut())
         prefClass.settings.setValue(
             "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()), 
-            QVariant(act.alternateShortcut()))
+            act.alternateShortcut())
 
 def saveShortcuts(prefClass = Prefs):
     """