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

changed name

Browse Source
This commit is contained in:
Andreas Preikschat 2011-12-03 16:09:03 +01:00
parent eb121abb12
commit 5bfc101f09
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ class ActionList(object):
actions or categories. actions or categories.
""" """
instance = None instance = None
action_map = {} shortcut_map = {}
def __init__(self): def __init__(self):
self.categories = CategoryList() self.categories = CategoryList()
@ -241,23 +241,23 @@ class ActionList(object):
# 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 confllicts.
if len(shortcuts) == 2: if len(shortcuts) == 2:
existing_actions = ActionList.action_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
# context. # context.
if self._shortcut_available(existing_actions, action): if self._shortcut_available(existing_actions, action):
actions = ActionList.action_map.get(shortcuts[1], []) actions = ActionList.shortcut_map.get(shortcuts[1], [])
actions.append(action) actions.append(action)
ActionList.action_map[shortcuts[1]] = actions ActionList.shortcut_map[shortcuts[1]] = actions
else: else:
shortcuts.remove(shortcuts[1]) shortcuts.remove(shortcuts[1])
# Check the primary shortcut. # Check the primary shortcut.
existing_actions = ActionList.action_map.get(shortcuts[0], []) existing_actions = ActionList.shortcut_map.get(shortcuts[0], [])
# Check for conflicts with other actions considering the shortcut # Check for conflicts with other actions considering the shortcut
# context. # context.
if self._shortcut_available(existing_actions, action): if self._shortcut_available(existing_actions, action):
actions = ActionList.action_map.get(shortcuts[0], []) actions = ActionList.shortcut_map.get(shortcuts[0], [])
actions.append(action) actions.append(action)
ActionList.action_map[shortcuts[0]] = actions ActionList.shortcut_map[shortcuts[0]] = actions
else: else:
shortcuts.remove(shortcuts[0]) shortcuts.remove(shortcuts[0])
action.setShortcuts( action.setShortcuts(
@ -269,7 +269,7 @@ class ActionList(object):
automatically removed. automatically removed.
``action`` ``action``
The QAction object to be removed. The ``QAction`` object to be removed.
``category`` ``category``
The name (unicode string) of the category, which contains the The name (unicode string) of the category, which contains the