raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a i18n bug + remove shortcut from map if removing the action

Browse Source
This commit is contained in:
Andreas Preikschat 2011-12-14 16:45:11 +01:00
parent f1485aba47
commit d2cf6aa684
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openlp/core/utils/actions.py
View File

@ -234,10 +234,14 @@ class ActionList(object):
if not shortcuts: if not shortcuts:
action.setShortcuts([]) action.setShortcuts([])
return return
shortcuts = map(unicode, shortcuts) # We have to do this to ensure that the loaded shortcut list e. g.
# STRG+O (German) is converted to CTRL+O, which is only done when we
# convert the strings in this way (QKeySequence -> QString -> unicode).
shortcuts = map(QtGui.QKeySequence, shortcuts)
shortcuts = map(unicode, map(QtGui.QKeySequence.toString, shortcuts))
# Check the alternate shortcut first, to avoid problems when the # Check the alternate shortcut first, to avoid problems when the
# alternate shortcut becomes the primary shortcut after removing the # alternate shortcut becomes the primary shortcut after removing the
# (initial) primary shortcut due to confllicts. # (initial) primary shortcut due to conflicts.
if len(shortcuts) == 2: if len(shortcuts) == 2:
existing_actions = ActionList.shortcut_map.get(shortcuts[1], []) existing_actions = ActionList.shortcut_map.get(shortcuts[1], [])
# Check for conflicts with other actions considering the shortcut # Check for conflicts with other actions considering the shortcut
@ -279,6 +283,15 @@ class ActionList(object):
# Remove empty categories. # Remove empty categories.
if len(self.categories[category].actions) == 0: if len(self.categories[category].actions) == 0:
self.categories.remove(category) self.categories.remove(category)
shortcuts = map(unicode,
map(QtGui.QKeySequence.toString, action.shortcuts()))
for shortcut in shortcuts:
# Remove action from the list of actions which are using this
# shortcut.
ActionList.shortcut_map[shortcut].remove(action)
# Remove empty entries.
if not ActionList.shortcut_map[shortcut]:
del ActionList.shortcut_map[shortcut]
def add_category(self, name, weight): def add_category(self, name, weight):
""" """
@ -316,17 +329,15 @@ class ActionList(object):
A list of unicode keysequences. A list of unicode keysequences.
""" """
for old_shortcut in old_shortcuts: for old_shortcut in old_shortcuts:
# Should always be the case. # Remove action from the list of actions which are using this
if old_shortcut in ActionList.shortcut_map: # shortcut.
# Remove action from the list of actions which are using this ActionList.shortcut_map[old_shortcut].remove(action)
# shortcut. # Remove empty entries.
ActionList.shortcut_map[old_shortcut].remove(action) if not ActionList.shortcut_map[old_shortcut]:
# Remove empty entries. del ActionList.shortcut_map[old_shortcut]
if not ActionList.shortcut_map[old_shortcut]:
del ActionList.shortcut_map[old_shortcut]
new_shortcuts = map(unicode, new_shortcuts = map(unicode,
map(QtGui.QKeySequence.toString, action.shortcuts())) map(QtGui.QKeySequence.toString, action.shortcuts()))
# Add the new shortcut to the map. # Add the new shortcuts to the map.
for new_shortcut in new_shortcuts: for new_shortcut in new_shortcuts:
existing_actions = ActionList.shortcut_map.get(new_shortcut, []) existing_actions = ActionList.shortcut_map.get(new_shortcut, [])
existing_actions.append(action) existing_actions.append(action)