eric: comparison Preferences/Shortcuts.py

-:77189681b787
+:51eefa621de4
 # -*- coding: utf-8 -*-
-# Copyright (c) 2004 - 2018 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2004 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 """
 Module implementing functions dealing with keyboard shortcuts.
 """
 "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()))
 if accel is not None:
 act.setAlternateShortcut(QKeySequence(accel), removeEmpty=True)
-def readShortcuts(prefClass=Prefs, helpViewer=None, pluginName=None,
+def readShortcuts(prefClass=Prefs, helpViewer=None, pluginName=None):
-helpViewerCategory=""):
 """
 Module function to read the keyboard shortcuts for the defined QActions.
 @keyparam prefClass preferences class used as the storage area
 @keyparam helpViewer reference to the help window object
 @keyparam pluginName name of the plugin for which to load shortcuts
 (string)
-@keyparam helpViewerCategory name of the help viewer category (string)
 """
 if helpViewer is None and pluginName is None:
 for act in e5App().getObject("Project").getActions():
 __readShortcut(act, "Project", prefClass)
 actions = ref.getActions()
 for act in actions:
 __readShortcut(act, category, prefClass)
 if helpViewer is not None:
-if not helpViewerCategory:
+helpViewerCategory = helpViewer.getActionsCategory()
-helpViewerCategory = "HelpViewer"
 for act in helpViewer.getActions():
 __readShortcut(act, helpViewerCategory, prefClass)
 if pluginName is not None:
 try:
 prefClass.settings.setValue(
 "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()),
 act.alternateShortcut().toString())
-def saveShortcuts(prefClass=Prefs):
+def saveShortcuts(prefClass=Prefs, helpViewer=None):
 """
 Module function to write the keyboard shortcuts for the defined QActions.
 @param prefClass preferences class used as the storage area
-"""
+@keyparam helpViewer reference to the help window object
-# step 1: clear all previously saved shortcuts
+"""
-prefClass.settings.beginGroup("Shortcuts")
+if helpViewer is None:
-prefClass.settings.remove("")
+# step 1: clear all previously saved shortcuts
-prefClass.settings.endGroup()
+prefClass.settings.beginGroup("Shortcuts")
+prefClass.settings.remove("")
-# step 2: save the various shortcuts
+prefClass.settings.endGroup()
-for act in e5App().getObject("Project").getActions():
-__saveShortcut(act, "Project", prefClass)
+# step 2: save the various shortcuts
+for act in e5App().getObject("Project").getActions():
-for act in e5App().getObject("UserInterface").getActions('ui'):
+__saveShortcut(act, "Project", prefClass)
-__saveShortcut(act, "General", prefClass)
+for act in e5App().getObject("UserInterface").getActions('ui'):
-for act in e5App().getObject("UserInterface").getActions('wizards'):
+__saveShortcut(act, "General", prefClass)
-__saveShortcut(act, "Wizards", prefClass)
+for act in e5App().getObject("UserInterface").getActions('wizards'):
-for act in e5App().getObject("DebugUI").getActions():
+__saveShortcut(act, "Wizards", prefClass)
-__saveShortcut(act, "Debug", prefClass)
+for act in e5App().getObject("DebugUI").getActions():
-for act in e5App().getObject("ViewManager").getActions('edit'):
+__saveShortcut(act, "Debug", prefClass)
-__saveShortcut(act, "Edit", prefClass)
+for act in e5App().getObject("ViewManager").getActions('edit'):
-for act in e5App().getObject("ViewManager").getActions('file'):
+__saveShortcut(act, "Edit", prefClass)
-__saveShortcut(act, "File", prefClass)
+for act in e5App().getObject("ViewManager").getActions('file'):
-for act in e5App().getObject("ViewManager").getActions('search'):
+__saveShortcut(act, "File", prefClass)
-__saveShortcut(act, "Search", prefClass)
+for act in e5App().getObject("ViewManager").getActions('search'):
-for act in e5App().getObject("ViewManager").getActions('view'):
+__saveShortcut(act, "Search", prefClass)
-__saveShortcut(act, "View", prefClass)
+for act in e5App().getObject("ViewManager").getActions('view'):
-for act in e5App().getObject("ViewManager").getActions('macro'):
+__saveShortcut(act, "View", prefClass)
-__saveShortcut(act, "Macro", prefClass)
+for act in e5App().getObject("ViewManager").getActions('macro'):
-for act in e5App().getObject("ViewManager").getActions('bookmark'):
+__saveShortcut(act, "Macro", prefClass)
-__saveShortcut(act, "Bookmarks", prefClass)
+for act in e5App().getObject("ViewManager").getActions('bookmark'):
-for act in e5App().getObject("ViewManager").getActions('spelling'):
+__saveShortcut(act, "Bookmarks", prefClass)
-__saveShortcut(act, "Spelling", prefClass)
+for act in e5App().getObject("ViewManager").getActions('spelling'):
-actions = e5App().getObject("ViewManager").getActions('window')
+__saveShortcut(act, "Spelling", prefClass)
-if actions:
-for act in actions:
+actions = e5App().getObject("ViewManager").getActions('window')
-__saveShortcut(act, "Window", prefClass)
+if actions:
-for category, ref in e5App().getPluginObjects():
-if hasattr(ref, "getActions"):
-actions = ref.getActions()
 for act in actions:
