Mercurial Repositories > eric / changeset
changeset
Fixed an issue causing deleted alternate keyboard shortcuts not being reloaded correctly.
Thu, 19 Jun 2014 10:00:53 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 19 Jun 2014 10:00:53 +0200
- branch
- 5_4_x
- changeset 3643
- a60d2ee42402
- parent 3641
- 8cfe4af1af36
- child 3645
- 79b58173f803
Fixed an issue causing deleted alternate keyboard shortcuts not being reloaded correctly.
(grafted from 1a6f8d9b63a536611bd0f52cca5d5eb885c9e5fc)
| Preferences/Shortcuts.py | file | annotate | diff | comparison | revisions | |
| QScintilla/MiniEditor.py | file | annotate | diff | comparison | revisions |
--- a/Preferences/Shortcuts.py Tue Jun 17 21:09:24 2014 +0200 +++ b/Preferences/Shortcuts.py Thu Jun 19 10:00:53 2014 +0200 @@ -32,7 +32,7 @@ accel = prefClass.settings.value( "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName())) if accel is not None: - act.setAlternateShortcut(QKeySequence(accel)) + act.setAlternateShortcut(QKeySequence(accel), removeEmpty=True) def readShortcuts(prefClass=Prefs, helpViewer=None, pluginName=None): @@ -253,7 +253,8 @@ try: accel, altAccel = sdict[act.objectName()] act.setShortcut(QKeySequence(accel)) - act.setAlternateShortcut(QKeySequence(altAccel)) + act.setAlternateShortcut(QKeySequence(altAccel), + removeEmpty=True) except KeyError: pass
--- a/QScintilla/MiniEditor.py Tue Jun 17 21:09:24 2014 +0200 +++ b/QScintilla/MiniEditor.py Thu Jun 19 10:00:53 2014 +0200 @@ -332,7 +332,7 @@ "Shortcuts/{0}/{1}/AltAccel".format( category, act.objectName())) if accel is not None: - act.setAlternateShortcut(QKeySequence(accel)) + act.setAlternateShortcut(QKeySequence(accel), removeEmpty=True) def __createActions(self): """