-__saveShortcut(act, category, prefClass)
+__saveShortcut(act, "Window", prefClass)
-try:
+for category, ref in e5App().getPluginObjects():
-for act in e5App().getObject("DummyHelpViewer").getActions():
+if hasattr(ref, "getActions"):
-__saveShortcut(act, "HelpViewer", prefClass)
+actions = ref.getActions()
-except KeyError:
+for act in actions:
-# no QtWebKit available
+__saveShortcut(act, category, prefClass)
-pass
+else:
+helpViewerCategory = helpViewer.getActionsCategory()
-def exportShortcuts(fn):
+# step 1: clear all previously saved shortcuts
+prefClass.settings.beginGroup(
+"Shortcuts/{0}".format(helpViewerCategory)
+)
+prefClass.settings.remove("")
+prefClass.settings.endGroup()
+# step 2: save the shortcuts
+for act in helpViewer.getActions():
+__saveShortcut(act, helpViewerCategory, prefClass)
+def exportShortcuts(fn, helpViewer=None):
 """
 Module function to export the keyboard shortcuts for the defined QActions.
 @param fn filename of the export file (string)
+@param helpViewer reference to the help window object
 """
 # let the plugin manager create on demand plugin objects
 pm = e5App().getObject("PluginManager")
 pm.initOnDemandPlugins()
 f = QFile(fn)
 if f.open(QIODevice.WriteOnly):
 from E5XML.ShortcutsWriter import ShortcutsWriter
-ShortcutsWriter(f).writeXML()
+ShortcutsWriter(f).writeXML(helpViewer=helpViewer)
 f.close()
 else:
 E5MessageBox.critical(
 None,
 QCoreApplication.translate(
 "<p>The keyboard shortcuts could not be written to file"
 " <b>{0}</b>.</p>")
 .format(fn))
-def importShortcuts(fn):
+def importShortcuts(fn, helpViewer=None):
 """
 Module function to import the keyboard shortcuts for the defined E5Actions.
 @param fn filename of the import file (string)
+@param helpViewer reference to the help window object
 """
 # let the plugin manager create on demand plugin objects
 pm = e5App().getObject("PluginManager")
 pm.initOnDemandPlugins()
 reader = ShortcutsReader(f)
 reader.readXML()
 f.close()
 if not reader.hasError():
 shortcuts = reader.getShortcuts()
-setActions(shortcuts)
+setActions(shortcuts, helpViewer=helpViewer)
 saveShortcuts()
 syncPreferences()
 else:
 E5MessageBox.critical(
 None,
 removeEmpty=True)
 except KeyError:
 pass
-def setActions(shortcuts):
+def setActions(shortcuts, helpViewer=None):
 """
 Module function to set actions based on new format shortcuts file.
 @param shortcuts dictionary containing the accelerator information
 read from a XML file
-"""
+@param helpViewer reference to the help window object
-if "Project" in shortcuts:
+"""
-__setAction(e5App().getObject("Project").getActions(),
+if helpViewer is None:
-shortcuts["Project"])
+if "Project" in shortcuts:
+__setAction(
-if "General" in shortcuts:
+e5App().getObject("Project").getActions(),
-__setAction(e5App().getObject("UserInterface").getActions('ui'),
+shortcuts["Project"])
-shortcuts["General"])
+if "General" in shortcuts:
-if "Wizards" in shortcuts:
+__setAction(
-__setAction(e5App().getObject("UserInterface").getActions('wizards'),
+e5App().getObject("UserInterface").getActions('ui'),
-shortcuts["Wizards"])
+shortcuts["General"])
-if "Debug" in shortcuts:
+if "Wizards" in shortcuts:
-__setAction(e5App().getObject("DebugUI").getActions(),
+__setAction(
-shortcuts["Debug"])
+e5App().getObject("UserInterface").getActions('wizards'),
+shortcuts["Wizards"])
-if "Edit" in shortcuts:
-__setAction(e5App().getObject("ViewManager").getActions('edit'),
+if "Debug" in shortcuts:
-shortcuts["Edit"])
+__setAction(
+e5App().getObject("DebugUI").getActions(),
-if "File" in shortcuts:
+shortcuts["Debug"])
-__setAction(e5App().getObject("ViewManager").getActions('file'),
-shortcuts["File"])
+if "Edit" in shortcuts:
+__setAction(
-if "Search" in shortcuts:
+e5App().getObject("ViewManager").getActions('edit'),
-__setAction(e5App().getObject("ViewManager").getActions('search'),
+shortcuts["Edit"])
-shortcuts["Search"])
+if "File" in shortcuts:
-if "View" in shortcuts:
+__setAction(
-__setAction(e5App().getObject("ViewManager").getActions('view'),
+e5App().getObject("ViewManager").getActions('file'),
-shortcuts["View"])
+shortcuts["File"])
-if "Macro" in shortcuts:
+if "Search" in shortcuts:
-__setAction(e5App().getObject("ViewManager").getActions('macro'),
+__setAction(
-shortcuts["Macro"])
+e5App().getObject("ViewManager").getActions('search'),
+shortcuts["Search"])
-if "Bookmarks" in shortcuts:
-__setAction(e5App().getObject("ViewManager").getActions('bookmark'),
+if "View" in shortcuts:
-shortcuts["Bookmarks"])
+__setAction(
+e5App().getObject("ViewManager").getActions('view'),
-if "Spelling" in shortcuts:
+shortcuts["View"])
-__setAction(e5App().getObject("ViewManager").getActions('spelling'),
-shortcuts["Spelling"])
+if "Macro" in shortcuts:
+__setAction(
-if "Window" in shortcuts:
+e5App().getObject("ViewManager").getActions('macro'),
-actions = e5App().getObject("ViewManager").getActions('window')
+shortcuts["Macro"])
-if actions:
-__setAction(actions, shortcuts["Window"])
+if "Bookmarks" in shortcuts:
+__setAction(
-for category, ref in e5App().getPluginObjects():
+e5App().getObject("ViewManager").getActions('bookmark'),
-if category in shortcuts and hasattr(ref, "getActions"):
+shortcuts["Bookmarks"])
-actions = ref.getActions()
-__setAction(actions, shortcuts[category])
+if "Spelling" in shortcuts:
+__setAction(
-try:
+e5App().getObject("ViewManager").getActions('spelling'),
-if "HelpViewer" in shortcuts:
+shortcuts["Spelling"])
-__setAction(e5App().getObject("DummyHelpViewer").getActions(),
-shortcuts["HelpViewer"])
+if "Window" in shortcuts:
-except KeyError:
+actions = e5App().getObject("ViewManager").getActions('window')
-# no QtWebKit available
+if actions:
-pass
+__setAction(actions, shortcuts["Window"])
+for category, ref in e5App().getPluginObjects():
+if category in shortcuts and hasattr(ref, "getActions"):
+actions = ref.getActions()
+__setAction(actions, shortcuts[category])
+else:
+category = helpViewer.getActionsCategory()
+if category in shortcuts:
+__setAction(helpViewer.getActions(), shortcuts[category])

Mercurial Repositories > eric / file comparison

comparison: Preferences/Shortcuts.py

Preferences/Shortcuts.py