From 19138cd9e5b42652473e331cd866252cd3e4150b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 29 Mar 2011 15:56:49 +0200
Subject: [PATCH 01/47] started reworking shortcuts

---
 openlp/core/lib/ui.py                 |  2 +
 openlp/core/ui/mainwindow.py          | 63 ++++++++----------
 openlp/core/ui/servicemanager.py      |  2 +-
 openlp/core/ui/shortcutlistform.py    | 95 +++++++++++++++++++--------
 openlp/core/ui/slidecontroller.py     |  3 +-
 openlp/core/utils/actions.py          | 11 ++++
 openlp/plugins/alerts/alertsplugin.py |  8 ++-
 7 files changed, 116 insertions(+), 68 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index c1a9f8b35..6aa06bfcc 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -31,6 +31,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, Receiver, translate
+from openlp.core.utils.actions import actionList
 
 log = logging.getLogger(__name__)
 
@@ -265,6 +266,7 @@ def icon_action(parent, name, icon, checked=None):
     else:
         action = base_action(parent, name)
     action.setIcon(build_icon(icon))
+    #actionList.add_action(action, name)
     return action
 
 def shortcut_action(parent, text, shortcuts, function):
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 594c6cc91..98144bfa3 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -38,7 +38,8 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
-    ActionList, get_application_version
+    get_application_version
+from openlp.core.utils.actions import actionList
 
 log = logging.getLogger(__name__)
 
@@ -163,53 +164,52 @@ class Ui_MainWindow(object):
         # Create the menu items
         self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
             u':/general/general_new.png')
-        mainWindow.actionList.add_action(self.FileNewItem, u'File')
+        actionList.add_action(self.FileNewItem, u'File')
         self.FileOpenItem = icon_action(mainWindow, u'FileOpenItem',
             u':/general/general_open.png')
-        mainWindow.actionList.add_action(self.FileOpenItem, u'File')
+        actionList.add_action(self.FileOpenItem, u'File')
         self.FileSaveItem = icon_action(mainWindow, u'FileSaveItem',
             u':/general/general_save.png')
-        mainWindow.actionList.add_action(self.FileSaveItem, u'File')
+        actionList.add_action(self.FileSaveItem, u'File')
         self.FileSaveAsItem = base_action(mainWindow, u'FileSaveAsItem')
-        mainWindow.actionList.add_action(self.FileSaveAsItem, u'File')
+        actionList.add_action(self.FileSaveAsItem, u'File')
         self.printServiceOrderItem = base_action(
             mainWindow, u'printServiceItem')
-        mainWindow.actionList.add_action(
-            self.printServiceOrderItem, u'Print Service Order')
+        actionList.add_action(self.printServiceOrderItem, u'File')
         self.FileExitItem = icon_action(mainWindow, u'FileExitItem',
             u':/system/system_exit.png')
-        mainWindow.actionList.add_action(self.FileExitItem, u'File')
+        actionList.add_action(self.FileExitItem, u'File')
         self.ImportThemeItem = base_action(mainWindow, u'ImportThemeItem')
-        mainWindow.actionList.add_action(self.ImportThemeItem, u'Import')
+        actionList.add_action(self.ImportThemeItem, u'Import')
         self.ImportLanguageItem = base_action(mainWindow, u'ImportLanguageItem')
-        mainWindow.actionList.add_action(self.ImportLanguageItem, u'Import')
+        actionList.add_action(self.ImportLanguageItem, u'Import')
         self.ExportThemeItem = base_action(mainWindow, u'ExportThemeItem')
-        mainWindow.actionList.add_action(self.ExportThemeItem, u'Export')
+        actionList.add_action(self.ExportThemeItem, u'Export')
         self.ExportLanguageItem = base_action(mainWindow, u'ExportLanguageItem')
-        mainWindow.actionList.add_action(self.ExportLanguageItem, u'Export')
+        actionList.add_action(self.ExportLanguageItem, u'Export')
         self.ViewMediaManagerItem = icon_action(mainWindow,
             u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
             self.mediaManagerDock.isVisible())
         self.ViewThemeManagerItem = icon_action(mainWindow,
             u'ViewThemeManagerItem', u':/system/system_thememanager.png',
             self.themeManagerDock.isVisible())
-        mainWindow.actionList.add_action(self.ViewMediaManagerItem, u'View')
+        actionList.add_action(self.ViewMediaManagerItem, u'View')
         self.ViewServiceManagerItem = icon_action(mainWindow,
             u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
             self.serviceManagerDock.isVisible())
-        mainWindow.actionList.add_action(self.ViewServiceManagerItem, u'View')
+        actionList.add_action(self.ViewServiceManagerItem, u'View')
         self.ViewPreviewPanel = checkable_action(mainWindow,
             u'ViewPreviewPanel', previewVisible)
-        mainWindow.actionList.add_action(self.ViewPreviewPanel, u'View')
+        actionList.add_action(self.ViewPreviewPanel, u'View')
         self.ViewLivePanel = checkable_action(mainWindow, u'ViewLivePanel',
             liveVisible)
-        mainWindow.actionList.add_action(self.ViewLivePanel, u'View')
+        actionList.add_action(self.ViewLivePanel, u'View')
         self.ModeDefaultItem = checkable_action(mainWindow, u'ModeDefaultItem')
-        mainWindow.actionList.add_action(self.ModeDefaultItem, u'View Mode')
+        actionList.add_action(self.ModeDefaultItem, u'View Mode')
         self.ModeSetupItem = checkable_action(mainWindow, u'ModeLiveItem')
-        mainWindow.actionList.add_action(self.ModeSetupItem, u'View Mode')
+        actionList.add_action(self.ModeSetupItem, u'View Mode')
         self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem', True)
-        mainWindow.actionList.add_action(self.ModeLiveItem, u'View Mode')
+        actionList.add_action(self.ModeLiveItem, u'View Mode')
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
         self.ModeGroup.addAction(self.ModeSetupItem)
@@ -217,18 +217,18 @@ class Ui_MainWindow(object):
         self.ModeDefaultItem.setChecked(True)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
             u':/tools/tools_add.png')
-        mainWindow.actionList.add_action(self.ToolsAddToolItem, u'Tools')
+        actionList.add_action(self.ToolsAddToolItem, u'Tools')
         self.ToolsOpenDataFolder = icon_action(mainWindow,
             u'ToolsOpenDataFolder', u':/general/general_open.png')
-        mainWindow.actionList.add_action(self.ToolsOpenDataFolder, u'Tools')
+        actionList.add_action(self.ToolsOpenDataFolder, u'Tools')
         self.settingsPluginListItem = icon_action(mainWindow,
             u'settingsPluginListItem', u':/system/settings_plugin_list.png')
-        mainWindow.actionList.add_action(self.settingsPluginListItem,
+        actionList.add_action(self.settingsPluginListItem,
             u'Settings')
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
             u'AutoLanguageItem', LanguageManager.auto_language)
-        mainWindow.actionList.add_action(self.AutoLanguageItem, u'Settings')
+        actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
         self.LanguageGroup.setObjectName(u'LanguageGroup')
@@ -246,19 +246,19 @@ class Ui_MainWindow(object):
             u'DisplayTagItem', u':/system/tag_editor.png')
         self.SettingsConfigureItem = icon_action(mainWindow,
             u'SettingsConfigureItem', u':/system/system_settings.png')
-        mainWindow.actionList.add_action(self.SettingsShortcutsItem,
+        actionList.add_action(self.SettingsShortcutsItem,
             u'Settings')
         self.HelpDocumentationItem = icon_action(mainWindow,
             u'HelpDocumentationItem', u':/system/system_help_contents.png')
         self.HelpDocumentationItem.setEnabled(False)
-        mainWindow.actionList.add_action(self.HelpDocumentationItem, u'Help')
+        actionList.add_action(self.HelpDocumentationItem, u'Help')
         self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
             u':/system/system_about.png')
-        mainWindow.actionList.add_action(self.HelpAboutItem, u'Help')
+        actionList.add_action(self.HelpAboutItem, u'Help')
         self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
-        mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help')
+        actionList.add_action(self.HelpOnlineHelpItem, u'Help')
         self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem')
-        mainWindow.actionList.add_action(self.helpWebSiteItem, u'Help')
+        actionList.add_action(self.helpWebSiteItem, u'Help')
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
         add_actions(self.FileExportMenu,
@@ -301,7 +301,6 @@ class Ui_MainWindow(object):
         self.ToolsAddToolItem.setVisible(False)
         self.ImportLanguageItem.setVisible(False)
         self.ExportLanguageItem.setVisible(False)
-        self.SettingsShortcutsItem.setVisible(False)
         self.HelpDocumentationItem.setVisible(False)
 
     def retranslateUi(self, mainWindow):
@@ -467,8 +466,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
     """
     log.info(u'MainWindow loaded')
 
-    actionList = ActionList()
-
     def __init__(self, screens, application):
         """
         This constructor sets up the interface, the various managers, and the
@@ -476,7 +473,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         QtGui.QMainWindow.__init__(self)
         self.screens = screens
-
         self.application = application
         # Set up settings sections for the main application
         # (not for use by plugins)
@@ -485,7 +481,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.serviceSettingsSection = u'servicemanager'
         self.songsSettingsSection = u'songs'
         self.serviceNotSaved = False
-        self.actionList = ActionList()
         self.settingsmanager = SettingsManager(screens)
         self.aboutForm = AboutForm(self)
         self.settingsForm = SettingsForm(self.screens, self, self)
@@ -777,7 +772,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         Show the shortcuts dialog
         """
-        self.shortcutForm.exec_(self.actionList)
+        self.shortcutForm.exec_()
 
     def onModeDefaultItemClicked(self):
         """
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 168ad8a8c..1d5321e01 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -40,6 +40,7 @@ from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
+from openlp.core.utils.actions import actionList
 
 class ServiceManagerList(QtGui.QTreeWidget):
     """
@@ -315,7 +316,6 @@ class ServiceManager(QtGui.QWidget):
         self.configUpdated()
 
     def setServiceHotkeys(self):
-        actionList = self.mainwindow.actionList
         actionList.add_action(self.serviceManagerList.moveDown, u'Service')
         actionList.add_action(self.serviceManagerList.moveUp, u'Service')
         actionList.add_action(self.serviceManagerList.moveTop, u'Service')
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index e87ba3ada..a61dd41ed 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -30,6 +30,7 @@ import re
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.utils import translate
+from openlp.core.utils.actions import actionList
 from shortcutlistdialog import Ui_ShortcutListDialog
 
 REMOVE_AMPERSAND = re.compile(r'&{1}')
@@ -40,21 +41,24 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     """
     The shortcut list dialog
     """
-
-    def __init__(self, parent):
-        """
-        Do some initialisation stuff
-        """
+#TODO: do not close on ESC
+#TODO: ability to remove actions
+#TODO: Save shortcuts
+#TODO: doc
+    def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.actionList = None
-        self.captureShortcut = False
+        self.assingedShortcuts = []
+        self.shortcutButton.setText(u'')
         QtCore.QObject.connect(self.shortcutButton,
             QtCore.SIGNAL(u'toggled(bool)'), self.onShortcutButtonClicked)
+        QtCore.QObject.connect(self.treeWidget,
+            QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'),
+            self.onItemPressed)
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
-        if not self.captureShortcut:
+        if not self.shortcutButton.isChecked():
             return
         key = event.key()
         if key == Qt.Key_Shift or key == Qt.Key_Control or \
@@ -68,45 +72,80 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
-        existing_key = QtGui.QKeySequence(u'Ctrl+Shift+F8')
-        if key_sequence == existing_key:
-            QtGui.QMessageBox.warning(
-                self,
+        if key_sequence in self.assingedShortcuts:
+            QtGui.QMessageBox.warning(self,
                 translate('OpenLP.ShortcutListDialog', 'Duplicate Shortcut'),
                 unicode(translate('OpenLP.ShortcutListDialog', 'The shortcut '
-                    '"%s" is already assigned to another action, please '
-                    'use a different shortcut.')) % key_sequence.toString(),
+                '"%s" is already assigned to another action, please '
+                'use a different shortcut.')) % key_sequence.toString(),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok
             )
         else:
             self.shortcutButton.setText(key_sequence.toString())
-        self.shortcutButton.setChecked(False)
-        self.captureShortcut = False
+            self.shortcutButton.setChecked(False)
 
-    def exec_(self, actionList):
-        self.actionList = actionList
-        self.refreshActions()
+    def exec_(self):
+        # The dialog is opened the first time
+        if self.treeWidget.topLevelItemCount() == 0:
+            QtCore.QObject.connect(actionList.signal,
+                QtCore.SIGNAL(u'addedAction()'), self.initialiseActionList)
+            self.initialiseActionList()
+        self.refreshActionList()
         return QtGui.QDialog.exec_(self)
 
-    def refreshActions(self):
-        self.treeWidget.clear()
-        for category in self.actionList.categories:
-            item = QtGui.QTreeWidgetItem([category.name])
-            for action in category.actions:
+    def refreshActionList(self):
+        self.assingedShortcuts = []
+        iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
+        while iterator.value():
+            treewidgetItem = iterator.value()
+            action = treewidgetItem.data(0, QtCore.Qt.UserRole).toPyObject()
+            if action is not None:
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
-                if (len(action.shortcuts()) == 2):
+                if len(action.shortcuts()) == 2:
                     shortcutText = action.shortcuts()[0].toString()
                     alternateText = action.shortcuts()[1].toString()
                 else:
                     shortcutText = action.shortcut().toString()
                     alternateText = u''
-                actionItem = QtGui.QTreeWidgetItem(
-                    [actionText, shortcutText, alternateText])
+                self.assingedShortcuts.extend(action.shortcuts())
+                treewidgetItem.setText(0, actionText)
+                treewidgetItem.setText(1, shortcutText)
+                treewidgetItem.setText(2,  alternateText)
+            iterator += 1
+
+    def initialiseActionList(self):
+        for category in actionList.categories:
+            item = QtGui.QTreeWidgetItem([category.name])
+            for action in category.actions:
+                actionItem = QtGui.QTreeWidgetItem()
                 actionItem.setIcon(0, action.icon())
+                actionItem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(action))
                 item.addChild(actionItem)
             item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
 
     def onShortcutButtonClicked(self, toggled):
-        self.captureShortcut = toggled
+        if toggled:
+            return
+        item = self.treeWidget.currentItem()
+        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        if action is None:
+            return
+        # TODO: Sort out which shortcuts should be kept.
+        action.setShortcuts(QtGui.QKeySequence(self.shortcutButton.text()))
+        self.refreshActionList()
+
+    def onItemPressed(self, item, column):
+        item = self.treeWidget.currentItem()
+        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        if action is None:
+            text = u''
+        else:
+            if len(action.shortcuts()) == 0:
+               text = u''
+            elif len(action.shortcuts()) == 2 and column == 2:
+                text = action.shortcuts()[1].toString()
+            else:
+                text = action.shortcuts()[0].toString()
+        self.shortcutButton.setText(text)
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 232653326..1ae84e950 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -34,6 +34,7 @@ from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
 from openlp.core.lib.ui import icon_action, UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
+from openlp.core.utils.actions import actionList
 
 log = logging.getLogger(__name__)
 
@@ -362,14 +363,12 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
-        actionList = self.parent.actionList
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, 0])
         actionList.add_action(self.previousItem, u'Preview')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, 0])
         actionList.add_action(self.nextItem, u'Preview')
 
     def setLiveHotkeys(self, parent=None):
-        actionList = self.parent.actionList
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
         self.previousItem.setShortcutContext(
             QtCore.Qt.WidgetWithChildrenShortcut)
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 41ae41f4b..ba4a7b40d 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -27,6 +27,8 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
+from PyQt4 import QtCore
+
 class ActionCategory(object):
     """
     The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
@@ -173,6 +175,7 @@ class ActionList(object):
     """
     def __init__(self):
         self.categories = CategoryList()
+        self.signal = Emit()
 
     def add_action(self, action, category=u'Default', weight=None):
         if category not in self.categories:
@@ -181,3 +184,11 @@ class ActionList(object):
             self.categories[category].actions.append(action)
         else:
             self.categories[category].actions.add(action, weight)
+        self.signal.emit(QtCore.SIGNAL(u'addedAction()'))
+
+
+class Emit(QtCore.QObject):
+    def __init__(self):
+        QtCore.QObject.__init__(self)
+
+actionList = ActionList()
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index db0ba3b7e..2d22d2d5a 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -30,6 +30,8 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
+from openlp.core.lib.ui import icon_action
+from openlp.core.utils.actions import actionList
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
 from openlp.plugins.alerts.forms import AlertForm
@@ -58,9 +60,9 @@ class AlertsPlugin(Plugin):
             use it as their parent.
         """
         log.info(u'add tools menu')
-        self.toolsAlertItem = QtGui.QAction(tools_menu)
-        self.toolsAlertItem.setIcon(build_icon(u':/plugins/plugin_alerts.png'))
-        self.toolsAlertItem.setObjectName(u'toolsAlertItem')
+        self.toolsAlertItem = icon_action(tools_menu, u'toolsAlertItem',
+            u':/plugins/plugin_alerts.png')
+        actionList.add_action(self.toolsAlertItem, u'Extra')
         self.toolsAlertItem.setText(translate('AlertsPlugin', '&Alert'))
         self.toolsAlertItem.setStatusTip(
             translate('AlertsPlugin', 'Show an alert message.'))

From d9c2d92c8c4265975c7860bfc7fd5aba26c1bac1 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 29 Mar 2011 18:44:36 +0200
Subject: [PATCH 02/47]

---
 openlp/core/lib/ui.py                 |  24 +++---
 openlp/core/ui/mainwindow.py          | 104 +++++++++++---------------
 openlp/core/ui/shortcutlistform.py    |  15 +++-
 openlp/core/ui/slidecontroller.py     |  23 +++---
 openlp/core/utils/__init__.py         |   6 +-
 openlp/core/utils/actions.py          |   2 +-
 openlp/plugins/alerts/alertsplugin.py |   3 +-
 7 files changed, 90 insertions(+), 87 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 6aa06bfcc..86def01d8 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -239,41 +239,47 @@ def create_up_down_push_button_set(parent):
         QtCore.SIGNAL(u'clicked()'), parent.onDownButtonClicked)
     return up_button, down_button
 
-def base_action(parent, name):
+def base_action(parent, name, category=None):
     """
     Return the most basic action with the object name set.
     """
     action = QtGui.QAction(parent)
     action.setObjectName(name)
+    if category is not None:
+        actionList.add_action(action, category)
     return action
 
-def checkable_action(parent, name, checked=None):
+def checkable_action(parent, name, checked=None, category=None):
     """
     Return a standard action with the checkable attribute set.
     """
-    action = base_action(parent, name)
+    action = base_action(parent, name, category)
     action.setCheckable(True)
     if checked is not None:
         action.setChecked(checked)
     return action
 
-def icon_action(parent, name, icon, checked=None):
+def icon_action(parent, name, icon, checked=None, category=None):
     """
     Return a standard action with an icon.
+
+    ``category``
+        The category the action should be listed in the shortcut dialog. If you
+        not wish, that this action is added to the shortcut dialog, then do not
+        state any.
     """
     if checked is not None:
-        action = checkable_action(parent, name, checked)
+        action = checkable_action(parent, name, checked, category)
     else:
-        action = base_action(parent, name)
+        action = base_action(parent, name, category)
     action.setIcon(build_icon(icon))
-    #actionList.add_action(action, name)
     return action
 
-def shortcut_action(parent, text, shortcuts, function):
+def shortcut_action(parent, text, shortcuts, function, category=None):
     """
     Return a shortcut enabled action.
     """
-    action = QtGui.QAction(text, parent)
+    action = base_action(parent, text, category)
     action.setShortcuts(shortcuts)
     action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index ed06d3931..c37db0b97 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -39,7 +39,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     get_application_version
-from openlp.core.utils.actions import actionList
+#from openlp.core.utils.actions import actionList
 
 log = logging.getLogger(__name__)
 
@@ -163,72 +163,60 @@ class Ui_MainWindow(object):
             self.themeManagerDock)
         # Create the menu items
         self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
-            u':/general/general_new.png')
-        actionList.add_action(self.FileNewItem, u'File')
+            u':/general/general_new.png', category=u'File')
         self.FileOpenItem = icon_action(mainWindow, u'FileOpenItem',
-            u':/general/general_open.png')
-        actionList.add_action(self.FileOpenItem, u'File')
+            u':/general/general_open.png', category=u'File')
         self.FileSaveItem = icon_action(mainWindow, u'FileSaveItem',
-            u':/general/general_save.png')
-        actionList.add_action(self.FileSaveItem, u'File')
-        self.FileSaveAsItem = base_action(mainWindow, u'FileSaveAsItem')
-        actionList.add_action(self.FileSaveAsItem, u'File')
+            u':/general/general_save.png', category=u'File')
+        self.FileSaveAsItem = base_action(
+            mainWindow, u'FileSaveAsItem', u'File')
         self.printServiceOrderItem = base_action(
-            mainWindow, u'printServiceItem')
-        actionList.add_action(self.printServiceOrderItem, u'File')
+            mainWindow, u'printServiceItem', u'File')
         self.FileExitItem = icon_action(mainWindow, u'FileExitItem',
-            u':/system/system_exit.png')
-        actionList.add_action(self.FileExitItem, u'File')
-        self.ImportThemeItem = base_action(mainWindow, u'ImportThemeItem')
-        actionList.add_action(self.ImportThemeItem, u'Import')
-        self.ImportLanguageItem = base_action(mainWindow, u'ImportLanguageItem')
-        actionList.add_action(self.ImportLanguageItem, u'Import')
-        self.ExportThemeItem = base_action(mainWindow, u'ExportThemeItem')
-        actionList.add_action(self.ExportThemeItem, u'Export')
-        self.ExportLanguageItem = base_action(mainWindow, u'ExportLanguageItem')
-        actionList.add_action(self.ExportLanguageItem, u'Export')
+            u':/system/system_exit.png', category=u'File')
+        self.ImportThemeItem = base_action(
+            mainWindow, u'ImportThemeItem', u'Import')
+        self.ImportLanguageItem = base_action(
+            mainWindow, u'ImportLanguageItem', u'Import')
+        self.ExportThemeItem = base_action(
+            mainWindow, u'ExportThemeItem', u'Export')
+        self.ExportLanguageItem = base_action(
+            mainWindow, u'ExportLanguageItem', u'Export')
         self.ViewMediaManagerItem = icon_action(mainWindow,
             u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
-            self.mediaManagerDock.isVisible())
+            self.mediaManagerDock.isVisible(), u'View')
         self.ViewThemeManagerItem = icon_action(mainWindow,
             u'ViewThemeManagerItem', u':/system/system_thememanager.png',
-            self.themeManagerDock.isVisible())
-        actionList.add_action(self.ViewMediaManagerItem, u'View')
+            self.themeManagerDock.isVisible(), u'View')
         self.ViewServiceManagerItem = icon_action(mainWindow,
             u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
-            self.serviceManagerDock.isVisible())
-        actionList.add_action(self.ViewServiceManagerItem, u'View')
+            self.serviceManagerDock.isVisible(), u'View')
         self.ViewPreviewPanel = checkable_action(mainWindow,
-            u'ViewPreviewPanel', previewVisible)
-        actionList.add_action(self.ViewPreviewPanel, u'View')
-        self.ViewLivePanel = checkable_action(mainWindow, u'ViewLivePanel',
-            liveVisible)
-        actionList.add_action(self.ViewLivePanel, u'View')
-        self.ModeDefaultItem = checkable_action(mainWindow, u'ModeDefaultItem')
-        actionList.add_action(self.ModeDefaultItem, u'View Mode')
-        self.ModeSetupItem = checkable_action(mainWindow, u'ModeLiveItem')
-        actionList.add_action(self.ModeSetupItem, u'View Mode')
-        self.ModeLiveItem = checkable_action(mainWindow, u'ModeLiveItem', True)
-        actionList.add_action(self.ModeLiveItem, u'View Mode')
+            u'ViewPreviewPanel', previewVisible, u'View')
+        self.ViewLivePanel = checkable_action(
+            mainWindow, u'ViewLivePanel', liveVisible, u'View')
+        self.ModeDefaultItem = checkable_action(
+            mainWindow, u'ModeDefaultItem', category=u'View Mode')
+        self.ModeSetupItem = checkable_action(
+            mainWindow, u'ModeLiveItem', category=u'View Mode')
+        self.ModeLiveItem = checkable_action(
+            mainWindow, u'ModeLiveItem', True, u'View Mode')
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
-            u':/tools/tools_add.png')
-        actionList.add_action(self.ToolsAddToolItem, u'Tools')
-        self.ToolsOpenDataFolder = icon_action(mainWindow,
-            u'ToolsOpenDataFolder', u':/general/general_open.png')
-        actionList.add_action(self.ToolsOpenDataFolder, u'Tools')
+            u':/tools/tools_add.png', category=u'Tools')
+        self.ToolsOpenDataFolder = icon_action(mainWindow, u'ToolsOpenDataFolder',
+            u':/general/general_open.png', category=u'Tools')
         self.settingsPluginListItem = icon_action(mainWindow,
-            u'settingsPluginListItem', u':/system/settings_plugin_list.png')
-        actionList.add_action(self.settingsPluginListItem,
-            u'Settings')
+            u'settingsPluginListItem', u':/system/settings_plugin_list.png',
+            category=u'Settings')
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
             u'AutoLanguageItem', LanguageManager.auto_language)
-        actionList.add_action(self.AutoLanguageItem, u'Settings')
+        #actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
         self.LanguageGroup.setObjectName(u'LanguageGroup')
@@ -241,24 +229,22 @@ class Ui_MainWindow(object):
             add_actions(self.LanguageGroup, [languageItem])
         self.SettingsShortcutsItem = icon_action(mainWindow,
             u'SettingsShortcutsItem',
-            u':/system/system_configure_shortcuts.png')
+            u':/system/system_configure_shortcuts.png', category=u'Settings')
         self.DisplayTagItem = icon_action(mainWindow,
-            u'DisplayTagItem', u':/system/tag_editor.png')
+            u'DisplayTagItem', u':/system/tag_editor.png', category=u'Settings')
         self.SettingsConfigureItem = icon_action(mainWindow,
-            u'SettingsConfigureItem', u':/system/system_settings.png')
-        actionList.add_action(self.SettingsShortcutsItem,
-            u'Settings')
+            u'SettingsConfigureItem', u':/system/system_settings.png',
+            category=u'Settings')
         self.HelpDocumentationItem = icon_action(mainWindow,
-            u'HelpDocumentationItem', u':/system/system_help_contents.png')
+            u'HelpDocumentationItem', u':/system/system_help_contents.png',
+            category=None)#u'Help')
         self.HelpDocumentationItem.setEnabled(False)
-        actionList.add_action(self.HelpDocumentationItem, u'Help')
         self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
-            u':/system/system_about.png')
-        actionList.add_action(self.HelpAboutItem, u'Help')
-        self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem')
-        actionList.add_action(self.HelpOnlineHelpItem, u'Help')
-        self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem')
-        actionList.add_action(self.helpWebSiteItem, u'Help')
+            u':/system/system_about.png', category=None)#u'Help')
+        self.HelpOnlineHelpItem = base_action(
+            mainWindow, u'HelpOnlineHelpItem', category=u'Help')
+        self.helpWebSiteItem = base_action(
+            mainWindow, u'helpWebSiteItem', category=u'Help')
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
         add_actions(self.FileExportMenu,
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index a61dd41ed..071482f95 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -45,6 +45,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 #TODO: ability to remove actions
 #TODO: Save shortcuts
 #TODO: doc
+#TODO: Fix Preview/Live controller (have the same shortcut)
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -89,7 +90,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         # The dialog is opened the first time
         if self.treeWidget.topLevelItemCount() == 0:
             QtCore.QObject.connect(actionList.signal,
-                QtCore.SIGNAL(u'addedAction()'), self.initialiseActionList)
+                QtCore.SIGNAL(u'addedAction()'), self.asdf)
             self.initialiseActionList()
         self.refreshActionList()
         return QtGui.QDialog.exec_(self)
@@ -125,6 +126,18 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
 
+    def asdf(self, action, category):
+        print action
+        for category in actionList.categories:
+            item = QtGui.QTreeWidgetItem([category.name])
+            for action in category.actions:
+                actionItem = QtGui.QTreeWidgetItem()
+                actionItem.setIcon(0, action.icon())
+                actionItem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(action))
+                item.addChild(actionItem)
+            item.setExpanded(True)
+            self.treeWidget.addTopLevelItem(item)
+
     def onShortcutButtonClicked(self, toggled):
         if toggled:
             return
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 1ae84e950..cafbec198 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -156,15 +156,15 @@ class SlideController(QtGui.QWidget):
             self.hideMenu.setMenu(QtGui.QMenu(
                 translate('OpenLP.SlideController', 'Hide'), self.toolbar))
             self.blankScreen = icon_action(self.hideMenu, u'Blank Screen',
-                u':/slides/slide_blank.png', False)
+                u':/slides/slide_blank.png', False, u'Live Toolbar')
             self.blankScreen.setText(
                 translate('OpenLP.SlideController', 'Blank Screen'))
             self.themeScreen = icon_action(self.hideMenu, u'Blank Theme',
-                u':/slides/slide_theme.png', False)
+                u':/slides/slide_theme.png', False, u'Live Toolbar')
             self.themeScreen.setText(
                 translate('OpenLP.SlideController', 'Blank to Theme'))
             self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
-                u':/slides/slide_desktop.png', False)
+                u':/slides/slide_desktop.png', False, u'Live Toolbar')
             self.desktopScreen.setText(
                 translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)
@@ -364,30 +364,27 @@ class SlideController(QtGui.QWidget):
 
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, 0])
-        actionList.add_action(self.previousItem, u'Preview')
+        actionList.add_action(self.previousItem, u'Preview Toolbar')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, 0])
-        actionList.add_action(self.nextItem, u'Preview')
+        actionList.add_action(self.nextItem, u'Preview Toolbar')
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
         self.previousItem.setShortcutContext(
             QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.previousItem, u'Live')
+        actionList.add_action(self.previousItem, u'Live Toolbar')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.nextItem, u'Live')
+        actionList.add_action(self.nextItem, u'Live Toolbar')
         self.previousService = shortcut_action(parent,
             translate('OpenLP.SlideController', 'Previous Service'),
-            [QtCore.Qt.Key_Left, 0], self.servicePrevious)
-        actionList.add_action(self.previousService, u'Live')
+            [QtCore.Qt.Key_Left, 0], self.servicePrevious, u'Live Toolbar')
         self.nextService = shortcut_action(parent,
             translate('OpenLP.SlideController', 'Next Service'),
-            [QtCore.Qt.Key_Right, 0], self.serviceNext)
-        actionList.add_action(self.nextService, u'Live')
+            [QtCore.Qt.Key_Right, 0], self.serviceNext, u'Live Toolbar')
         self.escapeItem = shortcut_action(parent,
             translate('OpenLP.SlideController', 'Escape Item'),
-            [QtCore.Qt.Key_Escape, 0], self.liveEscape)
-        actionList.add_action(self.escapeItem, u'Live')
+            [QtCore.Qt.Key_Escape, 0], self.liveEscape, u'Live Toolbar')
 
     def liveEscape(self):
         self.display.setVisible(False)
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 3c639297e..1bc7037ae 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -495,7 +495,7 @@ def get_uno_instance(resolver):
 from languagemanager import LanguageManager
 from actions import ActionList
 
-__all__ = [u'AppLocation', u'check_latest_version', u'add_actions',
-    u'get_filesystem_encoding', u'LanguageManager', u'ActionList',
-    u'get_web_page', u'file_is_unicode', u'string_is_unicode',
+__all__ = [u'AppLocation', u'get_application_version', u'check_latest_version',
+    u'add_actions', u'get_filesystem_encoding', u'LanguageManager',
+    u'ActionList', u'get_web_page', u'file_is_unicode', u'string_is_unicode',
     u'get_uno_command', u'get_uno_instance', u'delete_file']
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index ba4a7b40d..b592c9a69 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -184,7 +184,7 @@ class ActionList(object):
             self.categories[category].actions.append(action)
         else:
             self.categories[category].actions.add(action, weight)
-        self.signal.emit(QtCore.SIGNAL(u'addedAction()'))
+        self.signal.emit(QtCore.SIGNAL(u'addedAction(QtGui.QAction, QString)'), action, QtCore.QString(category))
 
 
 class Emit(QtCore.QObject):
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 2d22d2d5a..c397fb9c4 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -62,7 +62,6 @@ class AlertsPlugin(Plugin):
         log.info(u'add tools menu')
         self.toolsAlertItem = icon_action(tools_menu, u'toolsAlertItem',
             u':/plugins/plugin_alerts.png')
-        actionList.add_action(self.toolsAlertItem, u'Extra')
         self.toolsAlertItem.setText(translate('AlertsPlugin', '&Alert'))
         self.toolsAlertItem.setStatusTip(
             translate('AlertsPlugin', 'Show an alert message.'))
@@ -76,6 +75,7 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
+        actionList.add_action(self.toolsAlertItem, u'Tools')
         self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
@@ -86,6 +86,7 @@ class AlertsPlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.toolsAlertItem.setVisible(False)
+        #TODO: remove the action from the actionList
 
     def toggleAlertsState(self):
         self.alertsActive = not self.alertsActive

From b9b0cbbe9c3492f3aa6403f09cea64631d789455 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 29 Mar 2011 21:52:21 +0200
Subject: [PATCH 03/47] removed things, as this did not work

---
 openlp/core/ui/mainwindow.py         |  6 +--
 openlp/core/ui/shortcutlistdialog.py |  2 +
 openlp/core/ui/shortcutlistform.py   | 58 +++++++++++++++-------------
 openlp/core/utils/actions.py         |  9 -----
 openlp/plugins/songs/songsplugin.py  | 14 +++----
 5 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index c37db0b97..cf58dedd8 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -177,11 +177,11 @@ class Ui_MainWindow(object):
         self.ImportThemeItem = base_action(
             mainWindow, u'ImportThemeItem', u'Import')
         self.ImportLanguageItem = base_action(
-            mainWindow, u'ImportLanguageItem', u'Import')
+            mainWindow, u'ImportLanguageItem')#, u'Import')
         self.ExportThemeItem = base_action(
             mainWindow, u'ExportThemeItem', u'Export')
         self.ExportLanguageItem = base_action(
-            mainWindow, u'ExportLanguageItem', u'Export')
+            mainWindow, u'ExportLanguageItem')#, u'Export')
         self.ViewMediaManagerItem = icon_action(mainWindow,
             u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
             self.mediaManagerDock.isVisible(), u'View')
@@ -240,7 +240,7 @@ class Ui_MainWindow(object):
             category=None)#u'Help')
         self.HelpDocumentationItem.setEnabled(False)
         self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
-            u':/system/system_about.png', category=None)#u'Help')
+            u':/system/system_about.png', category=u'Help')
         self.HelpOnlineHelpItem = base_action(
             mainWindow, u'HelpOnlineHelpItem', category=u'Help')
         self.helpWebSiteItem = base_action(
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 4e5b9e270..4e0d7d144 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -30,6 +30,7 @@ from openlp.core.lib import translate, build_icon
 
 class Ui_ShortcutListDialog(object):
     def setupUi(self, shortcutListDialog):
+        shortcutListDialog.resize(440, 450)
         shortcutListDialog.setObjectName(u'shortcutListDialog')
         self.dialogLayout = QtGui.QVBoxLayout(shortcutListDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
@@ -52,6 +53,7 @@ class Ui_ShortcutListDialog(object):
             build_icon(u':/system/system_configure_shortcuts.png'))
         self.shortcutButton.setCheckable(True)
         self.shortcutButton.setObjectName(u'shortcutButton')
+        self.shortcutButton.setFixedSize(150, 30)
         self.customLayout.addWidget(self.shortcutButton)
         self.clearShortcutButton = QtGui.QToolButton(shortcutListDialog)
         self.clearShortcutButton.setIcon(
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 83b5de84b..4d785cfc0 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -41,10 +41,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     """
     The shortcut list dialog
     """
-#TODO: do not close on ESC
-#TODO: ability to remove actions
-#TODO: Save shortcuts
-#TODO: doc
+#TODO: do not close on ESC, ability to remove actions, save/load shortcuts, docs
 #TODO: Fix Preview/Live controller (have the same shortcut)
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
@@ -87,21 +84,17 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.shortcutButton.setChecked(False)
 
     def exec_(self):
-        # The dialog is opened the first time
-        if self.treeWidget.topLevelItemCount() == 0:
-            QtCore.QObject.connect(actionList.signal,
-                QtCore.SIGNAL(u'addedAction()'), self.initialiseActionList)
-            self.initialiseActionList()
         self.refreshActionList()
         return QtGui.QDialog.exec_(self)
 
     def refreshActionList(self):
+        # As refreshing does not work, the check does not work either.
         self.assingedShortcuts = []
-        iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
-        while iterator.value():
-            treewidgetItem = iterator.value()
-            action = treewidgetItem.data(0, QtCore.Qt.UserRole).toPyObject()
-            if action is not None:
+        #self.treeWidget.clear()
+        for category in actionList.categories:
+            item = QtGui.QTreeWidgetItem([category.name])
+            for action in category.actions:
+                self.assingedShortcuts.extend(action.shortcuts())
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
                 if len(action.shortcuts()) == 2:
                     shortcutText = action.shortcuts()[0].toString()
@@ -109,19 +102,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 else:
                     shortcutText = action.shortcut().toString()
                     alternateText = u''
-                self.assingedShortcuts.extend(action.shortcuts())
-                treewidgetItem.setText(0, actionText)
-                treewidgetItem.setText(1, shortcutText)
-                treewidgetItem.setText(2,  alternateText)
-            iterator += 1
-
-    def initialiseActionList(self):
-        for category in actionList.categories:
-            item = QtGui.QTreeWidgetItem([category.name])
-            for action in category.actions:
-                actionItem = QtGui.QTreeWidgetItem()
+                actionItem = QtGui.QTreeWidgetItem(
+                    [actionText, shortcutText, alternateText])
                 actionItem.setIcon(0, action.icon())
-                actionItem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(action))
+                actionItem.setData(0,
+                    QtCore.Qt.UserRole, QtCore.QVariant(action))
                 item.addChild(actionItem)
             item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
@@ -135,13 +120,16 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         # TODO: Sort out which shortcuts should be kept.
         action.setShortcuts(QtGui.QKeySequence(self.shortcutButton.text()))
+        item.setText(1, self.shortcutButton.text())
         self.refreshActionList()
 
     def onItemPressed(self, item, column):
         item = self.treeWidget.currentItem()
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        self.shortcutButton.setEnabled(action is not None)
         if action is None:
             text = u''
+            self.shortcutButton.setChecked(False)
         else:
             if len(action.shortcuts()) == 0:
                text = u''
@@ -150,3 +138,21 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             else:
                 text = action.shortcuts()[0].toString()
         self.shortcutButton.setText(text)
+
+    def saveShortcuts(self):
+        """
+        Save the shortcuts.
+        """
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'shortcuts')
+        # TODO: Save shortcuts
+        settings.endGroup()
+
+    def loadShortcuts(self):
+        """
+        Load the shortcuts.
+        """
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'shortcuts')
+        # TODO: Load shortcuts
+        settings.endGroup()
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index ba4a7b40d..69aeb14b4 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -27,8 +27,6 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
-from PyQt4 import QtCore
-
 class ActionCategory(object):
     """
     The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
@@ -175,7 +173,6 @@ class ActionList(object):
     """
     def __init__(self):
         self.categories = CategoryList()
-        self.signal = Emit()
 
     def add_action(self, action, category=u'Default', weight=None):
         if category not in self.categories:
@@ -184,11 +181,5 @@ class ActionList(object):
             self.categories[category].actions.append(action)
         else:
             self.categories[category].actions.add(action, weight)
-        self.signal.emit(QtCore.SIGNAL(u'addedAction()'))
-
-
-class Emit(QtCore.QObject):
-    def __init__(self):
-        QtCore.QObject.__init__(self)
 
 actionList = ActionList()
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 1260a832b..e1731bc01 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -33,7 +33,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
     Receiver
 from openlp.core.lib.db import Manager
-from openlp.core.lib.ui import UiStrings
+from openlp.core.lib.ui import UiStrings, base_action, icon_action
 from openlp.plugins.songs.lib import clean_song, SongMediaItem, SongsTab
 from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
@@ -78,8 +78,8 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongImportItem = QtGui.QAction(import_menu)
-        self.SongImportItem.setObjectName(u'SongImportItem')
+        self.SongImportItem = base_action(
+            import_menu, u'SongImportItem', u'Import')
         self.SongImportItem.setText(translate(
             'SongsPlugin', '&Song'))
         self.SongImportItem.setToolTip(translate('SongsPlugin',
@@ -99,8 +99,7 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongExportItem = QtGui.QAction(export_menu)
-        self.SongExportItem.setObjectName(u'SongExportItem')
+        self.SongExportItem = base_action(export_menu, u'SongExportItem', u'Export')
         self.SongExportItem.setText(translate(
             'SongsPlugin', '&Song'))
         self.SongExportItem.setToolTip(translate('SongsPlugin',
@@ -120,9 +119,8 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         log.info(u'add tools menu')
-        self.toolsReindexItem = QtGui.QAction(tools_menu)
-        self.toolsReindexItem.setIcon(build_icon(u':/plugins/plugin_songs.png'))
-        self.toolsReindexItem.setObjectName(u'toolsReindexItem')
+        self.toolsReindexItem = icon_action(tools_menu, u'toolsReindexItem',
+            u':/plugins/plugin_songs.png', category=u'Tools')
         self.toolsReindexItem.setText(
             translate('SongsPlugin', '&Re-index Songs'))
         self.toolsReindexItem.setStatusTip(

From e20fd7d85d62707d3b6e78858aaa0174fc0ccba4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 29 Mar 2011 21:58:04 +0200
Subject: [PATCH 04/47] clean up

---
 openlp/core/ui/mainwindow.py       | 2 --
 openlp/core/ui/shortcutlistform.py | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index cf58dedd8..f4cec4ae7 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -39,7 +39,6 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     get_application_version
-#from openlp.core.utils.actions import actionList
 
 log = logging.getLogger(__name__)
 
@@ -216,7 +215,6 @@ class Ui_MainWindow(object):
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
             u'AutoLanguageItem', LanguageManager.auto_language)
-        #actionList.add_action(self.AutoLanguageItem, u'Settings')
         self.LanguageGroup = QtGui.QActionGroup(mainWindow)
         self.LanguageGroup.setExclusive(True)
         self.LanguageGroup.setObjectName(u'LanguageGroup')
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 4d785cfc0..2dbb57f2d 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -41,8 +41,10 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     """
     The shortcut list dialog
     """
-#TODO: do not close on ESC, ability to remove actions, save/load shortcuts, docs
-#TODO: Fix Preview/Live controller (have the same shortcut)
+#TODO: do not close on ESC, ability to remove actions (e. g. reindex tool)
+#TODO: save/load shortcuts, docs
+#TODO: Fix Preview/Live controller (have the same shortcut), make sure
+
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)

From 9b939bb9624eca001999b65b87adcc9987ecf070 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 12:12:39 +0200
Subject: [PATCH 05/47] fixed reloading

---
 openlp/core/ui/shortcutlistform.py |  5 ++---
 openlp/core/utils/actions.py       | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 2dbb57f2d..b524c5d06 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -90,12 +90,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         return QtGui.QDialog.exec_(self)
 
     def refreshActionList(self):
-        # As refreshing does not work, the check does not work either.
         self.assingedShortcuts = []
-        #self.treeWidget.clear()
+        self.treeWidget.clear()
         for category in actionList.categories:
             item = QtGui.QTreeWidgetItem([category.name])
-            for action in category.actions:
+            for action, default in category.actions:
                 self.assingedShortcuts.extend(action.shortcuts())
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
                 if len(action.shortcuts()) == 2:
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 69aeb14b4..cbfa3a488 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -27,9 +27,9 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
-class ActionCategory(object):
+class Category(object):
     """
-    The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
+    The :class:`~openlp.core.utils.Category` class encapsulates a
     category for the :class:`~openlp.core.utils.CategoryList` class.
     """
     def __init__(self, name, weight=0):
@@ -67,10 +67,11 @@ class CategoryActionList(object):
         Python 3 "next" method.
         """
         if self.index >= len(self.actions):
+            self.index = 0
             raise StopIteration
         else:
             self.index += 1
-            return self.actions[self.index - 1][1]
+            return self.actions[self.index - 1][1:]
 
     def next(self):
         """
@@ -91,7 +92,7 @@ class CategoryActionList(object):
         self.add(name, weight)
 
     def add(self, action, weight=0):
-        self.actions.append((weight, action))
+        self.actions.append((weight, action, action.shortcuts()))
         self.actions.sort(key=lambda act: act[0])
 
 
@@ -126,6 +127,7 @@ class CategoryList(object):
         Python 3 "next" method for iterator.
         """
         if self.index >= len(self.categories):
+            self.index = 0
             raise StopIteration
         else:
             self.index += 1
@@ -153,7 +155,7 @@ class CategoryList(object):
             self.add(name, weight)
 
     def add(self, name, weight=0, actions=None):
-        category = ActionCategory(name, weight)
+        category = Category(name, weight)
         if actions:
             for action in actions:
                 if isinstance(action, tuple):

From fe92842c6b656610190791221b99c87d31898f1a Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 12:27:27 +0200
Subject: [PATCH 06/47] added ability to remove actions

---
 openlp/core/ui/shortcutlistform.py    |  4 ++--
 openlp/core/utils/actions.py          | 17 ++++++++++++++---
 openlp/plugins/alerts/alertsplugin.py |  2 +-
 openlp/plugins/songs/songsplugin.py   | 14 ++++++++++----
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index b524c5d06..fd5a53813 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -41,7 +41,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     """
     The shortcut list dialog
     """
-#TODO: do not close on ESC, ability to remove actions (e. g. reindex tool)
+#TODO: do not close on ESC
 #TODO: save/load shortcuts, docs
 #TODO: Fix Preview/Live controller (have the same shortcut), make sure
 
@@ -94,7 +94,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.treeWidget.clear()
         for category in actionList.categories:
             item = QtGui.QTreeWidgetItem([category.name])
-            for action, default in category.actions:
+            for action in category.actions:
                 self.assingedShortcuts.extend(action.shortcuts())
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
                 if len(action.shortcuts()) == 2:
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index cbfa3a488..8887a7e30 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -71,7 +71,7 @@ class CategoryActionList(object):
             raise StopIteration
         else:
             self.index += 1
-            return self.actions[self.index - 1][1:]
+            return self.actions[self.index - 1][1]
 
     def next(self):
         """
@@ -92,9 +92,15 @@ class CategoryActionList(object):
         self.add(name, weight)
 
     def add(self, action, weight=0):
-        self.actions.append((weight, action, action.shortcuts()))
+        self.actions.append((weight, action))
         self.actions.sort(key=lambda act: act[0])
 
+    def remove(self, remove_action):
+        for action in self.actions:
+            if action[1] == remove_action:
+                self.actions.remove(action)
+                return
+
 
 class CategoryList(object):
     """
@@ -176,7 +182,7 @@ class ActionList(object):
     def __init__(self):
         self.categories = CategoryList()
 
-    def add_action(self, action, category=u'Default', weight=None):
+    def add_action(self, action, category, weight=None):
         if category not in self.categories:
             self.categories.append(category)
         if weight is None:
@@ -184,4 +190,9 @@ class ActionList(object):
         else:
             self.categories[category].actions.add(action, weight)
 
+    def remove_action(self, action, category):
+        if category not in self.categories:
+            return
+        self.categories[category].actions.remove(action)
+
 actionList = ActionList()
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index c397fb9c4..a10d56a20 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -86,7 +86,7 @@ class AlertsPlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.toolsAlertItem.setVisible(False)
-        #TODO: remove the action from the actionList
+        actionList.remove_action(self.toolsAlertItem, u'Tools')
 
     def toggleAlertsState(self):
         self.alertsActive = not self.alertsActive
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index e1731bc01..e5ce25906 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -34,6 +34,7 @@ from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
     Receiver
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import UiStrings, base_action, icon_action
+from openlp.core.utils.actions import actionList
 from openlp.plugins.songs.lib import clean_song, SongMediaItem, SongsTab
 from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
@@ -65,6 +66,9 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Initialising')
         Plugin.initialise(self)
         self.toolsReindexItem.setVisible(True)
+        actionList.add_action(self.SongImportItem, u'Import')
+        actionList.add_action(self.SongExportItem, u'Export')
+        actionList.add_action(self.toolsReindexItem, u'Tools')
         self.mediaItem.displayResultsSong(
             self.manager.get_all_objects(Song, order_by_ref=Song.search_title))
 
@@ -78,8 +82,7 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongImportItem = base_action(
-            import_menu, u'SongImportItem', u'Import')
+        self.SongImportItem = base_action(import_menu, u'SongImportItem')
         self.SongImportItem.setText(translate(
             'SongsPlugin', '&Song'))
         self.SongImportItem.setToolTip(translate('SongsPlugin',
@@ -99,7 +102,7 @@ class SongsPlugin(Plugin):
             use it as their parent.
         """
         # Main song import menu item - will eventually be the only one
-        self.SongExportItem = base_action(export_menu, u'SongExportItem', u'Export')
+        self.SongExportItem = base_action(export_menu, u'SongExportItem')
         self.SongExportItem.setText(translate(
             'SongsPlugin', '&Song'))
         self.SongExportItem.setToolTip(translate('SongsPlugin',
@@ -120,7 +123,7 @@ class SongsPlugin(Plugin):
         """
         log.info(u'add tools menu')
         self.toolsReindexItem = icon_action(tools_menu, u'toolsReindexItem',
-            u':/plugins/plugin_songs.png', category=u'Tools')
+            u':/plugins/plugin_songs.png')
         self.toolsReindexItem.setText(
             translate('SongsPlugin', '&Re-index Songs'))
         self.toolsReindexItem.setStatusTip(
@@ -257,4 +260,7 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
+        actionList.remove_action(self.SongImportItem, u'Import')
+        actionList.remove_action(self.SongExportItem, u'Export')
+        actionList.remove_action(self.toolsReindexItem, u'Tools')
         Plugin.finalise(self)

From 5ef0cc12c09cf523b8fa3563d41fc9f3261e692a Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 18:34:40 +0200
Subject: [PATCH 07/47] started working on saving/loading shortcuts

---
 openlp/core/ui/mainwindow.py         |  3 +-
 openlp/core/ui/shortcutlistdialog.py | 11 ------
 openlp/core/ui/shortcutlistform.py   | 55 ++++++++++++++++++++--------
 openlp/core/utils/actions.py         |  7 ++--
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index f4cec4ae7..d0f6338e3 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -761,7 +761,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         Show the shortcuts dialog
         """
-        self.shortcutForm.exec_()
+        if self.shortcutForm.exec_():
+            self.shortcutForm.saveShortcuts()
 
     def onModeDefaultItemClicked(self):
         """
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 4e0d7d144..467fb0534 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -39,15 +39,8 @@ class Ui_ShortcutListDialog(object):
         self.treeWidget.setObjectName(u'treeWidget')
         self.treeWidget.setColumnCount(3)
         self.dialogLayout.addWidget(self.treeWidget)
-        self.defaultButton = QtGui.QRadioButton(shortcutListDialog)
-        self.defaultButton.setChecked(True)
-        self.defaultButton.setObjectName(u'defaultButton')
-        self.dialogLayout.addWidget(self.defaultButton)
         self.customLayout = QtGui.QHBoxLayout()
         self.customLayout.setObjectName(u'customLayout')
-        self.customButton = QtGui.QRadioButton(shortcutListDialog)
-        self.customButton.setObjectName(u'customButton')
-        self.customLayout.addWidget(self.customButton)
         self.shortcutButton = QtGui.QPushButton(shortcutListDialog)
         self.shortcutButton.setIcon(
             build_icon(u':/system/system_configure_shortcuts.png'))
@@ -82,9 +75,5 @@ class Ui_ShortcutListDialog(object):
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
             translate('OpenLP.ShortcutListDialog', 'Alternate')])
-        self.defaultButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Default: %s'))
-        self.customButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Custom:'))
         self.shortcutButton.setText(
             translate('OpenLP.ShortcutListDialog', 'None'))
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index fd5a53813..127569f24 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -49,6 +49,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         self.assingedShortcuts = []
+        self.column = -1
         self.shortcutButton.setText(u'')
         QtCore.QObject.connect(self.shortcutButton,
             QtCore.SIGNAL(u'toggled(bool)'), self.onShortcutButtonClicked)
@@ -119,25 +120,40 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
-        # TODO: Sort out which shortcuts should be kept.
-        action.setShortcuts(QtGui.QKeySequence(self.shortcutButton.text()))
-        item.setText(1, self.shortcutButton.text())
-        self.refreshActionList()
+        shortcuts = []
+        if self.column == 1:
+            # We are changing the primary shortcut.
+            shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            if len(action.shortcuts()) == 2:
+                shortcuts.append(action.shortcuts()[1])
+            else:
+                shortcuts.append(0)
+            item.setText(1, self.shortcutButton.text())
+        elif self.column == 2:
+            # We are changing the secondary shortcut.
+            if len(action.shortcuts()) == 1:
+                shortcuts.append(action.shortcuts()[0])
+            else:
+                shortcuts.append(0)
+            shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            item.setText(2, self.shortcutButton.text())
+        else:
+            return
+        action.setShortcuts(shortcuts)
 
     def onItemPressed(self, item, column):
+        self.column = column
         item = self.treeWidget.currentItem()
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
-        self.shortcutButton.setEnabled(action is not None)
-        if action is None:
-            text = u''
-            self.shortcutButton.setChecked(False)
-        else:
-            if len(action.shortcuts()) == 0:
-               text = u''
-            elif len(action.shortcuts()) == 2 and column == 2:
-                text = action.shortcuts()[1].toString()
-            else:
-                text = action.shortcuts()[0].toString()
+        self.shortcutButton.setEnabled(True)
+        text = u''
+        if action is None or column not in [1, 2] or \
+            len(action.shortcuts()) == 0:
+            self.shortcutButton.setEnabled(False)
+        elif column == 1:
+            text = action.shortcuts()[0].toString()
+        elif len(action.shortcuts()) == 2:
+            text = action.shortcuts()[1].toString()
         self.shortcutButton.setText(text)
 
     def saveShortcuts(self):
@@ -146,7 +162,12 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
-        # TODO: Save shortcuts
+        for category in actionList.categories:
+            break
+            for action in category.actions:
+                if action.defaultShortcuts != action.shortcuts():
+                    settings.setValue(action.text(),
+                    QtCore.QVariant(action.shortcuts()))
         settings.endGroup()
 
     def loadShortcuts(self):
@@ -155,5 +176,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
+        for shortcut in settings.allKeys():
+            pass
         # TODO: Load shortcuts
         settings.endGroup()
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 8887a7e30..d94ee1511 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -27,9 +27,9 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
-class Category(object):
+class ActionCategory(object):
     """
-    The :class:`~openlp.core.utils.Category` class encapsulates a
+    The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
     category for the :class:`~openlp.core.utils.CategoryList` class.
     """
     def __init__(self, name, weight=0):
@@ -161,7 +161,7 @@ class CategoryList(object):
             self.add(name, weight)
 
     def add(self, name, weight=0, actions=None):
-        category = Category(name, weight)
+        category = ActionCategory(name, weight)
         if actions:
             for action in actions:
                 if isinstance(action, tuple):
@@ -185,6 +185,7 @@ class ActionList(object):
     def add_action(self, action, category, weight=None):
         if category not in self.categories:
             self.categories.append(category)
+        action.defaultShortcuts = action.shortcuts()
         if weight is None:
             self.categories[category].actions.append(action)
         else:

From 772bd8eb66daa57a0c9b8759cbad4b11e22f9282 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 19:50:36 +0200
Subject: [PATCH 08/47] basic saving and loading of shortcuts

---
 openlp/core/ui/mainwindow.py       |  2 +-
 openlp/core/ui/shortcutlistform.py | 33 +++++++++---------------------
 openlp/core/utils/actions.py       | 12 +++++++++++
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index d0f6338e3..1fdf0fd76 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -762,7 +762,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         Show the shortcuts dialog
         """
         if self.shortcutForm.exec_():
-            self.shortcutForm.saveShortcuts()
+            self.shortcutForm.save()
 
     def onModeDefaultItemClicked(self):
         """
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 127569f24..15c6c53e5 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -87,10 +87,10 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.shortcutButton.setChecked(False)
 
     def exec_(self):
-        self.refreshActionList()
+        self.reloadActionList()
         return QtGui.QDialog.exec_(self)
 
-    def refreshActionList(self):
+    def reloadActionList(self):
         self.assingedShortcuts = []
         self.treeWidget.clear()
         for category in actionList.categories:
@@ -147,36 +147,23 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         self.shortcutButton.setEnabled(True)
         text = u''
-        if action is None or column not in [1, 2] or \
-            len(action.shortcuts()) == 0:
+        if action is None or column not in [1, 2]:
             self.shortcutButton.setEnabled(False)
-        elif column == 1:
+        elif column == 1 and len(action.shortcuts()) != 0:
             text = action.shortcuts()[0].toString()
-        elif len(action.shortcuts()) == 2:
+        elif len(action.shortcuts()) == 2 and len(action.shortcuts()) != 0:
             text = action.shortcuts()[1].toString()
         self.shortcutButton.setText(text)
 
-    def saveShortcuts(self):
+    def save(self):
         """
-        Save the shortcuts.
+        Save the shortcuts. **Note**, that we do not have to load the shortcuts,
+        as they are loaded in :class:`~openlp.core.utils.ActionList`.
         """
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
         for category in actionList.categories:
-            break
             for action in category.actions:
-                if action.defaultShortcuts != action.shortcuts():
-                    settings.setValue(action.text(),
-                    QtCore.QVariant(action.shortcuts()))
-        settings.endGroup()
-
-    def loadShortcuts(self):
-        """
-        Load the shortcuts.
-        """
-        settings = QtCore.QSettings()
-        settings.beginGroup(u'shortcuts')
-        for shortcut in settings.allKeys():
-            pass
-        # TODO: Load shortcuts
+                settings.setValue(
+                    action.objectName(), QtCore.QVariant(action.shortcuts()))
         settings.endGroup()
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index d94ee1511..6b7df6817 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -27,6 +27,10 @@
 The :mod:`~openlp.core.utils.actions` module provides action list classes used
 by the shortcuts system.
 """
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+
 class ActionCategory(object):
     """
     The :class:`~openlp.core.utils.ActionCategory` class encapsulates a
@@ -190,6 +194,14 @@ class ActionList(object):
             self.categories[category].actions.append(action)
         else:
             self.categories[category].actions.add(action, weight)
+        # Load the shortcut from the config.
+        settings = QtCore.QSettings()
+        settings.beginGroup(u'shortcuts')
+        shortcuts = settings.value(action.objectName(),
+            QtCore.QVariant(action.shortcuts())).toStringList()
+        action.setShortcuts(
+            [QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
+        settings.endGroup()
 
     def remove_action(self, action, category):
         if category not in self.categories:

From bf2a9d338b25dbce73ed0c3f4ec2a2724e9a2b96 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 20:12:05 +0200
Subject: [PATCH 09/47] clean up

---
 openlp/core/lib/ui.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 86def01d8..44bf7c0dd 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -242,6 +242,11 @@ def create_up_down_push_button_set(parent):
 def base_action(parent, name, category=None):
     """
     Return the most basic action with the object name set.
+
+    ``category``
+        The category the action should be listed in the shortcut dialog. If you
+        not wish, that this action is added to the shortcut dialog, then do not
+        state any.
     """
     action = QtGui.QAction(parent)
     action.setObjectName(name)
@@ -262,11 +267,6 @@ def checkable_action(parent, name, checked=None, category=None):
 def icon_action(parent, name, icon, checked=None, category=None):
     """
     Return a standard action with an icon.
-
-    ``category``
-        The category the action should be listed in the shortcut dialog. If you
-        not wish, that this action is added to the shortcut dialog, then do not
-        state any.
     """
     if checked is not None:
         action = checkable_action(parent, name, checked, category)

From fb78350a44f421e3bb8b4b3184e51eeb2194fc61 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 20:27:33 +0200
Subject: [PATCH 10/47] added bible actions

---
 openlp/plugins/bibles/bibleplugin.py | 16 +++++++++-------
 openlp/plugins/songs/songsplugin.py  |  6 ++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 4f677f211..86d751e9a 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -29,6 +29,8 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import base_action
+from openlp.core.utils.actions import actionList
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 log = logging.getLogger(__name__)
@@ -50,6 +52,9 @@ class BiblePlugin(Plugin):
             self.manager = BibleManager(self)
         Plugin.initialise(self)
         self.importBibleItem.setVisible(True)
+        actionList.add_action(self.importBibleItem, u'Import')
+        # Do not add the action to the list yet.
+        #actionList.add_action(self.exportBibleItem, u'Export')
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
 
@@ -64,21 +69,18 @@ class BiblePlugin(Plugin):
         self.exportBibleItem.setVisible(False)
 
     def addImportMenuItem(self, import_menu):
-        self.importBibleItem = QtGui.QAction(import_menu)
-        self.importBibleItem.setObjectName(u'importBibleItem')
+        self.importBibleItem = base_action(import_menu, u'importBibleItem')
+        self.importBibleItem.setText(translate('BiblesPlugin', '&Bible'))
         import_menu.addAction(self.importBibleItem)
-        self.importBibleItem.setText(
-            translate('BiblesPlugin', '&Bible'))
         # signals and slots
         QtCore.QObject.connect(self.importBibleItem,
             QtCore.SIGNAL(u'triggered()'), self.onBibleImportClick)
         self.importBibleItem.setVisible(False)
 
     def addExportMenuItem(self, export_menu):
-        self.exportBibleItem = QtGui.QAction(export_menu)
-        self.exportBibleItem.setObjectName(u'exportBibleItem')
-        export_menu.addAction(self.exportBibleItem)
+        self.exportBibleItem = base_action(export_menu, u'exportBibleItem')
         self.exportBibleItem.setText(translate('BiblesPlugin', '&Bible'))
+        export_menu.addAction(self.exportBibleItem)
         self.exportBibleItem.setVisible(False)
 
     def onBibleImportClick(self):
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index e5ce25906..12462428e 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -83,8 +83,7 @@ class SongsPlugin(Plugin):
         """
         # Main song import menu item - will eventually be the only one
         self.SongImportItem = base_action(import_menu, u'SongImportItem')
-        self.SongImportItem.setText(translate(
-            'SongsPlugin', '&Song'))
+        self.SongImportItem.setText(translate('SongsPlugin', '&Song'))
         self.SongImportItem.setToolTip(translate('SongsPlugin',
             'Import songs using the import wizard.'))
         import_menu.addAction(self.SongImportItem)
@@ -103,8 +102,7 @@ class SongsPlugin(Plugin):
         """
         # Main song import menu item - will eventually be the only one
         self.SongExportItem = base_action(export_menu, u'SongExportItem')
-        self.SongExportItem.setText(translate(
-            'SongsPlugin', '&Song'))
+        self.SongExportItem.setText(translate('SongsPlugin', '&Song'))
         self.SongExportItem.setToolTip(translate('SongsPlugin',
             'Exports songs using the export wizard.'))
         export_menu.addAction(self.SongExportItem)

From bba2f2c604245e959dd27d336950624e095454e9 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Wed, 30 Mar 2011 20:52:21 +0200
Subject: [PATCH 11/47] docs

---
 openlp/core/ui/shortcutlistform.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 15c6c53e5..97d21bebf 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -42,9 +42,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     The shortcut list dialog
     """
 #TODO: do not close on ESC
-#TODO: save/load shortcuts, docs
-#TODO: Fix Preview/Live controller (have the same shortcut), make sure
-
+#TODO: Fix Preview/Live controller (have the same shortcut)
+#TODO: double click event
+#TODO: refresh self.assingedShortcuts
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -91,6 +91,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         return QtGui.QDialog.exec_(self)
 
     def reloadActionList(self):
+        """
+        Reload the ``treeWidget`` list to add new and remove old actions.
+        """
         self.assingedShortcuts = []
         self.treeWidget.clear()
         for category in actionList.categories:
@@ -114,6 +117,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.treeWidget.addTopLevelItem(item)
 
     def onShortcutButtonClicked(self, toggled):
+        """
+        Save the new shortcut to the action if the button is unchanged.
+        """
         if toggled:
             return
         item = self.treeWidget.currentItem()
@@ -142,6 +148,10 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action.setShortcuts(shortcuts)
 
     def onItemPressed(self, item, column):
+        """
+        A item has been pressed. We adjust the button's text to the action's
+        shortcut which is encapsulate in the item.
+        """
         self.column = column
         item = self.treeWidget.currentItem()
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()

From 4ca738e9b3bfd8753a8d78a31c86ea5d182ff1d8 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 31 Mar 2011 10:43:19 +0200
Subject: [PATCH 12/47] staticmethod for adding/removing actions

---
 openlp/core/lib/ui.py                 |  4 ++--
 openlp/core/ui/servicemanager.py      | 20 ++++++++++----------
 openlp/core/ui/shortcutlistform.py    |  6 +++---
 openlp/core/ui/slidecontroller.py     | 10 +++++-----
 openlp/core/utils/actions.py          | 23 +++++++++++------------
 openlp/plugins/alerts/alertsplugin.py |  6 +++---
 openlp/plugins/bibles/bibleplugin.py  |  6 +++---
 openlp/plugins/songs/songsplugin.py   | 14 +++++++-------
 8 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 44bf7c0dd..a298d803b 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -31,7 +31,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon, Receiver, translate
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 
 log = logging.getLogger(__name__)
 
@@ -251,7 +251,7 @@ def base_action(parent, name, category=None):
     action = QtGui.QAction(parent)
     action.setObjectName(name)
     if category is not None:
-        actionList.add_action(action, category)
+        ActionList.add_action(action, category)
     return action
 
 def checkable_action(parent, name, checked=None, category=None):
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 1d5321e01..4bdd647ed 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -40,7 +40,7 @@ from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 
 class ServiceManagerList(QtGui.QTreeWidget):
     """
@@ -316,15 +316,15 @@ class ServiceManager(QtGui.QWidget):
         self.configUpdated()
 
     def setServiceHotkeys(self):
-        actionList.add_action(self.serviceManagerList.moveDown, u'Service')
-        actionList.add_action(self.serviceManagerList.moveUp, u'Service')
-        actionList.add_action(self.serviceManagerList.moveTop, u'Service')
-        actionList.add_action(self.serviceManagerList.moveBottom, u'Service')
-        actionList.add_action(self.serviceManagerList.makeLive, u'Service')
-        actionList.add_action(self.serviceManagerList.up, u'Service')
-        actionList.add_action(self.serviceManagerList.down, u'Service')
-        actionList.add_action(self.serviceManagerList.expand, u'Service')
-        actionList.add_action(self.serviceManagerList.collapse, u'Service')
+        ActionList.add_action(self.serviceManagerList.moveDown, u'Service')
+        ActionList.add_action(self.serviceManagerList.moveUp, u'Service')
+        ActionList.add_action(self.serviceManagerList.moveTop, u'Service')
+        ActionList.add_action(self.serviceManagerList.moveBottom, u'Service')
+        ActionList.add_action(self.serviceManagerList.makeLive, u'Service')
+        ActionList.add_action(self.serviceManagerList.up, u'Service')
+        ActionList.add_action(self.serviceManagerList.down, u'Service')
+        ActionList.add_action(self.serviceManagerList.expand, u'Service')
+        ActionList.add_action(self.serviceManagerList.collapse, u'Service')
 
 
     def setModified(self, modified=True):
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 97d21bebf..8ba78a876 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -30,7 +30,7 @@ import re
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.utils import translate
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 from shortcutlistdialog import Ui_ShortcutListDialog
 
 REMOVE_AMPERSAND = re.compile(r'&{1}')
@@ -96,7 +96,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         self.assingedShortcuts = []
         self.treeWidget.clear()
-        for category in actionList.categories:
+        for category in ActionList.categories:
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
                 self.assingedShortcuts.extend(action.shortcuts())
@@ -172,7 +172,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
-        for category in actionList.categories:
+        for category in ActionList.categories:
             for action in category.actions:
                 settings.setValue(
                     action.objectName(), QtCore.QVariant(action.shortcuts()))
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index cafbec198..bc478463c 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -34,7 +34,7 @@ from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
 from openlp.core.lib.ui import icon_action, UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 
 log = logging.getLogger(__name__)
 
@@ -364,18 +364,18 @@ class SlideController(QtGui.QWidget):
 
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, 0])
-        actionList.add_action(self.previousItem, u'Preview Toolbar')
+        ActionList.add_action(self.previousItem, u'Preview Toolbar')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, 0])
-        actionList.add_action(self.nextItem, u'Preview Toolbar')
+        ActionList.add_action(self.nextItem, u'Preview Toolbar')
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
         self.previousItem.setShortcutContext(
             QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.previousItem, u'Live Toolbar')
+        ActionList.add_action(self.previousItem, u'Live Toolbar')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.nextItem, u'Live Toolbar')
+        ActionList.add_action(self.nextItem, u'Live Toolbar')
         self.previousService = shortcut_action(parent,
             translate('OpenLP.SlideController', 'Previous Service'),
             [QtCore.Qt.Key_Left, 0], self.servicePrevious, u'Live Toolbar')
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 6b7df6817..e71aee672 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -183,17 +183,17 @@ class ActionList(object):
     has a weight by which it is sorted when iterating through the list of
     actions or categories.
     """
-    def __init__(self):
-        self.categories = CategoryList()
+    categories = CategoryList()
 
-    def add_action(self, action, category, weight=None):
-        if category not in self.categories:
-            self.categories.append(category)
+    @staticmethod
+    def add_action(action, category, weight=None):
+        if category not in ActionList.categories:
+            ActionList.categories.append(category)
         action.defaultShortcuts = action.shortcuts()
         if weight is None:
-            self.categories[category].actions.append(action)
+            ActionList.categories[category].actions.append(action)
         else:
-            self.categories[category].actions.add(action, weight)
+            ActionList.categories[category].actions.add(action, weight)
         # Load the shortcut from the config.
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
@@ -203,9 +203,8 @@ class ActionList(object):
             [QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
         settings.endGroup()
 
-    def remove_action(self, action, category):
-        if category not in self.categories:
+    @staticmethod
+    def remove_action(action, category):
+        if category not in ActionList.categories:
             return
-        self.categories[category].actions.remove(action)
-
-actionList = ActionList()
+        ActionList.categories[category].actions.remove(action)
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index a10d56a20..45e1969f4 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import icon_action
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
 from openlp.plugins.alerts.forms import AlertForm
@@ -75,7 +75,7 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
-        actionList.add_action(self.toolsAlertItem, u'Tools')
+        ActionList.add_action(self.toolsAlertItem, u'Tools')
         self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
@@ -86,7 +86,7 @@ class AlertsPlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.toolsAlertItem.setVisible(False)
-        actionList.remove_action(self.toolsAlertItem, u'Tools')
+        ActionList.remove_action(self.toolsAlertItem, u'Tools')
 
     def toggleAlertsState(self):
         self.alertsActive = not self.alertsActive
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 86d751e9a..1396d4550 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -30,7 +30,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.ui import base_action
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 log = logging.getLogger(__name__)
@@ -52,9 +52,9 @@ class BiblePlugin(Plugin):
             self.manager = BibleManager(self)
         Plugin.initialise(self)
         self.importBibleItem.setVisible(True)
-        actionList.add_action(self.importBibleItem, u'Import')
+        ActionList.add_action(self.importBibleItem, u'Import')
         # Do not add the action to the list yet.
-        #actionList.add_action(self.exportBibleItem, u'Export')
+        #ActionList.add_action(self.exportBibleItem, u'Export')
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
 
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 12462428e..de0714d5e 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -34,7 +34,7 @@ from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
     Receiver
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import UiStrings, base_action, icon_action
-from openlp.core.utils.actions import actionList
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.songs.lib import clean_song, SongMediaItem, SongsTab
 from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
@@ -66,9 +66,9 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Initialising')
         Plugin.initialise(self)
         self.toolsReindexItem.setVisible(True)
-        actionList.add_action(self.SongImportItem, u'Import')
-        actionList.add_action(self.SongExportItem, u'Export')
-        actionList.add_action(self.toolsReindexItem, u'Tools')
+        ActionList.add_action(self.SongImportItem, u'Import')
+        ActionList.add_action(self.SongExportItem, u'Export')
+        ActionList.add_action(self.toolsReindexItem, u'Tools')
         self.mediaItem.displayResultsSong(
             self.manager.get_all_objects(Song, order_by_ref=Song.search_title))
 
@@ -258,7 +258,7 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
-        actionList.remove_action(self.SongImportItem, u'Import')
-        actionList.remove_action(self.SongExportItem, u'Export')
-        actionList.remove_action(self.toolsReindexItem, u'Tools')
+        ActionList.remove_action(self.SongImportItem, u'Import')
+        ActionList.remove_action(self.SongExportItem, u'Export')
+        ActionList.remove_action(self.toolsReindexItem, u'Tools')
         Plugin.finalise(self)

From 0c9b839e916e1b310be7e78e150be48f16bfdd52 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 31 Mar 2011 14:50:38 +0200
Subject: [PATCH 13/47] check if shortcut is already assigned, refreshing list,
 double click event, started resetting the selected action

---
 openlp/core/ui/shortcutlistform.py | 86 ++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 23 deletions(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 8ba78a876..4746ae3f7 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -42,9 +42,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     The shortcut list dialog
     """
 #TODO: do not close on ESC
-#TODO: Fix Preview/Live controller (have the same shortcut)
-#TODO: double click event
-#TODO: refresh self.assingedShortcuts
+#TODO: Fix Preview/Live controller (have the same shortcut
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -56,6 +54,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         QtCore.QObject.connect(self.treeWidget,
             QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'),
             self.onItemPressed)
+        QtCore.QObject.connect(self.treeWidget,
+            QtCore.SIGNAL(u'itemDoubleClicked(QTreeWidgetItem*, int)'),
+            self.onItemDoubleClicked)
+        QtCore.QObject.connect(self.clearShortcutButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onClearShortcutButtonClicked)
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
@@ -87,34 +90,50 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.shortcutButton.setChecked(False)
 
     def exec_(self):
-        self.reloadActionList()
+        self.reloadShortcutList()
         return QtGui.QDialog.exec_(self)
 
-    def reloadActionList(self):
+    def reloadShortcutList(self):
         """
         Reload the ``treeWidget`` list to add new and remove old actions.
         """
-        self.assingedShortcuts = []
         self.treeWidget.clear()
         for category in ActionList.categories:
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
-                self.assingedShortcuts.extend(action.shortcuts())
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
-                if len(action.shortcuts()) == 2:
-                    shortcutText = action.shortcuts()[0].toString()
-                    alternateText = action.shortcuts()[1].toString()
-                else:
-                    shortcutText = action.shortcut().toString()
-                    alternateText = u''
-                actionItem = QtGui.QTreeWidgetItem(
-                    [actionText, shortcutText, alternateText])
+                actionItem = QtGui.QTreeWidgetItem([actionText])
                 actionItem.setIcon(0, action.icon())
                 actionItem.setData(0,
                     QtCore.Qt.UserRole, QtCore.QVariant(action))
                 item.addChild(actionItem)
             item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
+        self.refreshShortcutList()
+
+    def refreshShortcutList(self):
+        """
+        This refreshes the item's shortcuts shown in the list. Note, this
+        neither adds new actions nor removes old actions.
+        """
+        self.assingedShortcuts = []
+        iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
+        while iterator.value():
+            item = iterator.value()
+            iterator += 1
+            action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+            if action is None:
+                continue
+            self.assingedShortcuts.extend(action.shortcuts())
+            if len(action.shortcuts()) == 0:
+                item.setText(1, u'')
+                item.setText(2, u'')
+            elif len(action.shortcuts()) == 1:
+                item.setText(1, action.shortcuts()[0].toString())
+                item.setText(2, u'')
+            else:
+                item.setText(1, action.shortcuts()[0].toString())
+                item.setText(2, action.shortcuts()[1].toString())
 
     def onShortcutButtonClicked(self, toggled):
         """
@@ -127,25 +146,30 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if action is None:
             return
         shortcuts = []
+        # We are changing the primary shortcut.
         if self.column == 1:
-            # We are changing the primary shortcut.
             shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
             if len(action.shortcuts()) == 2:
                 shortcuts.append(action.shortcuts()[1])
-            else:
-                shortcuts.append(0)
-            item.setText(1, self.shortcutButton.text())
+        # We are changing the secondary shortcut.
         elif self.column == 2:
-            # We are changing the secondary shortcut.
             if len(action.shortcuts()) == 1:
                 shortcuts.append(action.shortcuts()[0])
-            else:
-                shortcuts.append(0)
             shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
-            item.setText(2, self.shortcutButton.text())
         else:
             return
         action.setShortcuts(shortcuts)
+        self.refreshShortcutList()
+
+    def onItemDoubleClicked(self, item, column):
+        """
+        """
+        item = self.treeWidget.currentItem()
+        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        self.shortcutButton.setChecked(True)
+        if action is None or column not in [1, 2]:
+            self.shortcutButton.setChecked(False)
+        self.onItemPressed(item, column)
 
     def onItemPressed(self, item, column):
         """
@@ -165,6 +189,22 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             text = action.shortcuts()[1].toString()
         self.shortcutButton.setText(text)
 
+    def onClearShortcutButtonClicked(self, toggled):
+        """
+        Restore the defaults of this 
+        """
+        item = self.treeWidget.currentItem()
+        if item is None:
+            return
+        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        if action is None:
+            return
+        #FIXME: defaultShortcuts
+        action.setShortcuts(action.defaultShortcuts)
+        self.shortcutButton.setChecked(False)
+        self.shortcutButton.setText(u'')
+        self.refreshShortcutList()
+
     def save(self):
         """
         Save the shortcuts. **Note**, that we do not have to load the shortcuts,

From b17ad266728d9032af9ae42529d6007b86a6f063 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 31 Mar 2011 20:53:50 +0200
Subject: [PATCH 14/47] make sure we save the default shortcut

---
 openlp/core/lib/toolbar.py        |  15 ++---
 openlp/core/lib/ui.py             |  17 ++++-
 openlp/core/ui/mainwindow.py      | 103 ++++++++++++------------------
 openlp/core/ui/servicemanager.py  |  53 +++++++--------
 openlp/core/ui/slidecontroller.py |  27 ++++----
 openlp/core/utils/actions.py      |   2 -
 6 files changed, 107 insertions(+), 110 deletions(-)

diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index d5d2fa4f8..44149cd85 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -51,8 +51,7 @@ class OpenLPToolbar(QtGui.QToolBar):
         log.debug(u'Init done for %s' % parent.__class__.__name__)
 
     def addToolbarButton(self, title, icon, tooltip=None, slot=None,
-        checkable=False, shortcut=0, alternate=0,
-        context=QtCore.Qt.WidgetShortcut):
+        checkable=False, shortcuts=None, context=QtCore.Qt.WidgetShortcut):
         """
         A method to help developers easily add a button to the toolbar.
 
@@ -74,11 +73,8 @@ class OpenLPToolbar(QtGui.QToolBar):
             If *True* the button has two, *off* and *on*, states. Default is
             *False*, which means the buttons has only one state.
 
-        ``shortcut``
-            The primary shortcut for this action
-
-        ``alternate``
-            The alternate shortcut for this action
+        ``shortcuts``
+            The list of shortcuts for this action
 
         ``context``
             Specify the context in which this shortcut is valid
@@ -103,8 +99,9 @@ class OpenLPToolbar(QtGui.QToolBar):
             QtCore.QObject.connect(newAction,
                 QtCore.SIGNAL(u'toggled(bool)'), slot)
         self.actions[title] = newAction
-        newAction.setShortcuts([shortcut, alternate])
-        newAction.setShortcutContext(context)
+        if shortcuts is not None:
+            newAction.setShortcuts(shortcuts)
+            newAction.setShortcutContext(context)
         return newAction
 
     def addToolbarSeparator(self, handle):
diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index a298d803b..c6f7dd070 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -275,13 +275,26 @@ def icon_action(parent, name, icon, checked=None, category=None):
     action.setIcon(build_icon(icon))
     return action
 
-def shortcut_action(parent, text, shortcuts, function, category=None):
+def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
+    category=None):
     """
     Return a shortcut enabled action.
     """
-    action = base_action(parent, text, category)
+    # We cannot use the base_action, icon_action and the like, as we must not
+    # add the action to the actionList before the shortcut has been set
+    # (when we add the action to the list, the default shortcut is saved, to be
+    # able restore the shortcut).
+    action = QtGui.QAction(parent)
+    action.setObjectName(name)
+    if icon is not None:
+        action.setIcon(build_icon(icon))
+    if checked is not None:
+        action.setCheckable(True)
+        action.setChecked(checked)
     action.setShortcuts(shortcuts)
     action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
+    if category is not None:
+        ActionList.add_action(action, category)
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
     return action
 
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 1fdf0fd76..14bed4712 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -33,7 +33,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \
     SettingsManager, PluginManager, Receiver, translate
 from openlp.core.lib.ui import UiStrings, base_action, checkable_action, \
-    icon_action
+    icon_action, shortcut_action
 from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
     ShortcutListForm, DisplayTagForm
@@ -161,18 +161,32 @@ class Ui_MainWindow(object):
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
             self.themeManagerDock)
         # Create the menu items
-        self.FileNewItem = icon_action(mainWindow, u'FileNewItem',
+        self.FileNewItem = shortcut_action(mainWindow, u'FileNewItem',
+            [QtGui.QKeySequence(u'Ctrl+N')],
+            self.ServiceManagerContents.onNewServiceClicked,
             u':/general/general_new.png', category=u'File')
-        self.FileOpenItem = icon_action(mainWindow, u'FileOpenItem',
+        self.FileNewItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.FileOpenItem = shortcut_action(mainWindow, u'FileOpenItem',
+            [QtGui.QKeySequence(u'Ctrl+O')],
+            self.ServiceManagerContents.onLoadServiceClicked,
             u':/general/general_open.png', category=u'File')
-        self.FileSaveItem = icon_action(mainWindow, u'FileSaveItem',
+        self.FileOpenItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.FileSaveItem = shortcut_action(mainWindow, u'FileSaveItem',
+            [QtGui.QKeySequence(u'Ctrl+S')],
+            self.ServiceManagerContents.saveFile,
             u':/general/general_save.png', category=u'File')
-        self.FileSaveAsItem = base_action(
-            mainWindow, u'FileSaveAsItem', u'File')
-        self.printServiceOrderItem = base_action(
-            mainWindow, u'printServiceItem', u'File')
-        self.FileExitItem = icon_action(mainWindow, u'FileExitItem',
+        self.FileSaveItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.FileSaveAsItem = shortcut_action(mainWindow, u'FileSaveAsItem',
+            [QtGui.QKeySequence(u'Ctrl+Shift+S')],
+            self.ServiceManagerContents.saveFileAs, category=u'File')
+        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.printServiceOrderItem = shortcut_action(mainWindow,
+            u'printServiceItem', [QtGui.QKeySequence(u'Ctrl+P')],
+            self.ServiceManagerContents.printServiceOrder,  category=u'File')
+        self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
+            [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
             u':/system/system_exit.png', category=u'File')
+        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.ImportThemeItem = base_action(
             mainWindow, u'ImportThemeItem', u'Import')
         self.ImportLanguageItem = base_action(
@@ -181,15 +195,21 @@ class Ui_MainWindow(object):
             mainWindow, u'ExportThemeItem', u'Export')
         self.ExportLanguageItem = base_action(
             mainWindow, u'ExportLanguageItem')#, u'Export')
-        self.ViewMediaManagerItem = icon_action(mainWindow,
-            u'ViewMediaManagerItem', u':/system/system_mediamanager.png',
+        self.ViewMediaManagerItem = shortcut_action(mainWindow,
+            u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
+            self.toggleMediaManager, u':/system/system_mediamanager.png',
             self.mediaManagerDock.isVisible(), u'View')
-        self.ViewThemeManagerItem = icon_action(mainWindow,
-            u'ViewThemeManagerItem', u':/system/system_thememanager.png',
+        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.ViewThemeManagerItem = shortcut_action(mainWindow,
+            u'ViewThemeManagerItem', [QtGui.QKeySequence(u'F9')],
+            self.toggleThemeManager,  u':/system/system_thememanager.png',
             self.themeManagerDock.isVisible(), u'View')
-        self.ViewServiceManagerItem = icon_action(mainWindow,
-            u'ViewServiceManagerItem', u':/system/system_servicemanager.png',
+        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
+        self.ViewServiceManagerItem = shortcut_action(mainWindow,
+            u'ViewServiceManagerItem', [QtGui.QKeySequence(u'F10')],
+            self.toggleServiceManager, u':/system/system_servicemanager.png',
             self.serviceManagerDock.isVisible(), u'View')
+        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.ViewPreviewPanel = checkable_action(mainWindow,
             u'ViewPreviewPanel', previewVisible, u'View')
         self.ViewLivePanel = checkable_action(
@@ -278,8 +298,6 @@ class Ui_MainWindow(object):
         # Connect up some signals and slots
         QtCore.QObject.connect(self.FileMenu,
             QtCore.SIGNAL(u'aboutToShow()'), self.updateFileMenu)
-        QtCore.QObject.connect(self.FileExitItem,
-            QtCore.SIGNAL(u'triggered()'), mainWindow.close)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
         # Hide the entry, as it does not have any functionality yet.
         self.ToolsAddToolItem.setVisible(False)
@@ -312,36 +330,27 @@ class Ui_MainWindow(object):
         self.FileNewItem.setText(translate('OpenLP.MainWindow', '&New'))
         self.FileNewItem.setToolTip(UiStrings.NewService)
         self.FileNewItem.setStatusTip(UiStrings.CreateService)
-        self.FileNewItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+N'))
         self.FileOpenItem.setText(translate('OpenLP.MainWindow', '&Open'))
         self.FileOpenItem.setToolTip(UiStrings.OpenService)
         self.FileOpenItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Open an existing service.'))
-        self.FileOpenItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+O'))
         self.FileSaveItem.setText(translate('OpenLP.MainWindow', '&Save'))
         self.FileSaveItem.setToolTip(UiStrings.SaveService)
         self.FileSaveItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Save the current service to disk.'))
-        self.FileSaveItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+S'))
         self.FileSaveAsItem.setText(
             translate('OpenLP.MainWindow', 'Save &As...'))
         self.FileSaveAsItem.setToolTip(
             translate('OpenLP.MainWindow', 'Save Service As'))
         self.FileSaveAsItem.setStatusTip(translate('OpenLP.MainWindow',
             'Save the current service under a new name.'))
-        self.FileSaveAsItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Ctrl+Shift+S'))
         self.printServiceOrderItem.setText(UiStrings.PrintServiceOrder)
         self.printServiceOrderItem.setStatusTip(translate('OpenLP.MainWindow',
             'Print the current Service Order.'))
-        self.printServiceOrderItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Ctrl+P'))
         self.FileExitItem.setText(
             translate('OpenLP.MainWindow', 'E&xit'))
         self.FileExitItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Quit OpenLP'))
-        self.FileExitItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Alt+F4'))
         self.ImportThemeItem.setText(
             translate('OpenLP.MainWindow', '&Theme'))
         self.ImportLanguageItem.setText(
@@ -362,24 +371,18 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Toggle Media Manager'))
         self.ViewMediaManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the media manager.'))
-        self.ViewMediaManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F8'))
         self.ViewThemeManagerItem.setText(
             translate('OpenLP.MainWindow', '&Theme Manager'))
         self.ViewThemeManagerItem.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
         self.ViewThemeManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the theme manager.'))
-        self.ViewThemeManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F10'))
         self.ViewServiceManagerItem.setText(
             translate('OpenLP.MainWindow', '&Service Manager'))
         self.ViewServiceManagerItem.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Service Manager'))
         self.ViewServiceManagerItem.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the service manager.'))
-        self.ViewServiceManagerItem.setShortcut(
-            translate('OpenLP.MainWindow', 'F9'))
         self.ViewPreviewPanel.setText(
             translate('OpenLP.MainWindow', '&Preview Panel'))
         self.ViewPreviewPanel.setToolTip(
@@ -409,6 +412,7 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'More information about OpenLP'))
         self.HelpAboutItem.setShortcut(
             translate('OpenLP.MainWindow', 'Ctrl+F1'))
+        print self.HelpAboutItem.shortcuts()
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
         # Uncomment after 1.9.5 beta string freeze
@@ -490,12 +494,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         QtCore.QObject.connect(self.ExportThemeItem,
             QtCore.SIGNAL(u'triggered()'),
             self.themeManagerContents.onExportTheme)
-        QtCore.QObject.connect(self.ViewMediaManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleMediaManager)
-        QtCore.QObject.connect(self.ViewServiceManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleServiceManager)
-        QtCore.QObject.connect(self.ViewThemeManagerItem,
-            QtCore.SIGNAL(u'triggered(bool)'), self.toggleThemeManager)
         QtCore.QObject.connect(self.ViewPreviewPanel,
             QtCore.SIGNAL(u'toggled(bool)'), self.setPreviewPanelVisibility)
         QtCore.QObject.connect(self.ViewLivePanel,
@@ -525,20 +523,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'triggered()'), self.onSettingsConfigureItemClicked)
         QtCore.QObject.connect(self.SettingsShortcutsItem,
             QtCore.SIGNAL(u'triggered()'), self.onSettingsShortcutsItemClicked)
-        QtCore.QObject.connect(self.FileNewItem, QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.onNewServiceClicked)
-        QtCore.QObject.connect(self.FileOpenItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.onLoadServiceClicked)
-        QtCore.QObject.connect(self.FileSaveItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.saveFile)
-        QtCore.QObject.connect(self.FileSaveAsItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.saveFileAs)
-        QtCore.QObject.connect(self.printServiceOrderItem,
-            QtCore.SIGNAL(u'triggered()'),
-            self.ServiceManagerContents.printServiceOrder)
         # i18n set signals for languages
         self.LanguageGroup.triggered.connect(LanguageManager.set_language)
         QtCore.QObject.connect(self.ModeDefaultItem,
@@ -909,17 +893,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
                 theme)
 
-    def toggleMediaManager(self, visible):
-        if self.mediaManagerDock.isVisible() != visible:
-            self.mediaManagerDock.setVisible(visible)
+    def toggleMediaManager(self):
+        self.mediaManagerDock.setVisible(not self.mediaManagerDock.isVisible())
 
-    def toggleServiceManager(self, visible):
-        if self.serviceManagerDock.isVisible() != visible:
-            self.serviceManagerDock.setVisible(visible)
+    def toggleServiceManager(self):
+        self.serviceManagerDock.setVisible(not self.serviceManagerDock.isVisible())
 
-    def toggleThemeManager(self, visible):
-        if self.themeManagerDock.isVisible() != visible:
-            self.themeManagerDock.setVisible(visible)
+    def toggleThemeManager(self):
+        self.themeManagerDock.setVisible(not self.themeManagerDock.isVisible())
 
     def setPreviewPanelVisibility(self, visible):
         """
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 4bdd647ed..3ed477485 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -165,38 +165,50 @@ class ServiceManager(QtGui.QWidget):
             u':/services/service_top.png',
             translate('OpenLP.ServiceManager',
             'Move item to the top of the service.'),
-            self.onServiceTop, shortcut=QtCore.Qt.Key_Home)
+            self.onServiceTop, shortcuts=[QtCore.Qt.Key_Home])
+        self.serviceManagerList.moveTop.setObjectName(u'moveTop')
+        ActionList.add_action(self.serviceManagerList.moveTop, u'Service')
         self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &up'),
             u':/services/service_up.png',
             translate('OpenLP.ServiceManager',
             'Move item up one position in the service.'),
-            self.onServiceUp, shortcut=QtCore.Qt.Key_PageUp)
+            self.onServiceUp, shortcuts=[QtCore.Qt.Key_PageUp])
+        self.serviceManagerList.moveUp.setObjectName(u'moveUp')
+        ActionList.add_action(self.serviceManagerList.moveUp, u'Service')
         self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             u':/services/service_down.png',
             translate('OpenLP.ServiceManager',
             'Move item down one position in the service.'),
-            self.onServiceDown, shortcut=QtCore.Qt.Key_PageDown)
+            self.onServiceDown, shortcuts=[QtCore.Qt.Key_PageDown])
+        self.serviceManagerList.moveDown.setObjectName(u'moveDown')
+        ActionList.add_action(self.serviceManagerList.moveDown, u'Service')
         self.serviceManagerList.moveBottom = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &bottom'),
             u':/services/service_bottom.png',
             translate('OpenLP.ServiceManager',
             'Move item to the end of the service.'),
-            self.onServiceEnd, shortcut=QtCore.Qt.Key_End)
+            self.onServiceEnd, shortcuts=[QtCore.Qt.Key_End])
+        self.serviceManagerList.moveBottom.setObjectName(u'moveBottom')
+        ActionList.add_action(self.serviceManagerList.moveBottom, u'Service')
         self.serviceManagerList.down = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             None,
             translate('OpenLP.ServiceManager',
             'Moves the selection down the window.'),
-            self.onMoveSelectionDown, shortcut=QtCore.Qt.Key_Down)
+            self.onMoveSelectionDown, shortcuts=[QtCore.Qt.Key_Down])
+        self.serviceManagerList.down.setObjectName(u'down')
+        ActionList.add_action(self.serviceManagerList.down, u'Service')
         self.serviceManagerList.down.setVisible(False)
         self.serviceManagerList.up = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move up'),
             None,
             translate('OpenLP.ServiceManager',
             'Moves the selection up the window.'),
-            self.onMoveSelectionUp, shortcut=QtCore.Qt.Key_Up)
+            self.onMoveSelectionUp, shortcuts=[QtCore.Qt.Key_Up])
+        self.serviceManagerList.up.setObjectName(u'up')
+        ActionList.add_action(self.serviceManagerList.up, u'Service')
         self.serviceManagerList.up.setVisible(False)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.delete = self.orderToolbar.addToolbarButton(
@@ -211,22 +223,26 @@ class ServiceManager(QtGui.QWidget):
             u':/services/service_expand_all.png',
             translate('OpenLP.ServiceManager',
             'Expand all the service items.'),
-            self.onExpandAll, shortcut=QtCore.Qt.Key_Plus)
+            self.onExpandAll, shortcuts=[QtCore.Qt.Key_Plus])
+        self.serviceManagerList.expand.setObjectName(u'expand')
+        ActionList.add_action(self.serviceManagerList.expand, u'Service')
         self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
             u':/services/service_collapse_all.png',
             translate('OpenLP.ServiceManager',
             'Collapse all the service items.'),
-            self.onCollapseAll, shortcut=QtCore.Qt.Key_Minus)
+            self.onCollapseAll, shortcuts=[QtCore.Qt.Key_Minus])
+        self.serviceManagerList.collapse.setObjectName(u'collapse')
+        ActionList.add_action(self.serviceManagerList.collapse, u'Service')
         self.orderToolbar.addSeparator()
         self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Go Live'),
             u':/general/general_live.png',
             translate('OpenLP.ServiceManager',
-            'Send the selected item to Live.'),
-            self.makeLive, shortcut=QtCore.Qt.Key_Enter,
-            alternate=QtCore.Qt.Key_Return)
-        self.orderToolbar.setObjectName(u'orderToolbar')
+            'Send the selected item to Live.'), self.makeLive,
+            shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return])
+        self.serviceManagerList.makeLive.setObjectName(u'orderToolbar')
+        ActionList.add_action(self.serviceManagerList.makeLive, u'Service')
         self.layout.addWidget(self.orderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.themeComboBox,
@@ -301,7 +317,6 @@ class ServiceManager(QtGui.QWidget):
         self.themeMenu = QtGui.QMenu(
             translate('OpenLP.ServiceManager', '&Change Item Theme'))
         self.menu.addMenu(self.themeMenu)
-        self.setServiceHotkeys()
         self.serviceManagerList.addActions(
             [self.serviceManagerList.moveDown,
             self.serviceManagerList.moveUp,
@@ -315,18 +330,6 @@ class ServiceManager(QtGui.QWidget):
             ])
         self.configUpdated()
 
-    def setServiceHotkeys(self):
-        ActionList.add_action(self.serviceManagerList.moveDown, u'Service')
-        ActionList.add_action(self.serviceManagerList.moveUp, u'Service')
-        ActionList.add_action(self.serviceManagerList.moveTop, u'Service')
-        ActionList.add_action(self.serviceManagerList.moveBottom, u'Service')
-        ActionList.add_action(self.serviceManagerList.makeLive, u'Service')
-        ActionList.add_action(self.serviceManagerList.up, u'Service')
-        ActionList.add_action(self.serviceManagerList.down, u'Service')
-        ActionList.add_action(self.serviceManagerList.expand, u'Service')
-        ActionList.add_action(self.serviceManagerList.collapse, u'Service')
-
-
     def setModified(self, modified=True):
         """
         Setter for property "modified". Sets whether or not the current service
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index bc478463c..e9d748ad5 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -142,11 +142,13 @@ class SlideController(QtGui.QWidget):
             u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous'),
             self.onSlideSelectedPrevious)
+        self.previousItem.setObjectName(u'previousItem')
         self.nextItem = self.toolbar.addToolbarButton(
             translate('OpenLP.SlideController', 'Next Slide'),
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
             self.onSlideSelectedNext)
+        self.nextItem.setObjectName(u'nextItem')
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             self.hideMenu = QtGui.QToolButton(self.toolbar)
@@ -363,9 +365,9 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, 0])
+        self.previousItem.setShortcuts([QtCore.Qt.Key_Up])
         ActionList.add_action(self.previousItem, u'Preview Toolbar')
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, 0])
+        self.nextItem.setShortcuts([QtCore.Qt.Key_Down])
         ActionList.add_action(self.nextItem, u'Preview Toolbar')
 
     def setLiveHotkeys(self, parent=None):
@@ -376,15 +378,18 @@ class SlideController(QtGui.QWidget):
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         ActionList.add_action(self.nextItem, u'Live Toolbar')
-        self.previousService = shortcut_action(parent,
-            translate('OpenLP.SlideController', 'Previous Service'),
-            [QtCore.Qt.Key_Left, 0], self.servicePrevious, u'Live Toolbar')
-        self.nextService = shortcut_action(parent,
-            translate('OpenLP.SlideController', 'Next Service'),
-            [QtCore.Qt.Key_Right, 0], self.serviceNext, u'Live Toolbar')
-        self.escapeItem = shortcut_action(parent,
-            translate('OpenLP.SlideController', 'Escape Item'),
-            [QtCore.Qt.Key_Escape, 0], self.liveEscape, u'Live Toolbar')
+        self.previousService = shortcut_action(parent, u'previousService',
+            [QtCore.Qt.Key_Left], self.servicePrevious, u'Live Toolbar')
+        self.previousService.setText(
+            translate('OpenLP.SlideController', 'Previous Service'))
+        self.nextService = shortcut_action(parent, 'nextService',
+            [QtCore.Qt.Key_Right], self.serviceNext, u'Live Toolbar')
+        self.nextService.setText(
+            translate('OpenLP.SlideController', 'Next Service'))
+        self.escapeItem = shortcut_action(parent, 'escapeItem',
+            [QtCore.Qt.Key_Escape], self.liveEscape, u'Live Toolbar')
+        self.escapeItem.setText(
+            translate('OpenLP.SlideController', 'Escape Item'))
 
     def liveEscape(self):
         self.display.setVisible(False)
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index e71aee672..34bc72173 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -29,8 +29,6 @@ by the shortcuts system.
 """
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate
-
 class ActionCategory(object):
     """
     The :class:`~openlp.core.utils.ActionCategory` class encapsulates a

From df4de23df09486908a5daf69b454f48be0fe3395 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 1 Apr 2011 16:28:25 +0200
Subject: [PATCH 15/47] Added Theme, Blank, Desktop shortcuts, further clean
 ups

Fixes: https://launchpad.net/bugs/739779
---
 openlp/core/lib/searchedit.py               |  3 +-
 openlp/core/lib/ui.py                       | 22 ++++----
 openlp/core/ui/mainwindow.py                | 59 ++++++++-------------
 openlp/core/ui/shortcutlistform.py          | 47 +++++++++++-----
 openlp/core/ui/slidecontroller.py           | 39 ++++++++------
 openlp/core/utils/actions.py                |  8 +++
 openlp/plugins/songusage/songusageplugin.py | 30 +++++------
 7 files changed, 113 insertions(+), 95 deletions(-)

diff --git a/openlp/core/lib/searchedit.py b/openlp/core/lib/searchedit.py
index 4841d76dc..41699256f 100644
--- a/openlp/core/lib/searchedit.py
+++ b/openlp/core/lib/searchedit.py
@@ -29,6 +29,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import build_icon
+from openlp.core.lib.ui import icon_action
 
 log = logging.getLogger(__name__)
 
@@ -132,7 +133,7 @@ class SearchEdit(QtGui.QLineEdit):
         menu = QtGui.QMenu(self)
         first = None
         for identifier, icon, title in items:
-            action = QtGui.QAction(build_icon(icon), title, menu)
+            action = icon_action(menu, title, icon)
             action.setData(QtCore.QVariant(identifier))
             menu.addAction(action)
             QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered(bool)'),
diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index c6f7dd070..a02041cad 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -280,21 +280,17 @@ def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
     """
     Return a shortcut enabled action.
     """
-    # We cannot use the base_action, icon_action and the like, as we must not
-    # add the action to the actionList before the shortcut has been set
-    # (when we add the action to the list, the default shortcut is saved, to be
-    # able restore the shortcut).
-    action = QtGui.QAction(parent)
-    action.setObjectName(name)
     if icon is not None:
-        action.setIcon(build_icon(icon))
-    if checked is not None:
-        action.setCheckable(True)
-        action.setChecked(checked)
+        action = icon_action(parent, name, icon, checked, category)
+    elif checked is not None:
+        action = checkable_action(parent, name, checked, category)
+    else:
+        action = base_action(parent, name, category)
     action.setShortcuts(shortcuts)
-    action.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
-    if category is not None:
-        ActionList.add_action(action, category)
+    action.setShortcutContext(QtCore.Qt.WindowShortcut)
+    # We have to save the default shortcut again, as the action's shortcut was
+    # set after adding the shortcut to the action list.
+    action.defaultShortcuts = action.shortcuts()
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
     return action
 
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 14bed4712..458e8814f 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -165,28 +165,23 @@ class Ui_MainWindow(object):
             [QtGui.QKeySequence(u'Ctrl+N')],
             self.ServiceManagerContents.onNewServiceClicked,
             u':/general/general_new.png', category=u'File')
-        self.FileNewItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.FileOpenItem = shortcut_action(mainWindow, u'FileOpenItem',
             [QtGui.QKeySequence(u'Ctrl+O')],
             self.ServiceManagerContents.onLoadServiceClicked,
             u':/general/general_open.png', category=u'File')
-        self.FileOpenItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.FileSaveItem = shortcut_action(mainWindow, u'FileSaveItem',
             [QtGui.QKeySequence(u'Ctrl+S')],
             self.ServiceManagerContents.saveFile,
             u':/general/general_save.png', category=u'File')
-        self.FileSaveItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.FileSaveAsItem = shortcut_action(mainWindow, u'FileSaveAsItem',
             [QtGui.QKeySequence(u'Ctrl+Shift+S')],
             self.ServiceManagerContents.saveFileAs, category=u'File')
-        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.printServiceOrderItem = shortcut_action(mainWindow,
             u'printServiceItem', [QtGui.QKeySequence(u'Ctrl+P')],
             self.ServiceManagerContents.printServiceOrder,  category=u'File')
         self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
             [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
             u':/system/system_exit.png', category=u'File')
-        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.ImportThemeItem = base_action(
             mainWindow, u'ImportThemeItem', u'Import')
         self.ImportLanguageItem = base_action(
@@ -199,21 +194,20 @@ class Ui_MainWindow(object):
             u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
             self.toggleMediaManager, u':/system/system_mediamanager.png',
             self.mediaManagerDock.isVisible(), u'View')
-        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.ViewThemeManagerItem = shortcut_action(mainWindow,
-            u'ViewThemeManagerItem', [QtGui.QKeySequence(u'F9')],
+            u'ViewThemeManagerItem', [QtGui.QKeySequence(u'F10')],
             self.toggleThemeManager,  u':/system/system_thememanager.png',
             self.themeManagerDock.isVisible(), u'View')
-        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
         self.ViewServiceManagerItem = shortcut_action(mainWindow,
-            u'ViewServiceManagerItem', [QtGui.QKeySequence(u'F10')],
+            u'ViewServiceManagerItem', [QtGui.QKeySequence(u'F9')],
             self.toggleServiceManager, u':/system/system_servicemanager.png',
             self.serviceManagerDock.isVisible(), u'View')
-        self.FileSaveAsItem.setShortcutContext(QtCore.Qt.WindowShortcut)
-        self.ViewPreviewPanel = checkable_action(mainWindow,
-            u'ViewPreviewPanel', previewVisible, u'View')
-        self.ViewLivePanel = checkable_action(
-            mainWindow, u'ViewLivePanel', liveVisible, u'View')
+        self.ViewPreviewPanel = shortcut_action(mainWindow,
+            u'ViewPreviewPanel', [QtGui.QKeySequence(u'F11')],
+            self.setPreviewPanelVisibility, checked=previewVisible, category=u'View')
+        self.ViewLivePanel = shortcut_action(mainWindow, u'ViewLivePanel',
+            [QtGui.QKeySequence(u'F12')], self.setLivePanelVisibility,
+            checked=liveVisible, category=u'View')
         self.ModeDefaultItem = checkable_action(
             mainWindow, u'ModeDefaultItem', category=u'View Mode')
         self.ModeSetupItem = checkable_action(
@@ -229,8 +223,9 @@ class Ui_MainWindow(object):
             u':/tools/tools_add.png', category=u'Tools')
         self.ToolsOpenDataFolder = icon_action(mainWindow, u'ToolsOpenDataFolder',
             u':/general/general_open.png', category=u'Tools')
-        self.settingsPluginListItem = icon_action(mainWindow,
-            u'settingsPluginListItem', u':/system/settings_plugin_list.png',
+        self.settingsPluginListItem = shortcut_action(mainWindow,
+            u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')],
+            self.onPluginItemClicked, u':/system/settings_plugin_list.png',
             category=u'Settings')
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
@@ -257,7 +252,8 @@ class Ui_MainWindow(object):
             u'HelpDocumentationItem', u':/system/system_help_contents.png',
             category=None)#u'Help')
         self.HelpDocumentationItem.setEnabled(False)
-        self.HelpAboutItem = icon_action(mainWindow, u'HelpAboutItem',
+        self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem',
+            [QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
             u':/system/system_about.png', category=u'Help')
         self.HelpOnlineHelpItem = base_action(
             mainWindow, u'HelpOnlineHelpItem', category=u'Help')
@@ -389,30 +385,21 @@ class Ui_MainWindow(object):
             translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
         self.ViewPreviewPanel.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the preview panel.'))
-        self.ViewPreviewPanel.setShortcut(
-            translate('OpenLP.MainWindow', 'F11'))
         self.ViewLivePanel.setText(
             translate('OpenLP.MainWindow', '&Live Panel'))
         self.ViewLivePanel.setToolTip(
             translate('OpenLP.MainWindow', 'Toggle Live Panel'))
         self.ViewLivePanel.setStatusTip(translate('OpenLP.MainWindow',
             'Toggle the visibility of the live panel.'))
-        self.ViewLivePanel.setShortcut(
-            translate('OpenLP.MainWindow', 'F12'))
         self.settingsPluginListItem.setText(translate('OpenLP.MainWindow',
             '&Plugin List'))
         self.settingsPluginListItem.setStatusTip(
             translate('OpenLP.MainWindow', 'List the Plugins'))
-        self.settingsPluginListItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Alt+F7'))
         self.HelpDocumentationItem.setText(
             translate('OpenLP.MainWindow', '&User Guide'))
         self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
         self.HelpAboutItem.setStatusTip(
             translate('OpenLP.MainWindow', 'More information about OpenLP'))
-        self.HelpAboutItem.setShortcut(
-            translate('OpenLP.MainWindow', 'Ctrl+F1'))
-        print self.HelpAboutItem.shortcuts()
         self.HelpOnlineHelpItem.setText(
             translate('OpenLP.MainWindow', '&Online Help'))
         # Uncomment after 1.9.5 beta string freeze
@@ -494,10 +481,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         QtCore.QObject.connect(self.ExportThemeItem,
             QtCore.SIGNAL(u'triggered()'),
             self.themeManagerContents.onExportTheme)
-        QtCore.QObject.connect(self.ViewPreviewPanel,
-            QtCore.SIGNAL(u'toggled(bool)'), self.setPreviewPanelVisibility)
-        QtCore.QObject.connect(self.ViewLivePanel,
-            QtCore.SIGNAL(u'toggled(bool)'), self.setLivePanelVisibility)
         QtCore.QObject.connect(self.mediaManagerDock,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.ViewMediaManagerItem.setChecked)
@@ -511,12 +494,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked)
         QtCore.QObject.connect(self.HelpOnlineHelpItem,
             QtCore.SIGNAL(u'triggered()'), self.onHelpOnLineHelpClicked)
-        QtCore.QObject.connect(self.HelpAboutItem,
-            QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked)
         QtCore.QObject.connect(self.ToolsOpenDataFolder,
             QtCore.SIGNAL(u'triggered()'), self.onToolsOpenDataFolderClicked)
-        QtCore.QObject.connect(self.settingsPluginListItem,
-            QtCore.SIGNAL(u'triggered()'), self.onPluginItemClicked)
         QtCore.QObject.connect(self.DisplayTagItem,
             QtCore.SIGNAL(u'triggered()'), self.onDisplayTagItemClicked)
         QtCore.QObject.connect(self.SettingsConfigureItem,
@@ -902,7 +881,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
     def toggleThemeManager(self):
         self.themeManagerDock.setVisible(not self.themeManagerDock.isVisible())
 
-    def setPreviewPanelVisibility(self, visible):
+    def setPreviewPanelVisibility(self, visible=None):
         """
         Sets the visibility of the preview panel including saving the setting
         and updating the menu.
@@ -912,12 +891,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 True - Visible
                 False - Hidden
         """
+        if visible is None:
+            visible = self.ViewPreviewPanel.isVisible()
         self.previewController.panel.setVisible(visible)
         QtCore.QSettings().setValue(u'user interface/preview panel',
             QtCore.QVariant(visible))
         self.ViewPreviewPanel.setChecked(visible)
 
-    def setLivePanelVisibility(self, visible):
+    def setLivePanelVisibility(self, visible=None):
         """
         Sets the visibility of the live panel including saving the setting and
         updating the menu.
@@ -927,6 +908,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 True - Visible
                 False - Hidden
         """
+        if visible is None:
+            visible = self.ViewLivePanel.isVisible()
         self.liveController.panel.setVisible(visible)
         QtCore.QSettings().setValue(u'user interface/live panel',
             QtCore.QVariant(visible))
@@ -984,8 +967,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.FileMenu.addSeparator()
             for fileId, filename in enumerate(recentFilesToDisplay):
                 log.debug('Recent file name: %s', filename)
-                action = QtGui.QAction(u'&%d %s' % (fileId + 1,
-                    QtCore.QFileInfo(filename).fileName()), self)
+                action =  base_action(self, u'&%d %s' % (fileId + 1,
+                    QtCore.QFileInfo(filename).fileName()))
                 action.setData(QtCore.QVariant(filename))
                 self.connect(action, QtCore.SIGNAL(u'triggered()'),
                     self.ServiceManagerContents.onRecentServiceClicked)
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 4746ae3f7..e350009cd 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -42,13 +42,13 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     The shortcut list dialog
     """
 #TODO: do not close on ESC
-#TODO: Fix Preview/Live controller (have the same shortcut
+#TODO: Fix Preview/Live controller (have the same shortcut)
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.assingedShortcuts = []
         self.column = -1
         self.shortcutButton.setText(u'')
+        self.shortcutButton.setEnabled(False)
         QtCore.QObject.connect(self.shortcutButton,
             QtCore.SIGNAL(u'toggled(bool)'), self.onShortcutButtonClicked)
         QtCore.QObject.connect(self.treeWidget,
@@ -76,7 +76,27 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
-        if key_sequence in self.assingedShortcuts:
+        # The item/action we are attempting to change.
+        changing_item = self.treeWidget.currentItem()
+        changing_action = changing_item.data(0, QtCore.Qt.UserRole).toPyObject()
+        shortcut_valid = True
+        for category in ActionList.categories:
+            for action in category.actions:
+                shortcuts = action.shortcuts()
+                if key_sequence not in shortcuts:
+                    continue
+                if action is changing_action:
+                    continue
+                # Have the same parentWidget, thus they cannot have the same
+                # shortcut.
+                #TODO: Does not fully work right now.
+                if action.parentWidget() is changing_action.parentWidget():
+                    shortcut_valid = False
+                if action.shortcutContext() == QtCore.Qt.WindowShortcut:
+                    shortcut_valid = False
+                if changing_action.shortcutContext() == QtCore.Qt.WindowShortcut:
+                    shortcut_valid = False
+        if not shortcut_valid:
             QtGui.QMessageBox.warning(self,
                 translate('OpenLP.ShortcutListDialog', 'Duplicate Shortcut'),
                 unicode(translate('OpenLP.ShortcutListDialog', 'The shortcut '
@@ -91,6 +111,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def exec_(self):
         self.reloadShortcutList()
+        self.shortcutButton.setChecked(False)
+        self.shortcutButton.setEnabled(False)
+        self.shortcutButton.setText(u'')
         return QtGui.QDialog.exec_(self)
 
     def reloadShortcutList(self):
@@ -116,7 +139,6 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         This refreshes the item's shortcuts shown in the list. Note, this
         neither adds new actions nor removes old actions.
         """
-        self.assingedShortcuts = []
         iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
         while iterator.value():
             item = iterator.value()
@@ -124,7 +146,6 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             action = item.data(0, QtCore.Qt.UserRole).toPyObject()
             if action is None:
                 continue
-            self.assingedShortcuts.extend(action.shortcuts())
             if len(action.shortcuts()) == 0:
                 item.setText(1, u'')
                 item.setText(2, u'')
@@ -142,6 +163,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if toggled:
             return
         item = self.treeWidget.currentItem()
+        if item is None:
+            return
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
@@ -163,12 +186,13 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def onItemDoubleClicked(self, item, column):
         """
+        A item has been double clicked. ``The shortcutButton`` will be checked
+        and the item's shortcut will be displayed.
         """
-        item = self.treeWidget.currentItem()
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        if action is None:
+            return
         self.shortcutButton.setChecked(True)
-        if action is None or column not in [1, 2]:
-            self.shortcutButton.setChecked(False)
         self.onItemPressed(item, column)
 
     def onItemPressed(self, item, column):
@@ -177,11 +201,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         shortcut which is encapsulate in the item.
         """
         self.column = column
-        item = self.treeWidget.currentItem()
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         self.shortcutButton.setEnabled(True)
         text = u''
         if action is None or column not in [1, 2]:
+            self.shortcutButton.setChecked(False)
             self.shortcutButton.setEnabled(False)
         elif column == 1 and len(action.shortcuts()) != 0:
             text = action.shortcuts()[0].toString()
@@ -194,16 +218,15 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         Restore the defaults of this 
         """
         item = self.treeWidget.currentItem()
+        self.shortcutButton.setChecked(False)
         if item is None:
             return
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
-        #FIXME: defaultShortcuts
         action.setShortcuts(action.defaultShortcuts)
-        self.shortcutButton.setChecked(False)
-        self.shortcutButton.setText(u'')
         self.refreshShortcutList()
+        self.onItemPressed(item, self.column)
 
     def save(self):
         """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index e9d748ad5..750ada7cd 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -157,16 +157,20 @@ class SlideController(QtGui.QWidget):
             self.toolbar.addToolbarWidget(u'Hide Menu', self.hideMenu)
             self.hideMenu.setMenu(QtGui.QMenu(
                 translate('OpenLP.SlideController', 'Hide'), self.toolbar))
-            self.blankScreen = icon_action(self.hideMenu, u'Blank Screen',
+            self.blankScreen = shortcut_action(self.hideMenu, u'blankScreen',
+                [QtCore.Qt.Key_Period], self.onBlankDisplay,
                 u':/slides/slide_blank.png', False, u'Live Toolbar')
             self.blankScreen.setText(
                 translate('OpenLP.SlideController', 'Blank Screen'))
-            self.themeScreen = icon_action(self.hideMenu, u'Blank Theme',
+            self.themeScreen = shortcut_action(self.hideMenu, u'themeScreen',
+                [QtGui.QKeySequence(u'T')], self.onThemeDisplay,
                 u':/slides/slide_theme.png', False, u'Live Toolbar')
             self.themeScreen.setText(
                 translate('OpenLP.SlideController', 'Blank to Theme'))
-            self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
-                u':/slides/slide_desktop.png', False, u'Live Toolbar')
+            self.desktopScreen = shortcut_action(self.hideMenu,
+                u'desktopScreen', [QtGui.QKeySequence(u'D')],
+                self.onHideDisplay, u':/slides/slide_desktop.png', False,
+                u'Live Toolbar')
             self.desktopScreen.setText(
                 translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)
@@ -294,12 +298,6 @@ class SlideController(QtGui.QWidget):
         QtCore.QObject.connect(self.previewListWidget,
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
         if self.isLive:
-            QtCore.QObject.connect(self.blankScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onBlankDisplay)
-            QtCore.QObject.connect(self.themeScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onThemeDisplay)
-            QtCore.QObject.connect(self.desktopScreen,
-                QtCore.SIGNAL(u'triggered(bool)'), self.onHideDisplay)
             QtCore.QObject.connect(self.volumeSlider,
                 QtCore.SIGNAL(u'sliderReleased()'), self.mediaVolume)
             QtCore.QObject.connect(Receiver.get_receiver(),
@@ -380,14 +378,17 @@ class SlideController(QtGui.QWidget):
         ActionList.add_action(self.nextItem, u'Live Toolbar')
         self.previousService = shortcut_action(parent, u'previousService',
             [QtCore.Qt.Key_Left], self.servicePrevious, u'Live Toolbar')
+        self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.previousService.setText(
             translate('OpenLP.SlideController', 'Previous Service'))
         self.nextService = shortcut_action(parent, 'nextService',
             [QtCore.Qt.Key_Right], self.serviceNext, u'Live Toolbar')
+        self.nextService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.nextService.setText(
             translate('OpenLP.SlideController', 'Next Service'))
         self.escapeItem = shortcut_action(parent, 'escapeItem',
             [QtCore.Qt.Key_Escape], self.liveEscape, u'Live Toolbar')
+        self.escapeItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.escapeItem.setText(
             translate('OpenLP.SlideController', 'Escape Item'))
 
@@ -742,10 +743,12 @@ class SlideController(QtGui.QWidget):
         """
         self.onBlankDisplay(False)
 
-    def onBlankDisplay(self, checked):
+    def onBlankDisplay(self, checked=None):
         """
         Handle the blank screen button actions
         """
+        if checked is None:
+            checked = self.blankScreen.isChecked()
         log.debug(u'onBlankDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.blankScreen)
         self.blankScreen.setChecked(checked)
@@ -763,10 +766,12 @@ class SlideController(QtGui.QWidget):
         self.blankPlugin(checked)
         self.updatePreview()
 
-    def onThemeDisplay(self, checked):
+    def onThemeDisplay(self, checked=None):
         """
         Handle the Theme screen button
         """
+        if checked is None:
+            checked = self.themeScreen.isChecked()
         log.debug(u'onThemeDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.themeScreen)
         self.blankScreen.setChecked(False)
@@ -784,10 +789,12 @@ class SlideController(QtGui.QWidget):
         self.blankPlugin(checked)
         self.updatePreview()
 
-    def onHideDisplay(self, checked):
+    def onHideDisplay(self, checked=None):
         """
         Handle the Hide screen button
         """
+        if checked is None:
+            checked = self.desktopScreen.isChecked()
         log.debug(u'onHideDisplay %s' % checked)
         self.hideMenu.setDefaultAction(self.desktopScreen)
         self.blankScreen.setChecked(False)
@@ -1102,11 +1109,11 @@ class SlideController(QtGui.QWidget):
         screen hide attributes
         """
         blank = None
-        if self.blankScreen.isChecked:
+        if self.blankScreen.isChecked():
             blank = self.blankScreen
-        if self.themeScreen.isChecked:
+        if self.themeScreen.isChecked():
             blank = self.themeScreen
-        if self.desktopScreen.isChecked:
+        if self.desktopScreen.isChecked():
             blank = self.desktopScreen
         if blank:
             blank.setChecked(False)
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 34bc72173..7421db30e 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -173,6 +173,11 @@ class CategoryList(object):
         self.categories.append(category)
         self.categories.sort(key=lambda cat: cat.weight)
 
+    def remove(self, name):
+        for category in self.categories:
+            if category.name == name:
+                self.categories.remove(category)
+
 
 class ActionList(object):
     """
@@ -206,3 +211,6 @@ class ActionList(object):
         if category not in ActionList.categories:
             return
         ActionList.categories[category].actions.remove(action)
+        # Remove empty categories.
+        if len(ActionList.categories[category].actions) == 0:
+            ActionList.categories.remove(category)
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 8ff40373a..2e55a23c0 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -32,6 +32,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, \
     translate
 from openlp.core.lib.db import Manager
+from openlp.core.lib.ui import base_action, shortcut_action
+from openlp.core.utils.actions import ActionList
 from openlp.plugins.songusage.forms import SongUsageDetailForm, \
     SongUsageDeleteForm
 from openlp.plugins.songusage.lib.db import init_schema, SongUsageItem
@@ -63,30 +65,25 @@ class SongUsagePlugin(Plugin):
         self.SongUsageMenu.setObjectName(u'SongUsageMenu')
         self.SongUsageMenu.setTitle(translate(
             'SongUsagePlugin', '&Song Usage Tracking'))
-        #SongUsage Delete
-        self.SongUsageDelete = QtGui.QAction(tools_menu)
+        # SongUsage Delete
+        self.SongUsageDelete = base_action(tools_menu, u'SongUsageDelete')
         self.SongUsageDelete.setText(translate('SongUsagePlugin',
             '&Delete Tracking Data'))
         self.SongUsageDelete.setStatusTip(translate('SongUsagePlugin',
             'Delete song usage data up to a specified date.'))
-        self.SongUsageDelete.setObjectName(u'SongUsageDelete')
-        #SongUsage Report
-        self.SongUsageReport = QtGui.QAction(tools_menu)
+        # SongUsage Report
+        self.SongUsageReport = base_action(tools_menu, u'SongUsageReport')
         self.SongUsageReport.setText(
             translate('SongUsagePlugin', '&Extract Tracking Data'))
         self.SongUsageReport.setStatusTip(
             translate('SongUsagePlugin', 'Generate a report on song usage.'))
-        self.SongUsageReport.setObjectName(u'SongUsageReport')
-        #SongUsage activation
-        self.SongUsageStatus = QtGui.QAction(tools_menu)
-        self.SongUsageStatus.setCheckable(True)
-        self.SongUsageStatus.setChecked(False)
+        # SongUsage activation
+        self.SongUsageStatus = shortcut_action(tools_menu, u'SongUsageStatus',
+            [QtCore.Qt.Key_F4], self.toggleSongUsageState, checked=False)
         self.SongUsageStatus.setText(translate(
             'SongUsagePlugin', 'Toggle Tracking'))
         self.SongUsageStatus.setStatusTip(translate('SongUsagePlugin',
                 'Toggle the tracking of song usage.'))
-        self.SongUsageStatus.setShortcut(u'F4')
-        self.SongUsageStatus.setObjectName(u'SongUsageStatus')
         #Add Menus together
         self.toolsMenu.addAction(self.SongUsageMenu.menuAction())
         self.SongUsageMenu.addAction(self.SongUsageStatus)
@@ -97,9 +94,6 @@ class SongUsagePlugin(Plugin):
         QtCore.QObject.connect(self.SongUsageStatus,
             QtCore.SIGNAL(u'visibilityChanged(bool)'),
             self.SongUsageStatus.setChecked)
-        QtCore.QObject.connect(self.SongUsageStatus,
-            QtCore.SIGNAL(u'triggered(bool)'),
-            self.toggleSongUsageState)
         QtCore.QObject.connect(self.SongUsageDelete,
             QtCore.SIGNAL(u'triggered()'), self.onSongUsageDelete)
         QtCore.QObject.connect(self.SongUsageReport,
@@ -116,6 +110,9 @@ class SongUsagePlugin(Plugin):
             self.settingsSection + u'/active',
             QtCore.QVariant(False)).toBool()
         self.SongUsageStatus.setChecked(self.SongUsageActive)
+        ActionList.add_action(self.SongUsageDelete, u'Song Usage')
+        ActionList.add_action(self.SongUsageReport, u'Song Usage')
+        ActionList.add_action(self.SongUsageStatus, u'Song Usage')
         if self.manager is None:
             self.manager = Manager(u'songusage', init_schema)
         self.SongUsagedeleteform = SongUsageDeleteForm(self.manager,
@@ -131,6 +128,9 @@ class SongUsagePlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.SongUsageMenu.menuAction().setVisible(False)
+        ActionList.remove_action(self.SongUsageDelete, u'Song Usage')
+        ActionList.remove_action(self.SongUsageReport, u'Song Usage')
+        ActionList.remove_action(self.SongUsageStatus, u'Song Usage')
         #stop any events being processed
         self.SongUsageActive = False
 

From 1a493b1fc8da490d0cd7783188f79c02caeb83cd Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 1 Apr 2011 18:53:39 +0200
Subject: [PATCH 16/47] possible fix for not working 'move selection down'

---
 openlp/core/ui/slidecontroller.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 750ada7cd..9f486518b 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -32,7 +32,7 @@ from PyQt4.phonon import Phonon
 
 from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
-from openlp.core.lib.ui import icon_action, UiStrings, shortcut_action
+from openlp.core.lib.ui import UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
 from openlp.core.utils.actions import ActionList
 
@@ -143,12 +143,17 @@ class SlideController(QtGui.QWidget):
             translate('OpenLP.SlideController', 'Move to previous'),
             self.onSlideSelectedPrevious)
         self.previousItem.setObjectName(u'previousItem')
+        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
+        self.previousItem.setShortcutContext(
+            QtCore.Qt.WidgetWithChildrenShortcut)
         self.nextItem = self.toolbar.addToolbarButton(
             translate('OpenLP.SlideController', 'Next Slide'),
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
             self.onSlideSelectedNext)
         self.nextItem.setObjectName(u'nextItem')
+        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
+        self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             self.hideMenu = QtGui.QToolButton(self.toolbar)
@@ -363,18 +368,11 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up])
         ActionList.add_action(self.previousItem, u'Preview Toolbar')
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down])
         ActionList.add_action(self.nextItem, u'Preview Toolbar')
 
     def setLiveHotkeys(self, parent=None):
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
-        self.previousItem.setShortcutContext(
-            QtCore.Qt.WidgetWithChildrenShortcut)
         ActionList.add_action(self.previousItem, u'Live Toolbar')
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
-        self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         ActionList.add_action(self.nextItem, u'Live Toolbar')
         self.previousService = shortcut_action(parent, u'previousService',
             [QtCore.Qt.Key_Left], self.servicePrevious, u'Live Toolbar')

From 4badce0205e1f29d69f2074bbd2bb30d934cf9d7 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 2 Apr 2011 15:08:54 +0200
Subject: [PATCH 17/47] fixed actions which did not have a parent which caused
 the check to fail

---
 openlp/core/lib/toolbar.py         |  3 +--
 openlp/core/ui/shortcutlistform.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index 44149cd85..d2b37df51 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -79,7 +79,6 @@ class OpenLPToolbar(QtGui.QToolBar):
         ``context``
             Specify the context in which this shortcut is valid
         """
-        newAction = None
         if icon:
             actionIcon = build_icon(icon)
             if slot and not checkable:
@@ -88,7 +87,7 @@ class OpenLPToolbar(QtGui.QToolBar):
                 newAction = self.addAction(actionIcon, title)
             self.icons[title] = actionIcon
         else:
-            newAction = QtGui.QAction(title, newAction)
+            newAction = QtGui.QAction(title, self)
             self.addAction(newAction)
             QtCore.QObject.connect(newAction,
                 QtCore.SIGNAL(u'triggered()'), slot)
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index e350009cd..bd4fb8ab6 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -42,7 +42,6 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     The shortcut list dialog
     """
 #TODO: do not close on ESC
-#TODO: Fix Preview/Live controller (have the same shortcut)
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -89,12 +88,13 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                     continue
                 # Have the same parentWidget, thus they cannot have the same
                 # shortcut.
-                #TODO: Does not fully work right now.
-                if action.parentWidget() is changing_action.parentWidget():
+                if action.parent() is changing_action.parent():
                     shortcut_valid = False
-                if action.shortcutContext() == QtCore.Qt.WindowShortcut:
+                if action.shortcutContext() in [QtCore.Qt.WindowShortcut,
+                    QtCore.Qt.ApplicationShortcut]:
                     shortcut_valid = False
-                if changing_action.shortcutContext() == QtCore.Qt.WindowShortcut:
+                if changing_action.shortcutContext() in \
+                    [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
                     shortcut_valid = False
         if not shortcut_valid:
             QtGui.QMessageBox.warning(self,
@@ -193,6 +193,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if action is None:
             return
         self.shortcutButton.setChecked(True)
+        self.shortcutButton.setFocus(QtCore.Qt.OtherFocusReason)
         self.onItemPressed(item, column)
 
     def onItemPressed(self, item, column):

From 7260f91825cd8a9c8bf2567dcd7d88b789b9fc1c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 2 Apr 2011 16:22:08 +0200
Subject: [PATCH 18/47] restore butto nnow works

---
 openlp/core/ui/shortcutlistdialog.py |  2 +-
 openlp/core/ui/shortcutlistform.py   | 32 +++++++++++++++++++++++++++-
 openlp/core/ui/slidecontroller.py    | 15 ++++++-------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 467fb0534..5f8936628 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -58,7 +58,7 @@ class Ui_ShortcutListDialog(object):
         self.dialogLayout.addLayout(self.customLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Reset)
+            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
         self.buttonBox.setObjectName(u'buttonBox')
         self.dialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index bd4fb8ab6..14aa1d009 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -41,7 +41,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     """
     The shortcut list dialog
     """
-#TODO: do not close on ESC
+
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
@@ -58,6 +58,16 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.onItemDoubleClicked)
         QtCore.QObject.connect(self.clearShortcutButton,
             QtCore.SIGNAL(u'clicked(bool)'), self.onClearShortcutButtonClicked)
+        QtCore.QObject.connect(self.buttonBox,
+            QtCore.SIGNAL(u'clicked(QAbstractButton*)'),
+            self.onRestoreDefaultsClicked)
+
+    def keyPressEvent(self, event):
+        if self.shortcutButton.isChecked():
+            event.ignore()
+        elif event.key() == QtCore.Qt.Key_Escape:
+            event.accept()
+            self.close()
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
@@ -229,6 +239,26 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.refreshShortcutList()
         self.onItemPressed(item, self.column)
 
+    def onRestoreDefaultsClicked(self, button):
+        """
+        Restores all default shortcuts.
+        """
+        if self.buttonBox.buttonRole(button) != QtGui.QDialogButtonBox.ResetRole:
+            return
+        if QtGui.QMessageBox.question(self,
+            translate('OpenLP.ShortcutListDialog', 'Restore Default Shortcuts'),
+            translate('OpenLP.ShortcutListDialog', 'Do you want to restore all '
+            'shortcuts to their defaults?'), QtGui.QMessageBox.StandardButtons(
+            QtGui.QMessageBox.Yes |
+            QtGui.QMessageBox.No)) == QtGui.QMessageBox.No:
+            return
+        self.shortcutButton.setChecked(False)
+        self.shortcutButton.setText(u'')
+        for category in ActionList.categories:
+            for action in category.actions:
+                action.setShortcuts(action.defaultShortcuts)
+        self.refreshShortcutList()
+
     def save(self):
         """
         Save the shortcuts. **Note**, that we do not have to load the shortcuts,
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 9f486518b..1ec2e1772 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -141,19 +141,18 @@ class SlideController(QtGui.QWidget):
             translate('OpenLP.SlideController', 'Previous Slide'),
             u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous'),
-            self.onSlideSelectedPrevious)
-        self.previousItem.setObjectName(u'previousItem')
-        self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
-        self.previousItem.setShortcutContext(
-            QtCore.Qt.WidgetWithChildrenShortcut)
+            self.onSlideSelectedPrevious,
+            shortcuts=[QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp],
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
+        self.previousItem.setObjectName(u'previousItem')           
         self.nextItem = self.toolbar.addToolbarButton(
             translate('OpenLP.SlideController', 'Next Slide'),
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next'),
-            self.onSlideSelectedNext)
+            self.onSlideSelectedNext,
+            shortcuts=[QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown],
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
         self.nextItem.setObjectName(u'nextItem')
-        self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
-        self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             self.hideMenu = QtGui.QToolButton(self.toolbar)

From e3d822f07ad30f72b99f21410039438639faf56a Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 2 Apr 2011 17:37:14 +0200
Subject: [PATCH 19/47] fixed strange save bug

---
 openlp/core/lib/ui.py             | 17 +++++++++--------
 openlp/core/ui/slidecontroller.py |  6 ++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index a02041cad..9f24da96c 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -280,17 +280,18 @@ def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
     """
     Return a shortcut enabled action.
     """
+    action = QtGui.QAction(parent)
+    action.setObjectName(name)
     if icon is not None:
-        action = icon_action(parent, name, icon, checked, category)
-    elif checked is not None:
-        action = checkable_action(parent, name, checked, category)
-    else:
-        action = base_action(parent, name, category)
+        action.setIcon(build_icon(icon))
+    if checked is not None:
+        action.setCheckable(True)
+        action.setChecked(checked)
+    action.setCheckable(True)
     action.setShortcuts(shortcuts)
     action.setShortcutContext(QtCore.Qt.WindowShortcut)
-    # We have to save the default shortcut again, as the action's shortcut was
-    # set after adding the shortcut to the action list.
-    action.defaultShortcuts = action.shortcuts()
+    if category is not None:
+        ActionList.add_action(action, category)
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
     return action
 
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 1ec2e1772..3fe27f4d9 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -144,7 +144,6 @@ class SlideController(QtGui.QWidget):
             self.onSlideSelectedPrevious,
             shortcuts=[QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp],
             context=QtCore.Qt.WidgetWithChildrenShortcut)
-        self.previousItem.setObjectName(u'previousItem')           
         self.nextItem = self.toolbar.addToolbarButton(
             translate('OpenLP.SlideController', 'Next Slide'),
             u':/slides/slide_next.png',
@@ -152,7 +151,6 @@ class SlideController(QtGui.QWidget):
             self.onSlideSelectedNext,
             shortcuts=[QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown],
             context=QtCore.Qt.WidgetWithChildrenShortcut)
-        self.nextItem.setObjectName(u'nextItem')
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             self.hideMenu = QtGui.QToolButton(self.toolbar)
@@ -367,10 +365,14 @@ class SlideController(QtGui.QWidget):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
 
     def setPreviewHotkeys(self, parent=None):
+        self.previousItem.setObjectName(u'previousItemPreview')         
+        self.nextItem.setObjectName(u'nextItemPreview')
         ActionList.add_action(self.previousItem, u'Preview Toolbar')
         ActionList.add_action(self.nextItem, u'Preview Toolbar')
 
     def setLiveHotkeys(self, parent=None):
+        self.previousItem.setObjectName(u'previousItemLive')         
+        self.nextItem.setObjectName(u'nextItemLive')
         ActionList.add_action(self.previousItem, u'Live Toolbar')
         ActionList.add_action(self.nextItem, u'Live Toolbar')
         self.previousService = shortcut_action(parent, u'previousService',

From 958155e7d75d8a86a90f0e4de1e33f9641520c37 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 2 Apr 2011 17:45:00 +0200
Subject: [PATCH 20/47] fixed alternate shortcut

---
 openlp/core/ui/shortcutlistform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 14aa1d009..80b9652a0 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -186,7 +186,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 shortcuts.append(action.shortcuts()[1])
         # We are changing the secondary shortcut.
         elif self.column == 2:
-            if len(action.shortcuts()) == 1:
+            if len(action.shortcuts()) != 0:
                 shortcuts.append(action.shortcuts()[0])
             shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
         else:

From 61068e26a6dce8bc7f577b716777cf3c56ef23eb Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 2 Apr 2011 18:14:43 +0200
Subject: [PATCH 21/47] removed cancel button

---
 openlp/core/ui/shortcutlistdialog.py | 4 ++--
 openlp/core/ui/shortcutlistform.py   | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 5f8936628..a4bcc359e 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -57,8 +57,8 @@ class Ui_ShortcutListDialog(object):
         self.customLayout.addStretch()
         self.dialogLayout.addLayout(self.customLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok |
+            QtGui.QDialogButtonBox.RestoreDefaults)
         self.buttonBox.setObjectName(u'buttonBox')
         self.dialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 80b9652a0..84aea006a 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -63,11 +63,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.onRestoreDefaultsClicked)
 
     def keyPressEvent(self, event):
-        if self.shortcutButton.isChecked():
-            event.ignore()
-        elif event.key() == QtCore.Qt.Key_Escape:
-            event.accept()
-            self.close()
+        event.ignore()
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt

From 28b83aadaed1c66eecb628152956414a379f0f19 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 3 Apr 2011 13:36:43 +0200
Subject: [PATCH 22/47] translate categories

---
 openlp/core/lib/ui.py                       |  8 +++
 openlp/core/ui/mainwindow.py                | 63 +++++++++++----------
 openlp/core/ui/servicemanager.py            | 23 +++++---
 openlp/core/ui/slidecontroller.py           | 20 +++----
 openlp/core/utils/actions.py                |  2 +
 openlp/plugins/alerts/alertsplugin.py       |  4 +-
 openlp/plugins/bibles/bibleplugin.py        |  8 ++-
 openlp/plugins/songs/songsplugin.py         | 12 ++--
 openlp/plugins/songusage/songusageplugin.py | 20 ++++---
 9 files changed, 94 insertions(+), 66 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 9f24da96c..15309edc9 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -56,8 +56,10 @@ class UiStrings(object):
     EmptyField = translate('OpenLP.Ui', 'Empty Field')
     Error = translate('OpenLP.Ui', 'Error')
     Export = translate('OpenLP.Ui', 'Export')
+    File = translate('OpenLP.Ui', 'File')
     FontSizePtUnit = translate('OpenLP.Ui', 'pt',
         'Abbreviated font pointsize unit')
+    Help = translate('OpenLP.Ui', 'Help')
     Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
     Image = translate('OpenLP.Ui', 'Image')
     Import = translate('OpenLP.Ui', 'Import')
@@ -65,6 +67,7 @@ class UiStrings(object):
     Live = translate('OpenLP.Ui', 'Live')
     LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
     LivePanel = translate('OpenLP.Ui', 'Live Panel')
+    LiveToolbar = translate('OpenLP.Ui', 'Live Toolbar')
     Load = translate('OpenLP.Ui', 'Load')
     Minutes = translate('OpenLP.Ui', 'm', 'The abbreviated unit for minutes')
     Middle = translate('OpenLP.Ui', 'Middle')
@@ -82,6 +85,7 @@ class UiStrings(object):
     OpenService = translate('OpenLP.Ui', 'Open Service')
     Preview = translate('OpenLP.Ui', 'Preview')
     PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
+    PreviewToolbar = translate('OpenLP.Ui', 'Preview Toolbar')
     PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
     ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
     ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
@@ -92,13 +96,17 @@ class UiStrings(object):
     Search = translate('OpenLP.Ui', 'Search')
     SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.')
     SelectEdit = translate('OpenLP.Ui', 'You must select an item to edit.')
+    Settings = translate('OpenLP.Ui', 'Settings')
     SaveService = translate('OpenLP.Ui', 'Save Service')
     Service = translate('OpenLP.Ui', 'Service')
     StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
     Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
     Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
+    Tools = translate('OpenLP.Ui', 'Tools')
     Top = translate('OpenLP.Ui', 'Top')
     Version = translate('OpenLP.Ui', 'Version')
+    View = translate('OpenLP.Ui', 'View')
+    ViewMode = translate('OpenLP.Ui', 'View Model')
 
 def add_welcome_page(parent, image):
     """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 458e8814f..bb6d105b9 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -164,69 +164,72 @@ class Ui_MainWindow(object):
         self.FileNewItem = shortcut_action(mainWindow, u'FileNewItem',
             [QtGui.QKeySequence(u'Ctrl+N')],
             self.ServiceManagerContents.onNewServiceClicked,
-            u':/general/general_new.png', category=u'File')
+            u':/general/general_new.png', category=UiStrings.File)
         self.FileOpenItem = shortcut_action(mainWindow, u'FileOpenItem',
             [QtGui.QKeySequence(u'Ctrl+O')],
             self.ServiceManagerContents.onLoadServiceClicked,
-            u':/general/general_open.png', category=u'File')
+            u':/general/general_open.png', category=UiStrings.File)
         self.FileSaveItem = shortcut_action(mainWindow, u'FileSaveItem',
             [QtGui.QKeySequence(u'Ctrl+S')],
             self.ServiceManagerContents.saveFile,
-            u':/general/general_save.png', category=u'File')
+            u':/general/general_save.png', category=UiStrings.File)
         self.FileSaveAsItem = shortcut_action(mainWindow, u'FileSaveAsItem',
             [QtGui.QKeySequence(u'Ctrl+Shift+S')],
-            self.ServiceManagerContents.saveFileAs, category=u'File')
+            self.ServiceManagerContents.saveFileAs, category=UiStrings.File)
         self.printServiceOrderItem = shortcut_action(mainWindow,
             u'printServiceItem', [QtGui.QKeySequence(u'Ctrl+P')],
-            self.ServiceManagerContents.printServiceOrder,  category=u'File')
+            self.ServiceManagerContents.printServiceOrder,
+            category=UiStrings.File)
         self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
             [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
-            u':/system/system_exit.png', category=u'File')
+            u':/system/system_exit.png', category=UiStrings.File)
         self.ImportThemeItem = base_action(
-            mainWindow, u'ImportThemeItem', u'Import')
+            mainWindow, u'ImportThemeItem', UiStrings.Import)
         self.ImportLanguageItem = base_action(
-            mainWindow, u'ImportLanguageItem')#, u'Import')
+            mainWindow, u'ImportLanguageItem')#, UiStrings.Import)
         self.ExportThemeItem = base_action(
-            mainWindow, u'ExportThemeItem', u'Export')
+            mainWindow, u'ExportThemeItem', UiStrings.Export)
         self.ExportLanguageItem = base_action(
-            mainWindow, u'ExportLanguageItem')#, u'Export')
+            mainWindow, u'ExportLanguageItem')#, UiStrings.Export)
         self.ViewMediaManagerItem = shortcut_action(mainWindow,
             u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
             self.toggleMediaManager, u':/system/system_mediamanager.png',
-            self.mediaManagerDock.isVisible(), u'View')
+            self.mediaManagerDock.isVisible(), UiStrings.View)
         self.ViewThemeManagerItem = shortcut_action(mainWindow,
             u'ViewThemeManagerItem', [QtGui.QKeySequence(u'F10')],
             self.toggleThemeManager,  u':/system/system_thememanager.png',
-            self.themeManagerDock.isVisible(), u'View')
+            self.themeManagerDock.isVisible(), UiStrings.View)
         self.ViewServiceManagerItem = shortcut_action(mainWindow,
             u'ViewServiceManagerItem', [QtGui.QKeySequence(u'F9')],
             self.toggleServiceManager, u':/system/system_servicemanager.png',
-            self.serviceManagerDock.isVisible(), u'View')
+            self.serviceManagerDock.isVisible(), UiStrings.View)
         self.ViewPreviewPanel = shortcut_action(mainWindow,
             u'ViewPreviewPanel', [QtGui.QKeySequence(u'F11')],
-            self.setPreviewPanelVisibility, checked=previewVisible, category=u'View')
+            self.setPreviewPanelVisibility, checked=previewVisible,
+            category=UiStrings.View)
         self.ViewLivePanel = shortcut_action(mainWindow, u'ViewLivePanel',
             [QtGui.QKeySequence(u'F12')], self.setLivePanelVisibility,
-            checked=liveVisible, category=u'View')
+            checked=liveVisible, category=UiStrings.View)
         self.ModeDefaultItem = checkable_action(
-            mainWindow, u'ModeDefaultItem', category=u'View Mode')
+            mainWindow, u'ModeDefaultItem', category=UiStrings.ViewMode)
         self.ModeSetupItem = checkable_action(
-            mainWindow, u'ModeLiveItem', category=u'View Mode')
+            mainWindow, u'ModeLiveItem', category=UiStrings.ViewMode)
         self.ModeLiveItem = checkable_action(
-            mainWindow, u'ModeLiveItem', True, u'View Mode')
+            mainWindow, u'ModeLiveItem', True, UiStrings.ViewMode)
         self.ModeGroup = QtGui.QActionGroup(mainWindow)
         self.ModeGroup.addAction(self.ModeDefaultItem)
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
-            u':/tools/tools_add.png', category=u'Tools')
-        self.ToolsOpenDataFolder = icon_action(mainWindow, u'ToolsOpenDataFolder',
-            u':/general/general_open.png', category=u'Tools')
+            u':/tools/tools_add.png', category=UiStrings.Tools)
+        self.ToolsOpenDataFolder = icon_action(mainWindow,
+            u'ToolsOpenDataFolder', u':/general/general_open.png',
+            category=UiStrings.Tools)
         self.settingsPluginListItem = shortcut_action(mainWindow,
             u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')],
             self.onPluginItemClicked, u':/system/settings_plugin_list.png',
-            category=u'Settings')
+            category=UiStrings.Settings)
         # i18n Language Items
         self.AutoLanguageItem = checkable_action(mainWindow,
             u'AutoLanguageItem', LanguageManager.auto_language)
@@ -242,23 +245,25 @@ class Ui_MainWindow(object):
             add_actions(self.LanguageGroup, [languageItem])
         self.SettingsShortcutsItem = icon_action(mainWindow,
             u'SettingsShortcutsItem',
-            u':/system/system_configure_shortcuts.png', category=u'Settings')
+            u':/system/system_configure_shortcuts.png',
+            category=UiStrings.Settings)
         self.DisplayTagItem = icon_action(mainWindow,
-            u'DisplayTagItem', u':/system/tag_editor.png', category=u'Settings')
+            u'DisplayTagItem', u':/system/tag_editor.png',
+            category=UiStrings.Settings)
         self.SettingsConfigureItem = icon_action(mainWindow,
             u'SettingsConfigureItem', u':/system/system_settings.png',
-            category=u'Settings')
+            category=UiStrings.Settings)
         self.HelpDocumentationItem = icon_action(mainWindow,
             u'HelpDocumentationItem', u':/system/system_help_contents.png',
-            category=None)#u'Help')
+            category=None)#UiStrings.Help)
         self.HelpDocumentationItem.setEnabled(False)
         self.HelpAboutItem = shortcut_action(mainWindow, u'HelpAboutItem',
             [QtGui.QKeySequence(u'Ctrl+F1')], self.onHelpAboutItemClicked,
-            u':/system/system_about.png', category=u'Help')
+            u':/system/system_about.png', category=UiStrings.Help)
         self.HelpOnlineHelpItem = base_action(
-            mainWindow, u'HelpOnlineHelpItem', category=u'Help')
+            mainWindow, u'HelpOnlineHelpItem', category=UiStrings.Help)
         self.helpWebSiteItem = base_action(
-            mainWindow, u'helpWebSiteItem', category=u'Help')
+            mainWindow, u'helpWebSiteItem', category=UiStrings.Help)
         add_actions(self.FileImportMenu,
             (self.ImportThemeItem, self.ImportLanguageItem))
         add_actions(self.FileExportMenu,
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 8d6062ab1..9daa1d8a2 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -167,7 +167,8 @@ class ServiceManager(QtGui.QWidget):
             'Move item to the top of the service.'),
             self.onServiceTop, shortcuts=[QtCore.Qt.Key_Home])
         self.serviceManagerList.moveTop.setObjectName(u'moveTop')
-        ActionList.add_action(self.serviceManagerList.moveTop, u'Service')
+        ActionList.add_action(
+            self.serviceManagerList.moveTop, UiStrings.Service)
         self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &up'),
             u':/services/service_up.png',
@@ -175,7 +176,7 @@ class ServiceManager(QtGui.QWidget):
             'Move item up one position in the service.'),
             self.onServiceUp, shortcuts=[QtCore.Qt.Key_PageUp])
         self.serviceManagerList.moveUp.setObjectName(u'moveUp')
-        ActionList.add_action(self.serviceManagerList.moveUp, u'Service')
+        ActionList.add_action(self.serviceManagerList.moveUp, UiStrings.Service)
         self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             u':/services/service_down.png',
@@ -183,7 +184,8 @@ class ServiceManager(QtGui.QWidget):
             'Move item down one position in the service.'),
             self.onServiceDown, shortcuts=[QtCore.Qt.Key_PageDown])
         self.serviceManagerList.moveDown.setObjectName(u'moveDown')
-        ActionList.add_action(self.serviceManagerList.moveDown, u'Service')
+        ActionList.add_action(
+            self.serviceManagerList.moveDown, UiStrings.Service)
         self.serviceManagerList.moveBottom = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &bottom'),
             u':/services/service_bottom.png',
@@ -191,7 +193,8 @@ class ServiceManager(QtGui.QWidget):
             'Move item to the end of the service.'),
             self.onServiceEnd, shortcuts=[QtCore.Qt.Key_End])
         self.serviceManagerList.moveBottom.setObjectName(u'moveBottom')
-        ActionList.add_action(self.serviceManagerList.moveBottom, u'Service')
+        ActionList.add_action(
+            self.serviceManagerList.moveBottom, UiStrings.Service)
         self.serviceManagerList.down = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             None,
@@ -199,7 +202,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection down the window.'),
             self.onMoveSelectionDown, shortcuts=[QtCore.Qt.Key_Down])
         self.serviceManagerList.down.setObjectName(u'down')
-        ActionList.add_action(self.serviceManagerList.down, u'Service')
+        ActionList.add_action(self.serviceManagerList.down, UiStrings.Service)
         self.serviceManagerList.down.setVisible(False)
         self.serviceManagerList.up = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move up'),
@@ -208,7 +211,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection up the window.'),
             self.onMoveSelectionUp, shortcuts=[QtCore.Qt.Key_Up])
         self.serviceManagerList.up.setObjectName(u'up')
-        ActionList.add_action(self.serviceManagerList.up, u'Service')
+        ActionList.add_action(self.serviceManagerList.up, UiStrings.Service)
         self.serviceManagerList.up.setVisible(False)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.delete = self.orderToolbar.addToolbarButton(
@@ -225,7 +228,7 @@ class ServiceManager(QtGui.QWidget):
             'Expand all the service items.'),
             self.onExpandAll, shortcuts=[QtCore.Qt.Key_Plus])
         self.serviceManagerList.expand.setObjectName(u'expand')
-        ActionList.add_action(self.serviceManagerList.expand, u'Service')
+        ActionList.add_action(self.serviceManagerList.expand, UiStrings.Service)
         self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
             u':/services/service_collapse_all.png',
@@ -233,7 +236,8 @@ class ServiceManager(QtGui.QWidget):
             'Collapse all the service items.'),
             self.onCollapseAll, shortcuts=[QtCore.Qt.Key_Minus])
         self.serviceManagerList.collapse.setObjectName(u'collapse')
-        ActionList.add_action(self.serviceManagerList.collapse, u'Service')
+        ActionList.add_action(
+            self.serviceManagerList.collapse, UiStrings.Service)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Go Live'),
@@ -242,7 +246,8 @@ class ServiceManager(QtGui.QWidget):
             'Send the selected item to Live.'), self.makeLive,
             shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return])
         self.serviceManagerList.makeLive.setObjectName(u'orderToolbar')
-        ActionList.add_action(self.serviceManagerList.makeLive, u'Service')
+        ActionList.add_action(
+            self.serviceManagerList.makeLive, UiStrings.Service)
         self.layout.addWidget(self.orderToolbar)
         # Connect up our signals and slots
         QtCore.QObject.connect(self.themeComboBox,
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 3fe27f4d9..af94eb425 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -161,18 +161,18 @@ class SlideController(QtGui.QWidget):
                 translate('OpenLP.SlideController', 'Hide'), self.toolbar))
             self.blankScreen = shortcut_action(self.hideMenu, u'blankScreen',
                 [QtCore.Qt.Key_Period], self.onBlankDisplay,
-                u':/slides/slide_blank.png', False, u'Live Toolbar')
+                u':/slides/slide_blank.png', False, UiStrings.LiveToolbar)
             self.blankScreen.setText(
                 translate('OpenLP.SlideController', 'Blank Screen'))
             self.themeScreen = shortcut_action(self.hideMenu, u'themeScreen',
                 [QtGui.QKeySequence(u'T')], self.onThemeDisplay,
-                u':/slides/slide_theme.png', False, u'Live Toolbar')
+                u':/slides/slide_theme.png', False, UiStrings.LiveToolbar)
             self.themeScreen.setText(
                 translate('OpenLP.SlideController', 'Blank to Theme'))
             self.desktopScreen = shortcut_action(self.hideMenu,
                 u'desktopScreen', [QtGui.QKeySequence(u'D')],
                 self.onHideDisplay, u':/slides/slide_desktop.png', False,
-                u'Live Toolbar')
+                UiStrings.LiveToolbar)
             self.desktopScreen.setText(
                 translate('OpenLP.SlideController', 'Show Desktop'))
             self.hideMenu.setDefaultAction(self.blankScreen)
@@ -367,26 +367,26 @@ class SlideController(QtGui.QWidget):
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemPreview')         
         self.nextItem.setObjectName(u'nextItemPreview')
-        ActionList.add_action(self.previousItem, u'Preview Toolbar')
-        ActionList.add_action(self.nextItem, u'Preview Toolbar')
+        ActionList.add_action(self.previousItem, UiStrings.PreviewToolbar)
+        ActionList.add_action(self.nextItem, UiStrings.PreviewToolbar)
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemLive')         
         self.nextItem.setObjectName(u'nextItemLive')
-        ActionList.add_action(self.previousItem, u'Live Toolbar')
-        ActionList.add_action(self.nextItem, u'Live Toolbar')
+        ActionList.add_action(self.previousItem, UiStrings.LiveToolbar)
+        ActionList.add_action(self.nextItem, UiStrings.LiveToolbar)
         self.previousService = shortcut_action(parent, u'previousService',
-            [QtCore.Qt.Key_Left], self.servicePrevious, u'Live Toolbar')
+            [QtCore.Qt.Key_Left], self.servicePrevious, UiStrings.LiveToolbar)
         self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.previousService.setText(
             translate('OpenLP.SlideController', 'Previous Service'))
         self.nextService = shortcut_action(parent, 'nextService',
-            [QtCore.Qt.Key_Right], self.serviceNext, u'Live Toolbar')
+            [QtCore.Qt.Key_Right], self.serviceNext, UiStrings.LiveToolbar)
         self.nextService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.nextService.setText(
             translate('OpenLP.SlideController', 'Next Service'))
         self.escapeItem = shortcut_action(parent, 'escapeItem',
-            [QtCore.Qt.Key_Escape], self.liveEscape, u'Live Toolbar')
+            [QtCore.Qt.Key_Escape], self.liveEscape, UiStrings.LiveToolbar)
         self.escapeItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         self.escapeItem.setText(
             translate('OpenLP.SlideController', 'Escape Item'))
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 7421db30e..04cb1f091 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -190,6 +190,7 @@ class ActionList(object):
 
     @staticmethod
     def add_action(action, category, weight=None):
+        category = unicode(category)
         if category not in ActionList.categories:
             ActionList.categories.append(category)
         action.defaultShortcuts = action.shortcuts()
@@ -208,6 +209,7 @@ class ActionList(object):
 
     @staticmethod
     def remove_action(action, category):
+        category = unicode(category)
         if category not in ActionList.categories:
             return
         ActionList.categories[category].actions.remove(action)
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 45e1969f4..d564a9754 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -30,7 +30,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
 from openlp.core.lib.db import Manager
-from openlp.core.lib.ui import icon_action
+from openlp.core.lib.ui import icon_action, UiStrings
 from openlp.core.utils.actions import ActionList
 from openlp.plugins.alerts.lib import AlertsManager, AlertsTab
 from openlp.plugins.alerts.lib.db import init_schema
@@ -75,7 +75,7 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
-        ActionList.add_action(self.toolsAlertItem, u'Tools')
+        ActionList.add_action(self.toolsAlertItem, UiStrings.Tools)
         self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 1396d4550..60be388ba 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -29,7 +29,7 @@ import logging
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin, StringContent, build_icon, translate
-from openlp.core.lib.ui import base_action
+from openlp.core.lib.ui import base_action, UiStrings
 from openlp.core.utils.actions import ActionList
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
@@ -52,9 +52,9 @@ class BiblePlugin(Plugin):
             self.manager = BibleManager(self)
         Plugin.initialise(self)
         self.importBibleItem.setVisible(True)
-        ActionList.add_action(self.importBibleItem, u'Import')
+        ActionList.add_action(self.importBibleItem, UiStrings.Import)
         # Do not add the action to the list yet.
-        #ActionList.add_action(self.exportBibleItem, u'Export')
+        #ActionList.add_action(self.exportBibleItem, UiStrings.Export)
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
 
@@ -65,7 +65,9 @@ class BiblePlugin(Plugin):
         log.info(u'Plugin Finalise')
         self.manager.finalise()
         Plugin.finalise(self)
+        ActionList.remove_action(self.importBibleItem, UiStrings.Import)
         self.importBibleItem.setVisible(False)
+        #ActionList.remove_action(self.exportBibleItem, UiStrings.Export)
         self.exportBibleItem.setVisible(False)
 
     def addImportMenuItem(self, import_menu):
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index de0714d5e..a3230ff7f 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -66,9 +66,9 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Initialising')
         Plugin.initialise(self)
         self.toolsReindexItem.setVisible(True)
-        ActionList.add_action(self.SongImportItem, u'Import')
-        ActionList.add_action(self.SongExportItem, u'Export')
-        ActionList.add_action(self.toolsReindexItem, u'Tools')
+        ActionList.add_action(self.SongImportItem, UiStrings.Import)
+        ActionList.add_action(self.SongExportItem, UiStrings.Export)
+        ActionList.add_action(self.toolsReindexItem, UiStrings.Tools)
         self.mediaItem.displayResultsSong(
             self.manager.get_all_objects(Song, order_by_ref=Song.search_title))
 
@@ -258,7 +258,7 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
-        ActionList.remove_action(self.SongImportItem, u'Import')
-        ActionList.remove_action(self.SongExportItem, u'Export')
-        ActionList.remove_action(self.toolsReindexItem, u'Tools')
+        ActionList.remove_action(self.SongImportItem, UiStrings.Import)
+        ActionList.remove_action(self.SongExportItem, UiStrings.Export)
+        ActionList.remove_action(self.toolsReindexItem, UiStrings.Tools)
         Plugin.finalise(self)
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 2e55a23c0..b0a545ad8 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, \
     translate
 from openlp.core.lib.db import Manager
-from openlp.core.lib.ui import base_action, shortcut_action
+from openlp.core.lib.ui import base_action, shortcut_action, UiStrings
 from openlp.core.utils.actions import ActionList
 from openlp.plugins.songusage.forms import SongUsageDetailForm, \
     SongUsageDeleteForm
@@ -110,9 +110,12 @@ class SongUsagePlugin(Plugin):
             self.settingsSection + u'/active',
             QtCore.QVariant(False)).toBool()
         self.SongUsageStatus.setChecked(self.SongUsageActive)
-        ActionList.add_action(self.SongUsageDelete, u'Song Usage')
-        ActionList.add_action(self.SongUsageReport, u'Song Usage')
-        ActionList.add_action(self.SongUsageStatus, u'Song Usage')
+        ActionList.add_action(self.SongUsageDelete,
+            translate('SongUsagePlugin', 'Song Usage'))
+        ActionList.add_action(self.SongUsageReport,
+            translate('SongUsagePlugin', 'Song Usage'))
+        ActionList.add_action(self.SongUsageStatus,
+            translate('SongUsagePlugin', 'Song Usage'))
         if self.manager is None:
             self.manager = Manager(u'songusage', init_schema)
         self.SongUsagedeleteform = SongUsageDeleteForm(self.manager,
@@ -128,9 +131,12 @@ class SongUsagePlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.SongUsageMenu.menuAction().setVisible(False)
-        ActionList.remove_action(self.SongUsageDelete, u'Song Usage')
-        ActionList.remove_action(self.SongUsageReport, u'Song Usage')
-        ActionList.remove_action(self.SongUsageStatus, u'Song Usage')
+        ActionList.remove_action(self.SongUsageDelete,
+            translate('SongUsagePlugin', 'Song Usage'))
+        ActionList.remove_action(self.SongUsageReport,
+            translate('SongUsagePlugin', 'Song Usage'))
+        ActionList.remove_action(self.SongUsageStatus,
+            translate('SongUsagePlugin', 'Song Usage'))
         #stop any events being processed
         self.SongUsageActive = False
 

From 0a5b3b2c2d460f06eacd6bb3debbc17fc3b4f5fc Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 3 Apr 2011 15:24:51 +0200
Subject: [PATCH 23/47]

---
 openlp/core/lib/ui.py                |  1 -
 openlp/core/ui/shortcutlistdialog.py | 17 +++++--
 openlp/core/ui/shortcutlistform.py   | 70 ++++++++++++++++++----------
 3 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 15309edc9..029bb34df 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -295,7 +295,6 @@ def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
     if checked is not None:
         action.setCheckable(True)
         action.setChecked(checked)
-    action.setCheckable(True)
     action.setShortcuts(shortcuts)
     action.setShortcutContext(QtCore.Qt.WindowShortcut)
     if category is not None:
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index a4bcc359e..1004014d6 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -34,6 +34,9 @@ class Ui_ShortcutListDialog(object):
         shortcutListDialog.setObjectName(u'shortcutListDialog')
         self.dialogLayout = QtGui.QVBoxLayout(shortcutListDialog)
         self.dialogLayout.setObjectName(u'dialogLayout')
+        self.descriptionLabel = QtGui.QLabel(shortcutListDialog);
+        self.descriptionLabel.setObjectName(u'descriptionLabel')
+        self.dialogLayout.addWidget(self.descriptionLabel)
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
         self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setObjectName(u'treeWidget')
@@ -57,8 +60,8 @@ class Ui_ShortcutListDialog(object):
         self.customLayout.addStretch()
         self.dialogLayout.addLayout(self.customLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok |
-            QtGui.QDialogButtonBox.RestoreDefaults)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
+            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
         self.buttonBox.setObjectName(u'buttonBox')
         self.dialogLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
@@ -71,9 +74,15 @@ class Ui_ShortcutListDialog(object):
     def retranslateUi(self, shortcutListDialog):
         shortcutListDialog.setWindowTitle(
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
+        self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
+            'Select an action and click the button below to start capturing '
+            'a new shortcut.'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
             translate('OpenLP.ShortcutListDialog', 'Alternate')])
-        self.shortcutButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'None'))
+        self.shortcutButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
+        self.clearShortcutButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog',
+            'Restore the default shortcut(s) of this action.'))
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 84aea006a..58b42a351 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -46,6 +46,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         self.column = -1
+        self.changedActions = {}
         self.shortcutButton.setText(u'')
         self.shortcutButton.setEnabled(False)
         QtCore.QObject.connect(self.shortcutButton,
@@ -63,7 +64,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.onRestoreDefaultsClicked)
 
     def keyPressEvent(self, event):
-        event.ignore()
+        if self.shortcutButton.isChecked():
+            event.ignore()
+        elif event.key() == QtCore.Qt.Key_Escape:
+            event.accept()
+            self.close()
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
@@ -87,7 +92,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         shortcut_valid = True
         for category in ActionList.categories:
             for action in category.actions:
-                shortcuts = action.shortcuts()
+                shortcuts = self._actionShortcuts(action)
                 if key_sequence not in shortcuts:
                     continue
                 if action is changing_action:
@@ -116,6 +121,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.shortcutButton.setChecked(False)
 
     def exec_(self):
+        self.changedActions = {}
         self.reloadShortcutList()
         self.shortcutButton.setChecked(False)
         self.shortcutButton.setEnabled(False)
@@ -152,15 +158,16 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             action = item.data(0, QtCore.Qt.UserRole).toPyObject()
             if action is None:
                 continue
-            if len(action.shortcuts()) == 0:
+            shortcuts = self._actionShortcuts(action)
+            if len(shortcuts) == 0:
                 item.setText(1, u'')
                 item.setText(2, u'')
-            elif len(action.shortcuts()) == 1:
-                item.setText(1, action.shortcuts()[0].toString())
+            elif len(shortcuts) == 1:
+                item.setText(1, shortcuts[0].toString())
                 item.setText(2, u'')
             else:
-                item.setText(1, action.shortcuts()[0].toString())
-                item.setText(2, action.shortcuts()[1].toString())
+                item.setText(1, shortcuts[0].toString())
+                item.setText(2, shortcuts[1].toString())
 
     def onShortcutButtonClicked(self, toggled):
         """
@@ -174,20 +181,21 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
-        shortcuts = []
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = []
         # We are changing the primary shortcut.
-        if self.column == 1:
-            shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
-            if len(action.shortcuts()) == 2:
-                shortcuts.append(action.shortcuts()[1])
+        if self.column in [0, 1]:
+            new_shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            if len(shortcuts) == 2:
+                new_shortcuts.append(shortcuts[1])
         # We are changing the secondary shortcut.
         elif self.column == 2:
-            if len(action.shortcuts()) != 0:
-                shortcuts.append(action.shortcuts()[0])
-            shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            if len(shortcuts) != 0:
+                new_shortcuts.append(shortcuts[0])
+            new_shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
         else:
             return
-        action.setShortcuts(shortcuts)
+        self.changedActions[action] = new_shortcuts
         self.refreshShortcutList()
 
     def onItemDoubleClicked(self, item, column):
@@ -209,15 +217,17 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         self.column = column
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
-        self.shortcutButton.setEnabled(True)
         text = u''
-        if action is None or column not in [1, 2]:
+        if action is None:# or column not in [1, 2]:
             self.shortcutButton.setChecked(False)
             self.shortcutButton.setEnabled(False)
-        elif column == 1 and len(action.shortcuts()) != 0:
-            text = action.shortcuts()[0].toString()
-        elif len(action.shortcuts()) == 2 and len(action.shortcuts()) != 0:
-            text = action.shortcuts()[1].toString()
+        else:
+            self.shortcutButton.setEnabled(True)
+            shortcuts = self._actionShortcuts(action)
+            if column != 2 and len(shortcuts) != 0:
+                text = shortcuts[0].toString()
+            elif len(shortcuts) == 2:
+                text = shortcuts[1].toString()
         self.shortcutButton.setText(text)
 
     def onClearShortcutButtonClicked(self, toggled):
@@ -231,7 +241,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
-        action.setShortcuts(action.defaultShortcuts)
+        self.changedActions[action] = action.defaultShortcuts
         self.refreshShortcutList()
         self.onItemPressed(item, self.column)
 
@@ -252,7 +262,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.shortcutButton.setText(u'')
         for category in ActionList.categories:
             for action in category.actions:
-                action.setShortcuts(action.defaultShortcuts)
+                self.changedActions[action] = action.defaultShortcuts
         self.refreshShortcutList()
 
     def save(self):
@@ -264,6 +274,18 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         settings.beginGroup(u'shortcuts')
         for category in ActionList.categories:
             for action in category.actions:
+                if self.changedActions .has_key(action):
+                    action.setShortcuts(self.changedActions[action])
                 settings.setValue(
                     action.objectName(), QtCore.QVariant(action.shortcuts()))
         settings.endGroup()
+
+    def _actionShortcuts(self, action):
+        """
+        This returns the shortcuts for the given ``action``, which also includes
+        those shortcuts which are not yet assigned to an action (as changes are
+        applied when closing the dialog).
+        """
+        if self.changedActions.has_key(action):
+            return self.changedActions[action]
+        return action.shortcuts()

From 65f134ab1b6ce8993359b2346a8fe1d5c7d46c06 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 3 Apr 2011 15:36:59 +0200
Subject: [PATCH 24/47] removed fix (I'll deal with this in another branch)

---
 openlp/core/ui/slidecontroller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index af94eb425..66c26da3b 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -1108,11 +1108,11 @@ class SlideController(QtGui.QWidget):
         screen hide attributes
         """
         blank = None
-        if self.blankScreen.isChecked():
+        if self.blankScreen.isChecked:
             blank = self.blankScreen
-        if self.themeScreen.isChecked():
+        if self.themeScreen.isChecked:
             blank = self.themeScreen
-        if self.desktopScreen.isChecked():
+        if self.desktopScreen.isChecked:
             blank = self.desktopScreen
         if blank:
             blank.setChecked(False)

From dfc2eed1f4206fd57529351574188445c85c3317 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 3 Apr 2011 16:20:55 +0200
Subject: [PATCH 25/47] adapted latest merge

---
 openlp/core/lib/__init__.py        |  4 +++-
 openlp/core/ui/servicemanager.py   |  4 ++--
 openlp/core/ui/shortcutlistform.py |  8 +++++++-
 openlp/core/utils/actions.py       | 30 ++++++++++++++++++++++++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index e62cb3e44..0f0fcca5e 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -186,8 +186,9 @@ def context_menu_action(base, icon, text, slot, shortcuts=None):
     if icon:
         action.setIcon(build_icon(icon))
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot)
-    if shortcuts:
+    if shortcuts is not None:
         action.setShortcuts(shortcuts)
+        ActionList.add_action(action)
     return action
 
 def context_menu(base, icon, text):
@@ -343,3 +344,4 @@ from dockwidget import OpenLPDockWidget
 from renderer import Renderer
 from rendermanager import RenderManager
 from mediamanageritem import MediaManagerItem
+from openlp.core.utils.actions import ActionList
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 3ea3f1a6b..fc20d0f2d 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -202,7 +202,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection down the window.'),
             self.onMoveSelectionDown, shortcuts=[QtCore.Qt.Key_Down])
         self.serviceManagerList.down.setObjectName(u'down')
-        ActionList.add_action(self.serviceManagerList.down, UiStrings.Service)
+        ActionList.add_action(self.serviceManagerList.down)
         self.serviceManagerList.down.setVisible(False)
         self.serviceManagerList.up = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move up'),
@@ -211,7 +211,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection up the window.'),
             self.onMoveSelectionUp, shortcuts=[QtCore.Qt.Key_Up])
         self.serviceManagerList.up.setObjectName(u'up')
-        ActionList.add_action(self.serviceManagerList.up, UiStrings.Service)
+        ActionList.add_action(self.serviceManagerList.up)
         self.serviceManagerList.up.setVisible(False)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.delete = self.orderToolbar.addToolbarButton(
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 58b42a351..5251ac314 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -134,6 +134,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         self.treeWidget.clear()
         for category in ActionList.categories:
+            # Check if the category is for internal use only.
+            if category.name is None:
+                continue
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
@@ -218,7 +221,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.column = column
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         text = u''
-        if action is None:# or column not in [1, 2]:
+        if action is None:
             self.shortcutButton.setChecked(False)
             self.shortcutButton.setEnabled(False)
         else:
@@ -273,6 +276,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
         for category in ActionList.categories:
+            # Check if the category is for internal use only.
+            if category.name is None:
+                continue
             for action in category.actions:
                 if self.changedActions .has_key(action):
                     action.setShortcuts(self.changedActions[action])
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 04cb1f091..efac7b1bd 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -189,8 +189,26 @@ class ActionList(object):
     categories = CategoryList()
 
     @staticmethod
-    def add_action(action, category, weight=None):
-        category = unicode(category)
+    def add_action(action, category=None, weight=None):
+        """
+        Add an action to the list of actions.
+
+        ``action``
+            The action to add (QAction).
+
+        ``category``
+            The category this action belongs to. The category can be a QString
+            or python unicode string. **Note**, if the category is ``None``, the
+            category and its actions are being hidden in the shortcut dialog.
+            However, if they are added, it is possible to avoid assigning
+            shortcuts twice, which is important.
+
+        ``weight``
+            The weight specifies how important a category is. However, this only
+            has an impact on the order the categories are displayed.
+        """
+        if category is not None:
+            category = unicode(category)
         if category not in ActionList.categories:
             ActionList.categories.append(category)
         action.defaultShortcuts = action.shortcuts()
@@ -198,6 +216,9 @@ class ActionList(object):
             ActionList.categories[category].actions.append(action)
         else:
             ActionList.categories[category].actions.add(action, weight)
+        if category is None:
+            # Stop here, as this action is not configurable.
+            return
         # Load the shortcut from the config.
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
@@ -208,8 +229,9 @@ class ActionList(object):
         settings.endGroup()
 
     @staticmethod
-    def remove_action(action, category):
-        category = unicode(category)
+    def remove_action(action, category=None):
+        if category is not None:
+            category = unicode(category)
         if category not in ActionList.categories:
             return
         ActionList.categories[category].actions.remove(action)

From 84605fb43054fadcd4c9690147bf8b62f9f8d9bd Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 4 Apr 2011 16:38:17 +0200
Subject: [PATCH 26/47] fixed wrong context of shortcuts; moved functions

---
 openlp/core/lib/__init__.py         | 53 ---------------------
 openlp/core/lib/mediamanageritem.py | 23 +++++----
 openlp/core/lib/ui.py               | 72 +++++++++++++++++++++++++++--
 openlp/core/ui/servicemanager.py    |  8 ++--
 4 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 0f0fcca5e..491f3e652 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -166,59 +166,6 @@ def build_icon(icon):
             QtGui.QIcon.Normal, QtGui.QIcon.Off)
     return button_icon
 
-def context_menu_action(base, icon, text, slot, shortcuts=None):
-    """
-    Utility method to help build context menus for plugins
-
-    ``base``
-        The parent menu to add this menu item to
-
-    ``icon``
-        An icon for this action
-
-    ``text``
-        The text to display for this action
-
-    ``slot``
-        The code to run when this action is triggered
-    """
-    action = QtGui.QAction(text, base)
-    if icon:
-        action.setIcon(build_icon(icon))
-    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot)
-    if shortcuts is not None:
-        action.setShortcuts(shortcuts)
-        ActionList.add_action(action)
-    return action
-
-def context_menu(base, icon, text):
-    """
-    Utility method to help build context menus for plugins
-
-    ``base``
-        The parent object to add this menu to
-
-    ``icon``
-        An icon for this menu
-
-    ``text``
-        The text to display for this menu
-    """
-    action = QtGui.QMenu(text, base)
-    action.setIcon(build_icon(icon))
-    return action
-
-def context_menu_separator(base):
-    """
-    Add a separator to a context menu
-
-    ``base``
-        The menu object to add the separator to
-    """
-    action = QtGui.QAction(u'', base)
-    action.setSeparator(True)
-    return action
-
 def image_to_byte(image):
     """
     Resize an image to fit on the current screen for the web and returns
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 63132b141..13277876d 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -31,10 +31,10 @@ import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import context_menu_action, context_menu_separator, \
-    SettingsManager, OpenLPToolbar, ServiceItem, StringContent, build_icon, \
-    translate, Receiver, ListWidgetWithDnD
-from openlp.core.lib.ui import UiStrings
+from openlp.core.lib import SettingsManager, OpenLPToolbar, ServiceItem, \
+    StringContent, build_icon, translate, Receiver, ListWidgetWithDnD
+from openlp.core.lib.ui import UiStrings, context_menu_action, \
+    context_menu_separator
 
 log = logging.getLogger(__name__)
 
@@ -260,39 +260,42 @@ class MediaManagerItem(QtGui.QWidget):
                 context_menu_action(
                     self.listView, u':/general/general_edit.png',
                     self.plugin.getString(StringContent.Edit)[u'title'],
-                    self.onEditClick))
+                    self.onEditClick, context=QtCore.Qt.WidgetShortcut))
             self.listView.addAction(context_menu_separator(self.listView))
         if self.hasDeleteIcon:
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_delete.png',
                     self.plugin.getString(StringContent.Delete)[u'title'],
-                    self.onDeleteClick, [QtCore.Qt.Key_Delete]))
+                    self.onDeleteClick, [QtCore.Qt.Key_Delete],
+                    context=QtCore.Qt.WidgetShortcut))
             self.listView.addAction(context_menu_separator(self.listView))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_preview.png',
                 self.plugin.getString(StringContent.Preview)[u'title'],
-                self.onPreviewClick, [QtCore.Qt.Key_Enter]))
+                self.onPreviewClick, [QtCore.Qt.Key_Enter],
+                context=QtCore.Qt.WidgetShortcut))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_live.png',
                 self.plugin.getString(StringContent.Live)[u'title'],
                 self.onLiveClick, [QtCore.Qt.ShiftModifier + \
                 QtCore.Qt.Key_Enter, QtCore.Qt.ShiftModifier + \
-                QtCore.Qt.Key_Return]))
+                QtCore.Qt.Key_Return], context=QtCore.Qt.WidgetShortcut))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_add.png',
                 self.plugin.getString(StringContent.Service)[u'title'],
-                self.onAddClick, [QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal]))
+                self.onAddClick, [QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal],
+                context=QtCore.Qt.WidgetShortcut))
         if self.addToServiceItem:
             self.listView.addAction(
                 context_menu_action(
                     self.listView, u':/general/general_add.png',
                     translate('OpenLP.MediaManagerItem',
                     '&Add to selected Service Item'),
-                    self.onAddEditClick))
+                    self.onAddEditClick, context=QtCore.Qt.WidgetShortcut))
         QtCore.QObject.connect(self.listView,
             QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
             self.onClickPressed)
diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 029bb34df..35ea23497 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -284,7 +284,7 @@ def icon_action(parent, name, icon, checked=None, category=None):
     return action
 
 def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
-    category=None):
+    category=None, context=QtCore.Qt.WindowShortcut):
     """
     Return a shortcut enabled action.
     """
@@ -296,12 +296,76 @@ def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
         action.setCheckable(True)
         action.setChecked(checked)
     action.setShortcuts(shortcuts)
-    action.setShortcutContext(QtCore.Qt.WindowShortcut)
-    if category is not None:
-        ActionList.add_action(action, category)
+    action.setShortcutContext(context)
+    ActionList.add_action(action, category)
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
     return action
 
+def context_menu_action(base, icon, text, slot, shortcuts=None, category=None,
+    context=QtCore.Qt.WindowShortcut):
+    """
+    Utility method to help build context menus for plugins
+
+    ``base``
+        The parent menu to add this menu item to
+
+    ``icon``
+        An icon for this action
+
+    ``text``
+        The text to display for this action
+
+    ``slot``
+        The code to run when this action is triggered
+
+    ``shortcuts``
+        The action's shortcuts.
+
+    ``category``
+        The category the shortcut should be listed in the shortcut dialog. If
+        left to None, then the action will be hidden in the shortcut dialog.
+    
+    ``context``
+        The context the shortcut is valid.
+    """
+    action = QtGui.QAction(text, base)
+    if icon:
+        action.setIcon(build_icon(icon))
+    QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot)
+    if shortcuts is not None:
+        action.setShortcuts(shortcuts)
+        action.setShortcutContext(context)
+        ActionList.add_action(action)
+    return action
+
+def context_menu(base, icon, text):
+    """
+    Utility method to help build context menus for plugins
+
+    ``base``
+        The parent object to add this menu to
+
+    ``icon``
+        An icon for this menu
+
+    ``text``
+        The text to display for this menu
+    """
+    action = QtGui.QMenu(text, base)
+    action.setIcon(build_icon(icon))
+    return action
+
+def context_menu_separator(base):
+    """
+    Add a separator to a context menu
+
+    ``base``
+        The menu object to add the separator to
+    """
+    action = QtGui.QAction(u'', base)
+    action.setSeparator(True)
+    return action
+
 def add_widget_completer(cache, widget):
     """
     Adds a text autocompleter to a widget.
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index fc20d0f2d..caecaca50 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -32,10 +32,10 @@ log = logging.getLogger(__name__)
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
-    Receiver, build_icon, ItemCapabilities, SettingsManager, translate
+from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, \
+    ItemCapabilities, SettingsManager, translate
 from openlp.core.lib.theme import ThemeLevel
-from openlp.core.lib.ui import UiStrings, critical_error_message_box
+from openlp.core.lib.ui import UiStrings, critical_error_message_box, context_menu_action
 from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
@@ -1267,7 +1267,7 @@ class ServiceManager(QtGui.QWidget):
         for theme in theme_list:
             self.themeComboBox.addItem(theme)
             action = context_menu_action(self.serviceManagerList, None, theme,
-                self.onThemeChangeAction)
+                self.onThemeChangeAction, context=QtCore.Qt.WidgetShortcut)
             self.themeMenu.addAction(action)
         index = self.themeComboBox.findText(self.service_theme,
             QtCore.Qt.MatchExactly)

From 4a6be382ff3689cd52da8c330536293055ec5be5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 4 Apr 2011 18:15:38 +0200
Subject: [PATCH 27/47] fixed empty texts

---
 openlp/core/lib/searchedit.py | 3 ++-
 openlp/core/ui/mainwindow.py  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openlp/core/lib/searchedit.py b/openlp/core/lib/searchedit.py
index 41699256f..d32961ef9 100644
--- a/openlp/core/lib/searchedit.py
+++ b/openlp/core/lib/searchedit.py
@@ -133,7 +133,8 @@ class SearchEdit(QtGui.QLineEdit):
         menu = QtGui.QMenu(self)
         first = None
         for identifier, icon, title in items:
-            action = icon_action(menu, title, icon)
+            action = icon_action(menu, u'', icon)
+            action.setText(title)
             action.setData(QtCore.QVariant(identifier))
             menu.addAction(action)
             QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered(bool)'),
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index bb6d105b9..ab712a57d 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -972,8 +972,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.FileMenu.addSeparator()
             for fileId, filename in enumerate(recentFilesToDisplay):
                 log.debug('Recent file name: %s', filename)
-                action =  base_action(self, u'&%d %s' % (fileId + 1,
-                    QtCore.QFileInfo(filename).fileName()))
+                action =  base_action(self, u'')
+                action.setText(u'&%d %s' % 
+                    (fileId + 1, QtCore.QFileInfo(filename).fileName()))
                 action.setData(QtCore.QVariant(filename))
                 self.connect(action, QtCore.SIGNAL(u'triggered()'),
                     self.ServiceManagerContents.onRecentServiceClicked)

From 38c939362455d330663da881762f6b94198ea3bf Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 4 Apr 2011 19:33:42 +0200
Subject: [PATCH 28/47] expand categories

---
 openlp/core/ui/shortcutlistform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 5251ac314..a99b7c3bb 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -145,8 +145,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 actionItem.setData(0,
                     QtCore.Qt.UserRole, QtCore.QVariant(action))
                 item.addChild(actionItem)
-            item.setExpanded(True)
             self.treeWidget.addTopLevelItem(item)
+            item.setExpanded(True)
         self.refreshShortcutList()
 
     def refreshShortcutList(self):

From 9b84319c249cf09b66e90d7f28c7eb38c5afe134 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 7 Apr 2011 16:26:29 +0200
Subject: [PATCH 29/47] added new dialog from superfly + few own changes

---
 openlp/core/ui/shortcutlistdialog.py  | 109 ++++++++++++++++----------
 openlp/core/ui/shortcutlistform.py    |  62 ++++++++-------
 resources/forms/shortcutlistdialog.ui |  80 +++++++++++++------
 3 files changed, 158 insertions(+), 93 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 83f897bd8..6531a1a19 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -30,44 +30,71 @@ from openlp.core.lib import translate, build_icon
 
 class Ui_ShortcutListDialog(object):
     def setupUi(self, shortcutListDialog):
-        shortcutListDialog.resize(440, 450)
-        shortcutListDialog.setObjectName(u'shortcutListDialog')
-        self.dialogLayout = QtGui.QVBoxLayout(shortcutListDialog)
-        self.dialogLayout.setObjectName(u'dialogLayout')
-        self.descriptionLabel = QtGui.QLabel(shortcutListDialog)
-        self.descriptionLabel.setObjectName(u'descriptionLabel')
-        self.descriptionLabel.setWordWrap(True)
-        self.dialogLayout.addWidget(self.descriptionLabel)
+        shortcutListDialog.setObjectName("shortcutListDialog")
+        shortcutListDialog.resize(500, 438)
+        self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
+        self.shortcutListLayout.setSpacing(8)
+        self.shortcutListLayout.setMargin(8)
+        self.shortcutListLayout.setObjectName("shortcutListLayout")
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
         self.treeWidget.setAlternatingRowColors(True)
-        self.treeWidget.setObjectName(u'treeWidget')
+        self.treeWidget.setObjectName("treeWidget")
         self.treeWidget.setColumnCount(3)
-        self.dialogLayout.addWidget(self.treeWidget)
-        self.customLayout = QtGui.QHBoxLayout()
-        self.customLayout.setObjectName(u'customLayout')
-        self.shortcutButtonLabel = QtGui.QLabel(shortcutListDialog)
-        self.shortcutButtonLabel.setObjectName(u'descriptionLabel')
-        self.customLayout.addWidget(self.shortcutButtonLabel)
-        self.shortcutButton = QtGui.QPushButton(shortcutListDialog)
-        self.shortcutButton.setIcon(
-            build_icon(u':/system/system_configure_shortcuts.png'))
-        self.shortcutButton.setCheckable(True)
-        self.shortcutButton.setObjectName(u'shortcutButton')
-        self.shortcutButton.setFixedSize(150, 30)
-        self.customLayout.addWidget(self.shortcutButton)
-        self.clearShortcutButton = QtGui.QToolButton(shortcutListDialog)
-        self.clearShortcutButton.setIcon(
-            build_icon(u':/system/clear_shortcut.png'))
-        self.clearShortcutButton.setAutoRaise(True)
-        self.clearShortcutButton.setObjectName(u'clearShortcutButton')
-        self.customLayout.addWidget(self.clearShortcutButton)
-        self.customLayout.addStretch()
-        self.dialogLayout.addLayout(self.customLayout)
+        self.shortcutListLayout.addWidget(self.treeWidget)
+        self.detailsLayout = QtGui.QGridLayout()
+        self.detailsLayout.setSpacing(8)
+        self.detailsLayout.setContentsMargins(-1, 0, -1, -1)
+        self.detailsLayout.setObjectName("detailsLayout")
+        self.defaultRadioButton = QtGui.QRadioButton(shortcutListDialog)
+        self.defaultRadioButton.setChecked(True)
+        self.defaultRadioButton.setObjectName("defaultRadioButton")
+        self.detailsLayout.addWidget(self.defaultRadioButton, 0, 0, 1, 1)
+        self.customRadioButton = QtGui.QRadioButton(shortcutListDialog)
+        self.customRadioButton.setObjectName("customRadioButton")
+        self.detailsLayout.addWidget(self.customRadioButton, 1, 0, 1, 1)
+        self.primaryLayout = QtGui.QHBoxLayout()
+        self.primaryLayout.setSpacing(8)
+        self.primaryLayout.setObjectName("primaryLayout")
+        self.primaryPushButton = QtGui.QPushButton(shortcutListDialog)
+        self.primaryPushButton.setMinimumSize(QtCore.QSize(84, 0))
+        self.primaryPushButton.setIcon(build_icon(u':/system/system_configure_shortcuts.png'))
+        self.primaryPushButton.setCheckable(True)
+        self.primaryPushButton.setChecked(False)
+        self.primaryPushButton.setObjectName("primaryPushButton")
+        self.primaryLayout.addWidget(self.primaryPushButton)
+        self.clearPrimaryButton = QtGui.QToolButton(shortcutListDialog)
+        self.clearPrimaryButton.setMinimumSize(QtCore.QSize(0, 16))
+        self.clearPrimaryButton.setText("")
+        self.clearPrimaryButton.setIcon(build_icon(u':/system/clear_shortcut.png'))
+        self.clearPrimaryButton.setObjectName("clearPrimaryButton")
+        self.primaryLayout.addWidget(self.clearPrimaryButton)
+        self.detailsLayout.addLayout(self.primaryLayout, 1, 1, 1, 1)
+        self.alternateLayout = QtGui.QHBoxLayout()
+        self.alternateLayout.setSpacing(8)
+        self.alternateLayout.setObjectName("alternateLayout")
+        self.alternatePushButton = QtGui.QPushButton(shortcutListDialog)
+        self.alternatePushButton.setIcon(build_icon(u':/system/system_configure_shortcuts.png'))
+        self.alternatePushButton.setObjectName("alternatePushButton")
+        self.alternateLayout.addWidget(self.alternatePushButton)
+        self.clearAlternateButton = QtGui.QToolButton(shortcutListDialog)
+        self.clearAlternateButton.setText("")
+        self.clearAlternateButton.setIcon(build_icon(u':/system/clear_shortcut.png'))
+        self.clearAlternateButton.setObjectName("clearAlternateButton")
+        self.alternateLayout.addWidget(self.clearAlternateButton)
+        self.detailsLayout.addLayout(self.alternateLayout, 1, 2, 1, 1)
+        self.primaryLabel = QtGui.QLabel(shortcutListDialog)
+        self.primaryLabel.setObjectName("primaryLabel")
+        self.detailsLayout.addWidget(self.primaryLabel, 0, 1, 1, 1)
+        self.alternateLabel = QtGui.QLabel(shortcutListDialog)
+        self.alternateLabel.setObjectName("alternateLabel")
+        self.detailsLayout.addWidget(self.alternateLabel, 0, 2, 1, 1)
+        self.shortcutListLayout.addLayout(self.detailsLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
-        self.buttonBox.setObjectName(u'buttonBox')
-        self.dialogLayout.addWidget(self.buttonBox)
+            QtGui.QDialogButtonBox.Ok|QtGui.QDialogButtonBox.Reset)
+        self.buttonBox.setObjectName("buttonBox")
+        self.shortcutListLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
             shortcutListDialog.accept)
@@ -78,15 +105,17 @@ class Ui_ShortcutListDialog(object):
     def retranslateUi(self, shortcutListDialog):
         shortcutListDialog.setWindowTitle(
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
-        self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
-            'Select an action and click the button below to start capturing '
-            'a new shortcut.'))
+        #self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
+            #'Select an action and click the button below to start capturing '
+            #'a new shortcut.'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
             translate('OpenLP.ShortcutListDialog', 'Alternate')])
-        self.shortcutButtonLabel.setText(
+        self.primaryPushButton.setText(
             translate('OpenLP.ShortcutListDialog', 'Capture shortcut:'))
-        self.clearShortcutButton.setToolTip(
-            translate('OpenLP.ShortcutListDialog',
-            'Restore the default shortcut(s) of this action.'))
+        self.alternatePushButton.setText(
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut:'))
+        #self.clearShortcutButton.setToolTip(
+            #translate('OpenLP.ShortcutListDialog',
+            #'Restore the default shortcut(s) of this action.'))
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index a99b7c3bb..00e216c2a 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -47,24 +47,28 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.setupUi(self)
         self.column = -1
         self.changedActions = {}
-        self.shortcutButton.setText(u'')
-        self.shortcutButton.setEnabled(False)
-        QtCore.QObject.connect(self.shortcutButton,
-            QtCore.SIGNAL(u'toggled(bool)'), self.onShortcutButtonClicked)
+        self.primaryPushButton.setText(u'')
+        self.alternatePushButton.setText(u'')
+        self.primaryPushButton.setEnabled(False)
+        self.alternatePushButton.setEnabled(False)
+        QtCore.QObject.connect(self.primaryPushButton,
+            QtCore.SIGNAL(u'toggled(bool)'), self.onPrimaryPushButtonClicked)
         QtCore.QObject.connect(self.treeWidget,
             QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'),
             self.onItemPressed)
         QtCore.QObject.connect(self.treeWidget,
             QtCore.SIGNAL(u'itemDoubleClicked(QTreeWidgetItem*, int)'),
             self.onItemDoubleClicked)
-        QtCore.QObject.connect(self.clearShortcutButton,
-            QtCore.SIGNAL(u'clicked(bool)'), self.onClearShortcutButtonClicked)
+        QtCore.QObject.connect(self.clearPrimaryButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onClearPrimaryButtonClicked)
+#        QtCore.QObject.connect(self.clearShortcutButton,
+#            QtCore.SIGNAL(u'clicked(bool)'), self.onClearPrimaryButtonClicked)
         QtCore.QObject.connect(self.buttonBox,
             QtCore.SIGNAL(u'clicked(QAbstractButton*)'),
             self.onRestoreDefaultsClicked)
 
     def keyPressEvent(self, event):
-        if self.shortcutButton.isChecked():
+        if self.primaryPushButton.isChecked():
             event.ignore()
         elif event.key() == QtCore.Qt.Key_Escape:
             event.accept()
@@ -72,7 +76,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
-        if not self.shortcutButton.isChecked():
+        if not self.primaryPushButton.isChecked():
             return
         key = event.key()
         if key == Qt.Key_Shift or key == Qt.Key_Control or \
@@ -117,15 +121,15 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 QtGui.QMessageBox.Ok
             )
         else:
-            self.shortcutButton.setText(key_sequence.toString())
-            self.shortcutButton.setChecked(False)
+            self.primaryPushButton.setText(key_sequence.toString())
+            self.primaryPushButton.setChecked(False)
 
     def exec_(self):
         self.changedActions = {}
         self.reloadShortcutList()
-        self.shortcutButton.setChecked(False)
-        self.shortcutButton.setEnabled(False)
-        self.shortcutButton.setText(u'')
+        self.primaryPushButton.setChecked(False)
+        self.primaryPushButton.setEnabled(False)
+        self.primaryPushButton.setText(u'')
         return QtGui.QDialog.exec_(self)
 
     def reloadShortcutList(self):
@@ -172,7 +176,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 item.setText(1, shortcuts[0].toString())
                 item.setText(2, shortcuts[1].toString())
 
-    def onShortcutButtonClicked(self, toggled):
+    def onPrimaryPushButtonClicked(self, toggled):
         """
         Save the new shortcut to the action if the button is unchanged.
         """
@@ -188,14 +192,16 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         new_shortcuts = []
         # We are changing the primary shortcut.
         if self.column in [0, 1]:
-            new_shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            new_shortcuts.append(
+                QtGui.QKeySequence(self.primaryPushButton.text()))
             if len(shortcuts) == 2:
                 new_shortcuts.append(shortcuts[1])
         # We are changing the secondary shortcut.
         elif self.column == 2:
             if len(shortcuts) != 0:
                 new_shortcuts.append(shortcuts[0])
-            new_shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
+            new_shortcuts.append(
+                QtGui.QKeySequence(self.primaryPushButton.text()))
         else:
             return
         self.changedActions[action] = new_shortcuts
@@ -203,14 +209,14 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def onItemDoubleClicked(self, item, column):
         """
-        A item has been double clicked. ``The shortcutButton`` will be checked
-        and the item's shortcut will be displayed.
+        A item has been double clicked. ``The primaryPushButton`` will be
+        checked and the item's shortcut will be displayed.
         """
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         if action is None:
             return
-        self.shortcutButton.setChecked(True)
-        self.shortcutButton.setFocus(QtCore.Qt.OtherFocusReason)
+        self.primaryPushButton.setChecked(True)
+        self.primaryPushButton.setFocus(QtCore.Qt.OtherFocusReason)
         self.onItemPressed(item, column)
 
     def onItemPressed(self, item, column):
@@ -222,23 +228,23 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
         text = u''
         if action is None:
-            self.shortcutButton.setChecked(False)
-            self.shortcutButton.setEnabled(False)
+            self.primaryPushButton.setChecked(False)
+            self.primaryPushButton.setEnabled(False)
         else:
-            self.shortcutButton.setEnabled(True)
+            self.primaryPushButton.setEnabled(True)
             shortcuts = self._actionShortcuts(action)
             if column != 2 and len(shortcuts) != 0:
                 text = shortcuts[0].toString()
             elif len(shortcuts) == 2:
                 text = shortcuts[1].toString()
-        self.shortcutButton.setText(text)
+        self.primaryPushButton.setText(text)
 
-    def onClearShortcutButtonClicked(self, toggled):
+    def onClearPrimaryButtonClicked(self, toggled):
         """
         Restore the defaults of this 
         """
         item = self.treeWidget.currentItem()
-        self.shortcutButton.setChecked(False)
+        self.primaryPushButton.setChecked(False)
         if item is None:
             return
         action = item.data(0, QtCore.Qt.UserRole).toPyObject()
@@ -261,8 +267,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             QtGui.QMessageBox.Yes |
             QtGui.QMessageBox.No)) == QtGui.QMessageBox.No:
             return
-        self.shortcutButton.setChecked(False)
-        self.shortcutButton.setText(u'')
+        self.primaryPushButton.setChecked(False)
+        self.primaryPushButton.setText(u'')
         for category in ActionList.categories:
             for action in category.actions:
                 self.changedActions[action] = action.defaultShortcuts
diff --git a/resources/forms/shortcutlistdialog.ui b/resources/forms/shortcutlistdialog.ui
index 519925560..9a5c599d1 100644
--- a/resources/forms/shortcutlistdialog.ui
+++ b/resources/forms/shortcutlistdialog.ui
@@ -41,35 +41,35 @@
     </widget>
    </item>
    <item>
-    <layout class="QVBoxLayout" name="shortcutLayout">
+    <layout class="QGridLayout" name="detailsLayout">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
      <property name="spacing">
       <number>8</number>
      </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <item>
+     <item row="0" column="0">
       <widget class="QRadioButton" name="defaultRadioButton">
        <property name="text">
-        <string>Default: None</string>
+        <string>Default:</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item>
-      <layout class="QHBoxLayout" name="customShortcutLayout">
+     <item row="1" column="0">
+      <widget class="QRadioButton" name="customRadioButton">
+       <property name="text">
+        <string>Custom:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="shortcutLayout">
        <property name="spacing">
         <number>8</number>
        </property>
-       <item>
-        <widget class="QRadioButton" name="customRadioButton">
-         <property name="text">
-          <string>Custom:</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QPushButton" name="shortcutPushButton">
          <property name="minimumSize">
@@ -83,7 +83,7 @@
          </property>
          <property name="icon">
           <iconset resource="../images/openlp-2.qrc">
-           <normaloff>:/system/system_settings.png</normaloff>:/system/system_settings.png</iconset>
+           <normaloff>:/system/system_configure_shortcuts.png</normaloff>:/system/system_configure_shortcuts.png</iconset>
          </property>
          <property name="checkable">
           <bool>true</bool>
@@ -110,21 +110,51 @@
          </property>
         </widget>
        </item>
+      </layout>
+     </item>
+     <item row="1" column="2">
+      <layout class="QHBoxLayout" name="alternateLayout">
+       <property name="spacing">
+        <number>8</number>
+       </property>
        <item>
-        <spacer name="customShortcutSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+        <widget class="QPushButton" name="alternatePushButton">
+         <property name="text">
+          <string>None</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
+         <property name="icon">
+          <iconset resource="../images/openlp-2.qrc">
+           <normaloff>:/system/system_configure_shortcuts.png</normaloff>:/system/system_configure_shortcuts.png</iconset>
          </property>
-        </spacer>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="clearAlternateButton">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset resource="../images/openlp-2.qrc">
+           <normaloff>:/system/clear_shortcut.png</normaloff>:/system/clear_shortcut.png</iconset>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="shortcutLabel">
+       <property name="text">
+        <string>Ctrl+V</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QLabel" name="alternateLabel">
+       <property name="text">
+        <string>Shift+Ins</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

From dab699371cea47a8cbc2f6fb4ec9c926e4ac195c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 7 Apr 2011 17:37:07 +0200
Subject: [PATCH 30/47] integrated second button(s), clean ups

---
 openlp/core/ui/shortcutlistdialog.py |  74 +++++------
 openlp/core/ui/shortcutlistform.py   | 175 +++++++++++++++++----------
 2 files changed, 150 insertions(+), 99 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 6531a1a19..b5dffd936 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -30,70 +30,67 @@ from openlp.core.lib import translate, build_icon
 
 class Ui_ShortcutListDialog(object):
     def setupUi(self, shortcutListDialog):
-        shortcutListDialog.setObjectName("shortcutListDialog")
+        shortcutListDialog.setObjectName(u'shortcutListDialog')
         shortcutListDialog.resize(500, 438)
         self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
-        self.shortcutListLayout.setSpacing(8)
-        self.shortcutListLayout.setMargin(8)
-        self.shortcutListLayout.setObjectName("shortcutListLayout")
+        self.shortcutListLayout.setObjectName(u'shortcutListLayout')
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
+        self.treeWidget.setObjectName(u'treeWidget')
         self.treeWidget.setAlternatingRowColors(True)
-        self.treeWidget.setObjectName("treeWidget")
         self.treeWidget.setColumnCount(3)
         self.shortcutListLayout.addWidget(self.treeWidget)
         self.detailsLayout = QtGui.QGridLayout()
-        self.detailsLayout.setSpacing(8)
+        self.detailsLayout.setObjectName(u'detailsLayout')
         self.detailsLayout.setContentsMargins(-1, 0, -1, -1)
-        self.detailsLayout.setObjectName("detailsLayout")
         self.defaultRadioButton = QtGui.QRadioButton(shortcutListDialog)
+        self.defaultRadioButton.setObjectName(u'defaultRadioButton')
         self.defaultRadioButton.setChecked(True)
-        self.defaultRadioButton.setObjectName("defaultRadioButton")
         self.detailsLayout.addWidget(self.defaultRadioButton, 0, 0, 1, 1)
         self.customRadioButton = QtGui.QRadioButton(shortcutListDialog)
-        self.customRadioButton.setObjectName("customRadioButton")
+        self.customRadioButton.setObjectName(u'customRadioButton')
         self.detailsLayout.addWidget(self.customRadioButton, 1, 0, 1, 1)
         self.primaryLayout = QtGui.QHBoxLayout()
-        self.primaryLayout.setSpacing(8)
-        self.primaryLayout.setObjectName("primaryLayout")
+        self.primaryLayout.setObjectName(u'primaryLayout')
         self.primaryPushButton = QtGui.QPushButton(shortcutListDialog)
+        self.primaryPushButton.setObjectName(u'primaryPushButton')
         self.primaryPushButton.setMinimumSize(QtCore.QSize(84, 0))
-        self.primaryPushButton.setIcon(build_icon(u':/system/system_configure_shortcuts.png'))
+        self.primaryPushButton.setIcon(
+            build_icon(u':/system/system_configure_shortcuts.png'))
         self.primaryPushButton.setCheckable(True)
-        self.primaryPushButton.setChecked(False)
-        self.primaryPushButton.setObjectName("primaryPushButton")
         self.primaryLayout.addWidget(self.primaryPushButton)
         self.clearPrimaryButton = QtGui.QToolButton(shortcutListDialog)
+        self.clearPrimaryButton.setObjectName(u'clearPrimaryButton')
         self.clearPrimaryButton.setMinimumSize(QtCore.QSize(0, 16))
-        self.clearPrimaryButton.setText("")
-        self.clearPrimaryButton.setIcon(build_icon(u':/system/clear_shortcut.png'))
-        self.clearPrimaryButton.setObjectName("clearPrimaryButton")
+        self.clearPrimaryButton.setIcon(
+            build_icon(u':/system/clear_shortcut.png'))
         self.primaryLayout.addWidget(self.clearPrimaryButton)
         self.detailsLayout.addLayout(self.primaryLayout, 1, 1, 1, 1)
         self.alternateLayout = QtGui.QHBoxLayout()
-        self.alternateLayout.setSpacing(8)
-        self.alternateLayout.setObjectName("alternateLayout")
+        self.alternateLayout.setObjectName(u'alternateLayout')
         self.alternatePushButton = QtGui.QPushButton(shortcutListDialog)
-        self.alternatePushButton.setIcon(build_icon(u':/system/system_configure_shortcuts.png'))
-        self.alternatePushButton.setObjectName("alternatePushButton")
+        self.alternatePushButton.setObjectName(u'alternatePushButton')
+        self.alternatePushButton.setCheckable(True)
+        self.alternatePushButton.setIcon(
+            build_icon(u':/system/system_configure_shortcuts.png'))
         self.alternateLayout.addWidget(self.alternatePushButton)
         self.clearAlternateButton = QtGui.QToolButton(shortcutListDialog)
-        self.clearAlternateButton.setText("")
-        self.clearAlternateButton.setIcon(build_icon(u':/system/clear_shortcut.png'))
-        self.clearAlternateButton.setObjectName("clearAlternateButton")
+        self.clearAlternateButton.setObjectName(u'clearAlternateButton')
+        self.clearAlternateButton.setIcon(
+            build_icon(u':/system/clear_shortcut.png'))
         self.alternateLayout.addWidget(self.clearAlternateButton)
         self.detailsLayout.addLayout(self.alternateLayout, 1, 2, 1, 1)
         self.primaryLabel = QtGui.QLabel(shortcutListDialog)
-        self.primaryLabel.setObjectName("primaryLabel")
+        self.primaryLabel.setObjectName(u'primaryLabel')
         self.detailsLayout.addWidget(self.primaryLabel, 0, 1, 1, 1)
         self.alternateLabel = QtGui.QLabel(shortcutListDialog)
-        self.alternateLabel.setObjectName("alternateLabel")
+        self.alternateLabel.setObjectName(u'alternateLabel')
         self.detailsLayout.addWidget(self.alternateLabel, 0, 2, 1, 1)
         self.shortcutListLayout.addLayout(self.detailsLayout)
         self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
+        self.buttonBox.setObjectName(u'buttonBox')
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
-            QtGui.QDialogButtonBox.Ok|QtGui.QDialogButtonBox.Reset)
-        self.buttonBox.setObjectName("buttonBox")
+            QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults)
         self.shortcutListLayout.addWidget(self.buttonBox)
         self.retranslateUi(shortcutListDialog)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
@@ -112,10 +109,17 @@ class Ui_ShortcutListDialog(object):
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
             translate('OpenLP.ShortcutListDialog', 'Alternate')])
-        self.primaryPushButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Capture shortcut:'))
-        self.alternatePushButton.setText(
-            translate('OpenLP.ShortcutListDialog', 'Capture shortcut:'))
-        #self.clearShortcutButton.setToolTip(
-            #translate('OpenLP.ShortcutListDialog',
-            #'Restore the default shortcut(s) of this action.'))
+        self.defaultRadioButton.setText(
+            translate('OpenLP.ShortcutListDialog', 'Default'))
+        self.customRadioButton.setText(
+            translate('OpenLP.ShortcutListDialog', 'Custom'))
+        self.primaryPushButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
+        self.alternatePushButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
+        self.clearPrimaryButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog',
+            'Restore the default shortcut(s) of this action.'))
+        self.clearAlternateButton.setToolTip(
+            translate('OpenLP.ShortcutListDialog',
+            'Restore the default shortcut(s) of this action.'))
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 00e216c2a..cda8cfc5d 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -45,14 +45,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.column = -1
         self.changedActions = {}
-        self.primaryPushButton.setText(u'')
-        self.alternatePushButton.setText(u'')
-        self.primaryPushButton.setEnabled(False)
-        self.alternatePushButton.setEnabled(False)
         QtCore.QObject.connect(self.primaryPushButton,
             QtCore.SIGNAL(u'toggled(bool)'), self.onPrimaryPushButtonClicked)
+        QtCore.QObject.connect(self.alternatePushButton,
+            QtCore.SIGNAL(u'toggled(bool)'), self.onAlternatePushButtonClicked)
         QtCore.QObject.connect(self.treeWidget,
             QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'),
             self.onItemPressed)
@@ -61,14 +58,15 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.onItemDoubleClicked)
         QtCore.QObject.connect(self.clearPrimaryButton,
             QtCore.SIGNAL(u'clicked(bool)'), self.onClearPrimaryButtonClicked)
-#        QtCore.QObject.connect(self.clearShortcutButton,
-#            QtCore.SIGNAL(u'clicked(bool)'), self.onClearPrimaryButtonClicked)
+        QtCore.QObject.connect(self.clearAlternateButton,
+            QtCore.SIGNAL(u'clicked(bool)'), self.onClearAlternateButtonClicked)
         QtCore.QObject.connect(self.buttonBox,
             QtCore.SIGNAL(u'clicked(QAbstractButton*)'),
             self.onRestoreDefaultsClicked)
 
     def keyPressEvent(self, event):
-        if self.primaryPushButton.isChecked():
+        if self.primaryPushButton.isChecked() or \
+            self.alternatePushButton.isChecked():
             event.ignore()
         elif event.key() == QtCore.Qt.Key_Escape:
             event.accept()
@@ -76,7 +74,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def keyReleaseEvent(self, event):
         Qt = QtCore.Qt
-        if not self.primaryPushButton.isChecked():
+        if not self.primaryPushButton.isChecked() and \
+            not self.alternatePushButton.isChecked():
             return
         key = event.key()
         if key == Qt.Key_Shift or key == Qt.Key_Control or \
@@ -90,9 +89,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
-        # The item/action we are attempting to change.
-        changing_item = self.treeWidget.currentItem()
-        changing_action = changing_item.data(0, QtCore.Qt.UserRole).toPyObject()
+        # The action we are attempting to change.
+        changing_action = self._currentItemAction()
         shortcut_valid = True
         for category in ActionList.categories:
             for action in category.actions:
@@ -100,11 +98,18 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 if key_sequence not in shortcuts:
                     continue
                 if action is changing_action:
-                    continue
-                # Have the same parentWidget, thus they cannot have the same
-                # shortcut.
+                    if self.primaryPushButton.isChecked() and \
+                        shortcuts.index(key_sequence) == 0:
+                        continue
+                    if self.alternatePushButton.isChecked() and \
+                        shortcuts.index(key_sequence) == 1:
+                        continue
+                # Have the same parent, thus they cannot have the same shortcut.
                 if action.parent() is changing_action.parent():
                     shortcut_valid = False
+                # The new shortcut is already assigned, but if both shortcuts
+                # are only valid in a different widget the new shortcut is
+                # vaild, because they will not interfere.
                 if action.shortcutContext() in [QtCore.Qt.WindowShortcut,
                     QtCore.Qt.ApplicationShortcut]:
                     shortcut_valid = False
@@ -121,8 +126,12 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                 QtGui.QMessageBox.Ok
             )
         else:
-            self.primaryPushButton.setText(key_sequence.toString())
-            self.primaryPushButton.setChecked(False)
+            if self.primaryPushButton.isChecked():
+                self.primaryPushButton.setText(key_sequence.toString())
+                self.primaryPushButton.setChecked(False)
+            elif self.alternatePushButton.isChecked():
+                self.alternatePushButton.setText(key_sequence.toString())
+                self.alternatePushButton.setChecked(False)
 
     def exec_(self):
         self.changedActions = {}
@@ -130,6 +139,9 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.primaryPushButton.setChecked(False)
         self.primaryPushButton.setEnabled(False)
         self.primaryPushButton.setText(u'')
+        self.alternatePushButton.setChecked(False)
+        self.alternatePushButton.setEnabled(False)
+        self.alternatePushButton.setText(u'')
         return QtGui.QDialog.exec_(self)
 
     def reloadShortcutList(self):
@@ -162,7 +174,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         while iterator.value():
             item = iterator.value()
             iterator += 1
-            action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+            action = self._currentItemAction(item)
             if action is None:
                 continue
             shortcuts = self._actionShortcuts(action)
@@ -181,29 +193,35 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         Save the new shortcut to the action if the button is unchanged.
         """
         if toggled:
+            self.alternatePushButton.setChecked(False)
             return
-        item = self.treeWidget.currentItem()
-        if item is None:
-            return
-        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        action = self._currentItemAction()
         if action is None:
             return
         shortcuts = self._actionShortcuts(action)
         new_shortcuts = []
-        # We are changing the primary shortcut.
-        if self.column in [0, 1]:
-            new_shortcuts.append(
-                QtGui.QKeySequence(self.primaryPushButton.text()))
-            if len(shortcuts) == 2:
-                new_shortcuts.append(shortcuts[1])
-        # We are changing the secondary shortcut.
-        elif self.column == 2:
-            if len(shortcuts) != 0:
-                new_shortcuts.append(shortcuts[0])
-            new_shortcuts.append(
-                QtGui.QKeySequence(self.primaryPushButton.text()))
-        else:
+        new_shortcuts.append(
+            QtGui.QKeySequence(self.primaryPushButton.text()))
+        if len(shortcuts) == 2:
+            new_shortcuts.append(shortcuts[1])
+        self.changedActions[action] = new_shortcuts
+        self.refreshShortcutList()
+
+    def onAlternatePushButtonClicked(self, toggled):
+        """
+        """
+        if toggled:
+            self.primaryPushButton.setChecked(False)
             return
+        action = self._currentItemAction()
+        if action is None:
+            return
+        shortcuts = self._actionShortcuts(action)
+        new_shortcuts = []
+        if len(shortcuts) != 0:
+            new_shortcuts.append(shortcuts[0])
+        new_shortcuts.append(
+            QtGui.QKeySequence(self.alternatePushButton.text()))
         self.changedActions[action] = new_shortcuts
         self.refreshShortcutList()
 
@@ -212,47 +230,39 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         A item has been double clicked. ``The primaryPushButton`` will be
         checked and the item's shortcut will be displayed.
         """
-        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
+        action = self._currentItemAction(item)
         if action is None:
             return
-        self.primaryPushButton.setChecked(True)
-        self.primaryPushButton.setFocus(QtCore.Qt.OtherFocusReason)
-        self.onItemPressed(item, column)
+        self.primaryPushButton.setChecked(column in [0, 1])
+        self.alternatePushButton.setChecked(column not in [0, 1])
+        if column in [0, 1]:
+            self.primaryPushButton.setFocus(QtCore.Qt.OtherFocusReason)
+        else:
+            self.alternatePushButton.setFocus(QtCore.Qt.OtherFocusReason)
+        self.onItemPressed()
 
-    def onItemPressed(self, item, column):
+    def onItemPressed(self, item=None, column=-1):
         """
         A item has been pressed. We adjust the button's text to the action's
         shortcut which is encapsulate in the item.
         """
-        self.column = column
-        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
-        text = u''
+        action = self._currentItemAction(item)
+        self.primaryPushButton.setEnabled(action is not None)
+        self.alternatePushButton.setEnabled(action is not None)
+        primary_text = u''
+        alternate_text = u''
         if action is None:
             self.primaryPushButton.setChecked(False)
-            self.primaryPushButton.setEnabled(False)
+            self.alternatePushButton.setChecked(False)
         else:
-            self.primaryPushButton.setEnabled(True)
             shortcuts = self._actionShortcuts(action)
-            if column != 2 and len(shortcuts) != 0:
-                text = shortcuts[0].toString()
+            if len(shortcuts) == 1:
+                primary_text = shortcuts[0].toString()
             elif len(shortcuts) == 2:
-                text = shortcuts[1].toString()
-        self.primaryPushButton.setText(text)
-
-    def onClearPrimaryButtonClicked(self, toggled):
-        """
-        Restore the defaults of this 
-        """
-        item = self.treeWidget.currentItem()
-        self.primaryPushButton.setChecked(False)
-        if item is None:
-            return
-        action = item.data(0, QtCore.Qt.UserRole).toPyObject()
-        if action is None:
-            return
-        self.changedActions[action] = action.defaultShortcuts
-        self.refreshShortcutList()
-        self.onItemPressed(item, self.column)
+                primary_text = shortcuts[0].toString()
+                alternate_text = shortcuts[1].toString()
+        self.primaryPushButton.setText(primary_text)
+        self.alternatePushButton.setText(alternate_text)
 
     def onRestoreDefaultsClicked(self, button):
         """
@@ -269,6 +279,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         self.primaryPushButton.setChecked(False)
         self.primaryPushButton.setText(u'')
+        self.alternatePushButton.setChecked(False)
+        self.alternatePushButton.setText(u'')
         for category in ActionList.categories:
             for action in category.actions:
                 self.changedActions[action] = action.defaultShortcuts
@@ -292,6 +304,30 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
                     action.objectName(), QtCore.QVariant(action.shortcuts()))
         settings.endGroup()
 
+    def onClearPrimaryButtonClicked(self, toggled):
+        """
+        Restore the defaults of this action.
+        """
+        self._clearButtonClicked(self.primaryPushButton)
+
+    def onClearAlternateButtonClicked(self, toggled):
+        """
+        Restore the defaults of this action.
+        """
+        self._clearButtonClicked(self.alternatePushButton)
+
+    def _clearButtonClicked(self, button):
+        """
+        Restore the defaults of this action. The given button will be unchecked.
+        """
+        button.setChecked(False)
+        action = self._currentItemAction()
+        if action is None:
+            return
+        self.changedActions[action] = action.defaultShortcuts
+        self.refreshShortcutList()
+        self.onItemPressed()
+
     def _actionShortcuts(self, action):
         """
         This returns the shortcuts for the given ``action``, which also includes
@@ -301,3 +337,14 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         if self.changedActions.has_key(action):
             return self.changedActions[action]
         return action.shortcuts()
+
+    def _currentItemAction(self, item=None):
+        """
+        Returns the action of the current item if no item is given, otherwise
+        we return the action of the given item.
+        """
+        if item is None:
+            item = self.treeWidget.currentItem()
+            if item is None:
+                return
+        return item.data(0, QtCore.Qt.UserRole).toPyObject()

From ea5e0d65cc5209db530012416f867e1920d8d879 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Fri, 8 Apr 2011 08:25:02 +0200
Subject: [PATCH 31/47]

---
 openlp/core/ui/shortcutlistdialog.py |  4 +-
 openlp/core/ui/shortcutlistform.py   | 68 ++++++++++++++++++----------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index b5dffd936..a5050ab25 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -119,7 +119,7 @@ class Ui_ShortcutListDialog(object):
             translate('OpenLP.ShortcutListDialog', 'Capture shortcut.'))
         self.clearPrimaryButton.setToolTip(
             translate('OpenLP.ShortcutListDialog',
-            'Restore the default shortcut(s) of this action.'))
+            'Restore the default shortcut of this action.'))
         self.clearAlternateButton.setToolTip(
             translate('OpenLP.ShortcutListDialog',
-            'Restore the default shortcut(s) of this action.'))
+            'Restore the default shortcut of this action.'))
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index cda8cfc5d..9b20fd9d2 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -127,21 +127,17 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             )
         else:
             if self.primaryPushButton.isChecked():
-                self.primaryPushButton.setText(key_sequence.toString())
-                self.primaryPushButton.setChecked(False)
+                self._adjustButton(self.primaryPushButton,
+                    checked=False, text=key_sequence.toString())
             elif self.alternatePushButton.isChecked():
-                self.alternatePushButton.setText(key_sequence.toString())
-                self.alternatePushButton.setChecked(False)
+                self._adjustButton(self.alternatePushButton,
+                    checked=False, text=key_sequence.toString())
 
     def exec_(self):
         self.changedActions = {}
         self.reloadShortcutList()
-        self.primaryPushButton.setChecked(False)
-        self.primaryPushButton.setEnabled(False)
-        self.primaryPushButton.setText(u'')
-        self.alternatePushButton.setChecked(False)
-        self.alternatePushButton.setEnabled(False)
-        self.alternatePushButton.setText(u'')
+        self._adjustButton(self.primaryPushButton, False, False, u'')
+        self._adjustButton(self.alternatePushButton, False, False, u'')
         return QtGui.QDialog.exec_(self)
 
     def reloadShortcutList(self):
@@ -227,7 +223,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def onItemDoubleClicked(self, item, column):
         """
-        A item has been double clicked. ``The primaryPushButton`` will be
+        A item has been double clicked. The ``primaryPushButton`` will be
         checked and the item's shortcut will be displayed.
         """
         action = self._currentItemAction(item)
@@ -251,18 +247,30 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.alternatePushButton.setEnabled(action is not None)
         primary_text = u''
         alternate_text = u''
+        primary_label_text = u''
+        alternate_label_text = u''
         if action is None:
             self.primaryPushButton.setChecked(False)
             self.alternatePushButton.setChecked(False)
         else:
+            if len(action.defaultShortcuts) != 0:
+                primary_label_text = action.defaultShortcuts[0].toString()
+                if len(action.defaultShortcuts) == 2:
+                    alternate_label_text = action.defaultShortcuts[1].toString()
             shortcuts = self._actionShortcuts(action)
-            if len(shortcuts) == 1:
-                primary_text = shortcuts[0].toString()
-            elif len(shortcuts) == 2:
-                primary_text = shortcuts[0].toString()
-                alternate_text = shortcuts[1].toString()
+            if shortcuts != action.defaultShortcuts:
+                self.customRadioButton.setChecked(True)
+                if len(shortcuts) == 1:
+                    primary_text = shortcuts[0].toString()
+                elif len(shortcuts) == 2:
+                    primary_text = shortcuts[0].toString()
+                    alternate_text = shortcuts[1].toString()
+            else:
+                self.defaultRadioButton.setChecked(True)
         self.primaryPushButton.setText(primary_text)
         self.alternatePushButton.setText(alternate_text)
+        self.primaryLabel.setText(primary_label_text)
+        self.alternateLabel.setText(alternate_label_text)
 
     def onRestoreDefaultsClicked(self, button):
         """
@@ -277,10 +285,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             QtGui.QMessageBox.Yes |
             QtGui.QMessageBox.No)) == QtGui.QMessageBox.No:
             return
-        self.primaryPushButton.setChecked(False)
-        self.primaryPushButton.setText(u'')
-        self.alternatePushButton.setChecked(False)
-        self.alternatePushButton.setText(u'')
+        self._adjustButton(self.primaryPushButton, False, text=u'')
+        self._adjustButton(self.alternatePushButton, False, text=u'')
         for category in ActionList.categories:
             for action in category.actions:
                 self.changedActions[action] = action.defaultShortcuts
@@ -318,7 +324,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def _clearButtonClicked(self, button):
         """
-        Restore the defaults of this action. The given button will be unchecked.
+        Restore the defaults of this action. The given ``button`` will be
+        unchecked.
         """
         button.setChecked(False)
         action = self._currentItemAction()
@@ -331,8 +338,8 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
     def _actionShortcuts(self, action):
         """
         This returns the shortcuts for the given ``action``, which also includes
-        those shortcuts which are not yet assigned to an action (as changes are
-        applied when closing the dialog).
+        those shortcuts which are not saved yet but already assigned (as changes
+        are applied when closing the dialog).
         """
         if self.changedActions.has_key(action):
             return self.changedActions[action]
@@ -340,11 +347,22 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
 
     def _currentItemAction(self, item=None):
         """
-        Returns the action of the current item if no item is given, otherwise
-        we return the action of the given item.
+        Returns the action of the given ``item``. If no item is given, we return
+        the action of the current item of the ``treeWidget``.
         """
         if item is None:
             item = self.treeWidget.currentItem()
             if item is None:
                 return
         return item.data(0, QtCore.Qt.UserRole).toPyObject()
+
+    def _adjustButton(self, button, checked=None, enabled=None, text=None):
+        """
+        Can be called to adjust more properties of the given ``button`` at once.
+        """
+        if checked is not None:
+            button.setChecked(checked)
+        if enabled is not None:
+            button.setEnabled(enabled)
+        if text is not None:
+            button.setText(text)

From 283171e296ca2aeb1c6d9475d2548ff0ff353c81 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 9 Apr 2011 16:50:44 +0200
Subject: [PATCH 32/47] use weight to sort categories

---
 openlp/core/ui/mainwindow.py      |  9 +++++++
 openlp/core/ui/servicemanager.py  |  1 +
 openlp/core/ui/slidecontroller.py |  2 ++
 openlp/core/utils/actions.py      | 42 ++++++++++++++++++++++++++-----
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index ab712a57d..63c5aa777 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -39,6 +39,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     get_application_version
+from openlp.core.utils.actions import ActionList
 
 log = logging.getLogger(__name__)
 
@@ -161,6 +162,7 @@ class Ui_MainWindow(object):
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
             self.themeManagerDock)
         # Create the menu items
+        ActionList.add_category(UiStrings.File, 100)
         self.FileNewItem = shortcut_action(mainWindow, u'FileNewItem',
             [QtGui.QKeySequence(u'Ctrl+N')],
             self.ServiceManagerContents.onNewServiceClicked,
@@ -183,14 +185,17 @@ class Ui_MainWindow(object):
         self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
             [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
             u':/system/system_exit.png', category=UiStrings.File)
+        ActionList.add_category(UiStrings.Import, 95)
         self.ImportThemeItem = base_action(
             mainWindow, u'ImportThemeItem', UiStrings.Import)
         self.ImportLanguageItem = base_action(
             mainWindow, u'ImportLanguageItem')#, UiStrings.Import)
+        ActionList.add_category(UiStrings.Export, 90)
         self.ExportThemeItem = base_action(
             mainWindow, u'ExportThemeItem', UiStrings.Export)
         self.ExportLanguageItem = base_action(
             mainWindow, u'ExportLanguageItem')#, UiStrings.Export)
+        ActionList.add_category(UiStrings.View, 85)
         self.ViewMediaManagerItem = shortcut_action(mainWindow,
             u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
             self.toggleMediaManager, u':/system/system_mediamanager.png',
@@ -210,6 +215,7 @@ class Ui_MainWindow(object):
         self.ViewLivePanel = shortcut_action(mainWindow, u'ViewLivePanel',
             [QtGui.QKeySequence(u'F12')], self.setLivePanelVisibility,
             checked=liveVisible, category=UiStrings.View)
+        ActionList.add_category(UiStrings.ViewMode, 80)
         self.ModeDefaultItem = checkable_action(
             mainWindow, u'ModeDefaultItem', category=UiStrings.ViewMode)
         self.ModeSetupItem = checkable_action(
@@ -221,11 +227,13 @@ class Ui_MainWindow(object):
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
+        ActionList.add_category(UiStrings.Tools, 75)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
             u':/tools/tools_add.png', category=UiStrings.Tools)
         self.ToolsOpenDataFolder = icon_action(mainWindow,
             u'ToolsOpenDataFolder', u':/general/general_open.png',
             category=UiStrings.Tools)
+        ActionList.add_category(UiStrings.Settings, 70)
         self.settingsPluginListItem = shortcut_action(mainWindow,
             u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')],
             self.onPluginItemClicked, u':/system/settings_plugin_list.png',
@@ -253,6 +261,7 @@ class Ui_MainWindow(object):
         self.SettingsConfigureItem = icon_action(mainWindow,
             u'SettingsConfigureItem', u':/system/system_settings.png',
             category=UiStrings.Settings)
+        ActionList.add_category(UiStrings.Help, 65)
         self.HelpDocumentationItem = icon_action(mainWindow,
             u'HelpDocumentationItem', u':/system/system_help_contents.png',
             category=None)#UiStrings.Help)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index caecaca50..528b642ce 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -167,6 +167,7 @@ class ServiceManager(QtGui.QWidget):
             'Move item to the top of the service.'),
             self.onServiceTop, shortcuts=[QtCore.Qt.Key_Home])
         self.serviceManagerList.moveTop.setObjectName(u'moveTop')
+        ActionList.add_category(UiStrings.Service, 45)
         ActionList.add_action(
             self.serviceManagerList.moveTop, UiStrings.Service)
         self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton(
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 66c26da3b..204dada75 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -367,12 +367,14 @@ class SlideController(QtGui.QWidget):
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemPreview')         
         self.nextItem.setObjectName(u'nextItemPreview')
+        ActionList.add_category(UiStrings.PreviewToolbar, 55)
         ActionList.add_action(self.previousItem, UiStrings.PreviewToolbar)
         ActionList.add_action(self.nextItem, UiStrings.PreviewToolbar)
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemLive')         
         self.nextItem.setObjectName(u'nextItemLive')
+        ActionList.add_category(UiStrings.LiveToolbar, 60)
         ActionList.add_action(self.previousItem, UiStrings.LiveToolbar)
         ActionList.add_action(self.nextItem, UiStrings.LiveToolbar)
         self.previousService = shortcut_action(parent, u'previousService',
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index efac7b1bd..214a42249 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -154,13 +154,10 @@ class CategoryList(object):
         return False
 
     def append(self, name, actions=None):
-        weight = 0
-        if len(self.categories) > 0:
-            weight = self.categories[-1].weight + 1
         if actions:
-            self.add(name, weight, actions)
+            self.add(name, actions=actions)
         else:
-            self.add(name, weight)
+            self.add(name)
 
     def add(self, name, weight=0, actions=None):
         category = ActionCategory(name, weight)
@@ -171,7 +168,7 @@ class CategoryList(object):
                 else:
                     category.actions.append(action)
         self.categories.append(category)
-        self.categories.sort(key=lambda cat: cat.weight)
+        self.categories.sort(key=lambda cat: cat.weight, reverse=True)
 
     def remove(self, name):
         for category in self.categories:
@@ -230,6 +227,17 @@ class ActionList(object):
 
     @staticmethod
     def remove_action(action, category=None):
+        """
+        This removes an action from its category. Empty categories are
+        automatically removed.
+
+        ``action``
+            The QAction object to be removed.
+
+        ``category``
+            The name (unicode string) of the category, which contains the
+            action. Defaults to None.
+        """
         if category is not None:
             category = unicode(category)
         if category not in ActionList.categories:
@@ -238,3 +246,25 @@ class ActionList(object):
         # Remove empty categories.
         if len(ActionList.categories[category].actions) == 0:
             ActionList.categories.remove(category)
+
+    @staticmethod
+    def add_category(name, weight):
+        """
+        Add an empty category to the list of categories. This is ony convenient
+        for categories with a given weight.
+
+        ``name``
+            The category's name.
+
+        ``weight``
+            The category's weight (int).
+        """
+        if name in ActionList.categories:
+            # Only change the weight and resort the categories again.
+            for category in ActionList.categories:
+                if category.name == name:
+                    category.weight = weight
+            ActionList.categories.categories.sort(
+                key=lambda cat: cat.weight, reverse=True)
+            return
+        ActionList.categories.add(name, weight)

From 9011c85a6beedb1ba623374b34029c7cdc122556 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 9 Apr 2011 18:11:02 +0200
Subject: [PATCH 33/47] removed static methods

---
 openlp/core/lib/ui.py                       |  9 ++--
 openlp/core/ui/mainwindow.py                | 19 ++++----
 openlp/core/ui/servicemanager.py            | 23 +++++-----
 openlp/core/ui/shortcutlistform.py          |  9 ++--
 openlp/core/ui/slidecontroller.py           | 18 +++++---
 openlp/core/utils/actions.py                | 50 +++++++++++++--------
 openlp/plugins/alerts/alertsplugin.py       |  6 ++-
 openlp/plugins/bibles/bibleplugin.py        | 10 +++--
 openlp/plugins/songs/songsplugin.py         | 14 +++---
 openlp/plugins/songusage/songusageplugin.py | 14 +++---
 10 files changed, 102 insertions(+), 70 deletions(-)

diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 35ea23497..20aca9c6a 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -259,7 +259,8 @@ def base_action(parent, name, category=None):
     action = QtGui.QAction(parent)
     action.setObjectName(name)
     if category is not None:
-        ActionList.add_action(action, category)
+        action_list = ActionList.get_instance()
+        action_list.add_action(action, category)
     return action
 
 def checkable_action(parent, name, checked=None, category=None):
@@ -297,7 +298,8 @@ def shortcut_action(parent, name, shortcuts, function, icon=None, checked=None,
         action.setChecked(checked)
     action.setShortcuts(shortcuts)
     action.setShortcutContext(context)
-    ActionList.add_action(action, category)
+    action_list = ActionList.get_instance()
+    action_list.add_action(action, category)
     QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), function)
     return action
 
@@ -335,7 +337,8 @@ def context_menu_action(base, icon, text, slot, shortcuts=None, category=None,
     if shortcuts is not None:
         action.setShortcuts(shortcuts)
         action.setShortcutContext(context)
-        ActionList.add_action(action)
+        action_list = ActionList.get_instance()
+        action_list.add_action(action)
     return action
 
 def context_menu(base, icon, text):
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 63c5aa777..2038e1972 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -39,7 +39,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
     get_application_version
-from openlp.core.utils.actions import ActionList
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 log = logging.getLogger(__name__)
 
@@ -162,7 +162,8 @@ class Ui_MainWindow(object):
         mainWindow.addDockWidget(QtCore.Qt.RightDockWidgetArea,
             self.themeManagerDock)
         # Create the menu items
-        ActionList.add_category(UiStrings.File, 100)
+        action_list = ActionList.get_instance()
+        action_list.add_category(UiStrings.File, CategoryOrder.standardMenu)
         self.FileNewItem = shortcut_action(mainWindow, u'FileNewItem',
             [QtGui.QKeySequence(u'Ctrl+N')],
             self.ServiceManagerContents.onNewServiceClicked,
@@ -185,17 +186,17 @@ class Ui_MainWindow(object):
         self.FileExitItem = shortcut_action(mainWindow, u'FileExitItem',
             [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close,
             u':/system/system_exit.png', category=UiStrings.File)
-        ActionList.add_category(UiStrings.Import, 95)
+        action_list.add_category(UiStrings.Import, CategoryOrder.standardMenu)
         self.ImportThemeItem = base_action(
             mainWindow, u'ImportThemeItem', UiStrings.Import)
         self.ImportLanguageItem = base_action(
             mainWindow, u'ImportLanguageItem')#, UiStrings.Import)
-        ActionList.add_category(UiStrings.Export, 90)
+        action_list.add_category(UiStrings.Export, CategoryOrder.standardMenu)
         self.ExportThemeItem = base_action(
             mainWindow, u'ExportThemeItem', UiStrings.Export)
         self.ExportLanguageItem = base_action(
             mainWindow, u'ExportLanguageItem')#, UiStrings.Export)
-        ActionList.add_category(UiStrings.View, 85)
+        action_list.add_category(UiStrings.View, CategoryOrder.standardMenu)
         self.ViewMediaManagerItem = shortcut_action(mainWindow,
             u'ViewMediaManagerItem', [QtGui.QKeySequence(u'F8')],
             self.toggleMediaManager, u':/system/system_mediamanager.png',
@@ -215,7 +216,7 @@ class Ui_MainWindow(object):
         self.ViewLivePanel = shortcut_action(mainWindow, u'ViewLivePanel',
             [QtGui.QKeySequence(u'F12')], self.setLivePanelVisibility,
             checked=liveVisible, category=UiStrings.View)
-        ActionList.add_category(UiStrings.ViewMode, 80)
+        action_list.add_category(UiStrings.ViewMode, CategoryOrder.standardMenu)
         self.ModeDefaultItem = checkable_action(
             mainWindow, u'ModeDefaultItem', category=UiStrings.ViewMode)
         self.ModeSetupItem = checkable_action(
@@ -227,13 +228,13 @@ class Ui_MainWindow(object):
         self.ModeGroup.addAction(self.ModeSetupItem)
         self.ModeGroup.addAction(self.ModeLiveItem)
         self.ModeDefaultItem.setChecked(True)
-        ActionList.add_category(UiStrings.Tools, 75)
+        action_list.add_category(UiStrings.Tools, CategoryOrder.standardMenu)
         self.ToolsAddToolItem = icon_action(mainWindow, u'ToolsAddToolItem',
             u':/tools/tools_add.png', category=UiStrings.Tools)
         self.ToolsOpenDataFolder = icon_action(mainWindow,
             u'ToolsOpenDataFolder', u':/general/general_open.png',
             category=UiStrings.Tools)
-        ActionList.add_category(UiStrings.Settings, 70)
+        action_list.add_category(UiStrings.Settings, CategoryOrder.standardMenu)
         self.settingsPluginListItem = shortcut_action(mainWindow,
             u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')],
             self.onPluginItemClicked, u':/system/settings_plugin_list.png',
@@ -261,7 +262,7 @@ class Ui_MainWindow(object):
         self.SettingsConfigureItem = icon_action(mainWindow,
             u'SettingsConfigureItem', u':/system/system_settings.png',
             category=UiStrings.Settings)
-        ActionList.add_category(UiStrings.Help, 65)
+        action_list.add_category(UiStrings.Help, CategoryOrder.standardMenu)
         self.HelpDocumentationItem = icon_action(mainWindow,
             u'HelpDocumentationItem', u':/system/system_help_contents.png',
             category=None)#UiStrings.Help)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 528b642ce..864acc138 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -40,7 +40,7 @@ from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
 from openlp.core.ui.printserviceform import PrintServiceForm
 from openlp.core.utils import AppLocation, delete_file, file_is_unicode, \
     split_filename
-from openlp.core.utils.actions import ActionList
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 class ServiceManagerList(QtGui.QTreeWidget):
     """
@@ -167,8 +167,9 @@ class ServiceManager(QtGui.QWidget):
             'Move item to the top of the service.'),
             self.onServiceTop, shortcuts=[QtCore.Qt.Key_Home])
         self.serviceManagerList.moveTop.setObjectName(u'moveTop')
-        ActionList.add_category(UiStrings.Service, 45)
-        ActionList.add_action(
+        action_list = ActionList.get_instance()
+        action_list.add_category(UiStrings.Service, CategoryOrder.standardToolbar)
+        action_list.add_action(
             self.serviceManagerList.moveTop, UiStrings.Service)
         self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &up'),
@@ -177,7 +178,7 @@ class ServiceManager(QtGui.QWidget):
             'Move item up one position in the service.'),
             self.onServiceUp, shortcuts=[QtCore.Qt.Key_PageUp])
         self.serviceManagerList.moveUp.setObjectName(u'moveUp')
-        ActionList.add_action(self.serviceManagerList.moveUp, UiStrings.Service)
+        action_list.add_action(self.serviceManagerList.moveUp, UiStrings.Service)
         self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
             u':/services/service_down.png',
@@ -185,7 +186,7 @@ class ServiceManager(QtGui.QWidget):
             'Move item down one position in the service.'),
             self.onServiceDown, shortcuts=[QtCore.Qt.Key_PageDown])
         self.serviceManagerList.moveDown.setObjectName(u'moveDown')
-        ActionList.add_action(
+        action_list.add_action(
             self.serviceManagerList.moveDown, UiStrings.Service)
         self.serviceManagerList.moveBottom = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move to &bottom'),
@@ -194,7 +195,7 @@ class ServiceManager(QtGui.QWidget):
             'Move item to the end of the service.'),
             self.onServiceEnd, shortcuts=[QtCore.Qt.Key_End])
         self.serviceManagerList.moveBottom.setObjectName(u'moveBottom')
-        ActionList.add_action(
+        action_list.add_action(
             self.serviceManagerList.moveBottom, UiStrings.Service)
         self.serviceManagerList.down = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move &down'),
@@ -203,7 +204,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection down the window.'),
             self.onMoveSelectionDown, shortcuts=[QtCore.Qt.Key_Down])
         self.serviceManagerList.down.setObjectName(u'down')
-        ActionList.add_action(self.serviceManagerList.down)
+        action_list.add_action(self.serviceManagerList.down)
         self.serviceManagerList.down.setVisible(False)
         self.serviceManagerList.up = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', 'Move up'),
@@ -212,7 +213,7 @@ class ServiceManager(QtGui.QWidget):
             'Moves the selection up the window.'),
             self.onMoveSelectionUp, shortcuts=[QtCore.Qt.Key_Up])
         self.serviceManagerList.up.setObjectName(u'up')
-        ActionList.add_action(self.serviceManagerList.up)
+        action_list.add_action(self.serviceManagerList.up)
         self.serviceManagerList.up.setVisible(False)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.delete = self.orderToolbar.addToolbarButton(
@@ -229,7 +230,7 @@ class ServiceManager(QtGui.QWidget):
             'Expand all the service items.'),
             self.onExpandAll, shortcuts=[QtCore.Qt.Key_Plus])
         self.serviceManagerList.expand.setObjectName(u'expand')
-        ActionList.add_action(self.serviceManagerList.expand, UiStrings.Service)
+        action_list.add_action(self.serviceManagerList.expand, UiStrings.Service)
         self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton(
             translate('OpenLP.ServiceManager', '&Collapse all'),
             u':/services/service_collapse_all.png',
@@ -237,7 +238,7 @@ class ServiceManager(QtGui.QWidget):
             'Collapse all the service items.'),
             self.onCollapseAll, shortcuts=[QtCore.Qt.Key_Minus])
         self.serviceManagerList.collapse.setObjectName(u'collapse')
-        ActionList.add_action(
+        action_list.add_action(
             self.serviceManagerList.collapse, UiStrings.Service)
         self.orderToolbar.addSeparator()
         self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton(
@@ -247,7 +248,7 @@ class ServiceManager(QtGui.QWidget):
             'Send the selected item to Live.'), self.makeLive,
             shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return])
         self.serviceManagerList.makeLive.setObjectName(u'orderToolbar')
-        ActionList.add_action(
+        action_list.add_action(
             self.serviceManagerList.makeLive, UiStrings.Service)
         self.layout.addWidget(self.orderToolbar)
         # Connect up our signals and slots
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index 336e160b1..ddf84fdd6 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -46,6 +46,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         self.changedActions = {}
+        self.action_list = ActionList.get_instance()
         QtCore.QObject.connect(self.primaryPushButton,
             QtCore.SIGNAL(u'toggled(bool)'), self.onPrimaryPushButtonClicked)
         QtCore.QObject.connect(self.alternatePushButton,
@@ -96,7 +97,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         # The action we are attempting to change.
         changing_action = self._currentItemAction()
         shortcut_valid = True
-        for category in ActionList.categories:
+        for category in self.action_list.categories:
             for action in category.actions:
                 shortcuts = self._actionShortcuts(action)
                 if key_sequence not in shortcuts:
@@ -149,7 +150,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         Reload the ``treeWidget`` list to add new and remove old actions.
         """
         self.treeWidget.clear()
-        for category in ActionList.categories:
+        for category in self.action_list.categories:
             # Check if the category is for internal use only.
             if category.name is None:
                 continue
@@ -303,7 +304,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             return
         self._adjustButton(self.primaryPushButton, False, text=u'')
         self._adjustButton(self.alternatePushButton, False, text=u'')
-        for category in ActionList.categories:
+        for category in self.action_list.categories:
             for action in category.actions:
                 self.changedActions[action] = action.defaultShortcuts
         self.refreshShortcutList()
@@ -349,7 +350,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         """
         settings = QtCore.QSettings()
         settings.beginGroup(u'shortcuts')
-        for category in ActionList.categories:
+        for category in self.action_list.categories:
             # Check if the category is for internal use only.
             if category.name is None:
                 continue
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 204dada75..4f5ed1ea7 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -34,7 +34,7 @@ from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
     ItemCapabilities, translate
 from openlp.core.lib.ui import UiStrings, shortcut_action
 from openlp.core.ui import HideMode, MainDisplay
-from openlp.core.utils.actions import ActionList
+from openlp.core.utils.actions import ActionList, CategoryOrder
 
 log = logging.getLogger(__name__)
 
@@ -367,16 +367,20 @@ class SlideController(QtGui.QWidget):
     def setPreviewHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemPreview')         
         self.nextItem.setObjectName(u'nextItemPreview')
-        ActionList.add_category(UiStrings.PreviewToolbar, 55)
-        ActionList.add_action(self.previousItem, UiStrings.PreviewToolbar)
-        ActionList.add_action(self.nextItem, UiStrings.PreviewToolbar)
+        action_list = ActionList.get_instance()
+        action_list.add_category(
+            UiStrings.PreviewToolbar, CategoryOrder.standardToolbar)
+        action_list.add_action(self.previousItem, UiStrings.PreviewToolbar)
+        action_list.add_action(self.nextItem, UiStrings.PreviewToolbar)
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemLive')         
         self.nextItem.setObjectName(u'nextItemLive')
-        ActionList.add_category(UiStrings.LiveToolbar, 60)
-        ActionList.add_action(self.previousItem, UiStrings.LiveToolbar)
-        ActionList.add_action(self.nextItem, UiStrings.LiveToolbar)
+        action_list = ActionList.get_instance()
+        action_list.add_category(
+            UiStrings.LiveToolbar, CategoryOrder.standardToolbar)
+        action_list.add_action(self.previousItem, UiStrings.LiveToolbar)
+        action_list.add_action(self.nextItem, UiStrings.LiveToolbar)
         self.previousService = shortcut_action(parent, u'previousService',
             [QtCore.Qt.Key_Left], self.servicePrevious, UiStrings.LiveToolbar)
         self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 214a42249..76b72c55c 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -183,10 +183,18 @@ class ActionList(object):
     has a weight by which it is sorted when iterating through the list of
     actions or categories.
     """
-    categories = CategoryList()
+    instance = None
+
+    def __init__(self):
+        self.categories = CategoryList()
 
     @staticmethod
-    def add_action(action, category=None, weight=None):
+    def get_instance():
+        if ActionList.instance is None:
+            ActionList.instance = ActionList()
+        return ActionList.instance
+
+    def add_action(self, action, category=None, weight=None):
         """
         Add an action to the list of actions.
 
@@ -206,13 +214,13 @@ class ActionList(object):
         """
         if category is not None:
             category = unicode(category)
-        if category not in ActionList.categories:
-            ActionList.categories.append(category)
+        if category not in self.categories:
+            self.categories.append(category)
         action.defaultShortcuts = action.shortcuts()
         if weight is None:
-            ActionList.categories[category].actions.append(action)
+            self.categories[category].actions.append(action)
         else:
-            ActionList.categories[category].actions.add(action, weight)
+            self.categories[category].actions.add(action, weight)
         if category is None:
             # Stop here, as this action is not configurable.
             return
@@ -225,8 +233,7 @@ class ActionList(object):
             [QtGui.QKeySequence(shortcut) for shortcut in shortcuts])
         settings.endGroup()
 
-    @staticmethod
-    def remove_action(action, category=None):
+    def remove_action(self, action, category=None):
         """
         This removes an action from its category. Empty categories are
         automatically removed.
@@ -240,15 +247,14 @@ class ActionList(object):
         """
         if category is not None:
             category = unicode(category)
-        if category not in ActionList.categories:
+        if category not in self.categories:
             return
-        ActionList.categories[category].actions.remove(action)
+        self.categories[category].actions.remove(action)
         # Remove empty categories.
-        if len(ActionList.categories[category].actions) == 0:
-            ActionList.categories.remove(category)
+        if len(self.categories[category].actions) == 0:
+            self.categories.remove(category)
 
-    @staticmethod
-    def add_category(name, weight):
+    def add_category(self, name, weight):
         """
         Add an empty category to the list of categories. This is ony convenient
         for categories with a given weight.
@@ -259,12 +265,20 @@ class ActionList(object):
         ``weight``
             The category's weight (int).
         """
-        if name in ActionList.categories:
+        if name in self.categories:
             # Only change the weight and resort the categories again.
-            for category in ActionList.categories:
+            for category in self.categories:
                 if category.name == name:
                     category.weight = weight
-            ActionList.categories.categories.sort(
+            self.categories.categories.sort(
                 key=lambda cat: cat.weight, reverse=True)
             return
-        ActionList.categories.add(name, weight)
+        self.categories.add(name, weight)
+
+
+class CategoryOrder(object):
+    """
+    An enumeration class for category weights.
+    """
+    standardMenu = 100
+    standardToolbar = 90
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index d564a9754..7d6eac6e2 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -75,7 +75,8 @@ class AlertsPlugin(Plugin):
         log.info(u'Alerts Initialising')
         Plugin.initialise(self)
         self.toolsAlertItem.setVisible(True)
-        ActionList.add_action(self.toolsAlertItem, UiStrings.Tools)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.toolsAlertItem, UiStrings.Tools)
         self.liveController.alertTab = self.settings_tab
 
     def finalise(self):
@@ -86,7 +87,8 @@ class AlertsPlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.toolsAlertItem.setVisible(False)
-        ActionList.remove_action(self.toolsAlertItem, u'Tools')
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.toolsAlertItem, u'Tools')
 
     def toggleAlertsState(self):
         self.alertsActive = not self.alertsActive
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 60be388ba..aea732688 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -52,9 +52,10 @@ class BiblePlugin(Plugin):
             self.manager = BibleManager(self)
         Plugin.initialise(self)
         self.importBibleItem.setVisible(True)
-        ActionList.add_action(self.importBibleItem, UiStrings.Import)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.importBibleItem, UiStrings.Import)
         # Do not add the action to the list yet.
-        #ActionList.add_action(self.exportBibleItem, UiStrings.Export)
+        #action_list.add_action(self.exportBibleItem, UiStrings.Export)
         # Set to invisible until we can export bibles
         self.exportBibleItem.setVisible(False)
 
@@ -65,9 +66,10 @@ class BiblePlugin(Plugin):
         log.info(u'Plugin Finalise')
         self.manager.finalise()
         Plugin.finalise(self)
-        ActionList.remove_action(self.importBibleItem, UiStrings.Import)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.importBibleItem, UiStrings.Import)
         self.importBibleItem.setVisible(False)
-        #ActionList.remove_action(self.exportBibleItem, UiStrings.Export)
+        #action_list.remove_action(self.exportBibleItem, UiStrings.Export)
         self.exportBibleItem.setVisible(False)
 
     def addImportMenuItem(self, import_menu):
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index a3230ff7f..af50f3f94 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -66,9 +66,10 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Initialising')
         Plugin.initialise(self)
         self.toolsReindexItem.setVisible(True)
-        ActionList.add_action(self.SongImportItem, UiStrings.Import)
-        ActionList.add_action(self.SongExportItem, UiStrings.Export)
-        ActionList.add_action(self.toolsReindexItem, UiStrings.Tools)
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.SongImportItem, UiStrings.Import)
+        action_list.add_action(self.SongExportItem, UiStrings.Export)
+        action_list.add_action(self.toolsReindexItem, UiStrings.Tools)
         self.mediaItem.displayResultsSong(
             self.manager.get_all_objects(Song, order_by_ref=Song.search_title))
 
@@ -258,7 +259,8 @@ class SongsPlugin(Plugin):
         log.info(u'Songs Finalising')
         self.manager.finalise()
         self.toolsReindexItem.setVisible(False)
-        ActionList.remove_action(self.SongImportItem, UiStrings.Import)
-        ActionList.remove_action(self.SongExportItem, UiStrings.Export)
-        ActionList.remove_action(self.toolsReindexItem, UiStrings.Tools)
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.SongImportItem, UiStrings.Import)
+        action_list.remove_action(self.SongExportItem, UiStrings.Export)
+        action_list.remove_action(self.toolsReindexItem, UiStrings.Tools)
         Plugin.finalise(self)
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index b0a545ad8..5f21451b6 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -110,11 +110,12 @@ class SongUsagePlugin(Plugin):
             self.settingsSection + u'/active',
             QtCore.QVariant(False)).toBool()
         self.SongUsageStatus.setChecked(self.SongUsageActive)
-        ActionList.add_action(self.SongUsageDelete,
+        action_list = ActionList.get_instance()
+        action_list.add_action(self.SongUsageDelete,
             translate('SongUsagePlugin', 'Song Usage'))
-        ActionList.add_action(self.SongUsageReport,
+        action_list.add_action(self.SongUsageReport,
             translate('SongUsagePlugin', 'Song Usage'))
-        ActionList.add_action(self.SongUsageStatus,
+        action_list.add_action(self.SongUsageStatus,
             translate('SongUsagePlugin', 'Song Usage'))
         if self.manager is None:
             self.manager = Manager(u'songusage', init_schema)
@@ -131,11 +132,12 @@ class SongUsagePlugin(Plugin):
         self.manager.finalise()
         Plugin.finalise(self)
         self.SongUsageMenu.menuAction().setVisible(False)
-        ActionList.remove_action(self.SongUsageDelete,
+        action_list = ActionList.get_instance()
+        action_list.remove_action(self.SongUsageDelete,
             translate('SongUsagePlugin', 'Song Usage'))
-        ActionList.remove_action(self.SongUsageReport,
+        action_list.remove_action(self.SongUsageReport,
             translate('SongUsagePlugin', 'Song Usage'))
-        ActionList.remove_action(self.SongUsageStatus,
+        action_list.remove_action(self.SongUsageStatus,
             translate('SongUsagePlugin', 'Song Usage'))
         #stop any events being processed
         self.SongUsageActive = False

From a54a3eb79255727b3027973eec3b2151244fda41 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sat, 9 Apr 2011 20:14:51 +0200
Subject: [PATCH 34/47] make first column wider; added description label back;
 removed Qt = Qt.QCore; fixed litte bug which left the shortcut text on the
 buttons

---
 openlp/core/ui/shortcutlistdialog.py | 13 +++++++++----
 openlp/core/ui/shortcutlistform.py   | 15 +++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index a5050ab25..32fe68b95 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -33,11 +33,16 @@ class Ui_ShortcutListDialog(object):
         shortcutListDialog.setObjectName(u'shortcutListDialog')
         shortcutListDialog.resize(500, 438)
         self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
-        self.shortcutListLayout.setObjectName(u'shortcutListLayout')
+        self.shortcutListLayout.setObjectName(u'shortcutLitLayout')
+        self.descriptionLabel = QtGui.QLabel(shortcutListDialog)
+        self.descriptionLabel.setObjectName(u'descriptionLabel')
+        self.descriptionLabel.setWordWrap(True) 
+        self.shortcutListLayout.addWidget(self.descriptionLabel)
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
         self.treeWidget.setObjectName(u'treeWidget')
         self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setColumnCount(3)
+        self.treeWidget.setColumnWidth(0, 250)
         self.shortcutListLayout.addWidget(self.treeWidget)
         self.detailsLayout = QtGui.QGridLayout()
         self.detailsLayout.setObjectName(u'detailsLayout')
@@ -102,9 +107,9 @@ class Ui_ShortcutListDialog(object):
     def retranslateUi(self, shortcutListDialog):
         shortcutListDialog.setWindowTitle(
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
-        #self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
-            #'Select an action and click the button below to start capturing '
-            #'a new shortcut.'))
+        self.descriptionLabel.setText(translate('OpenLP.ShortcutListDialog',
+            'Select an action and click one of the buttons below to start '
+            'capturing a new primary or alternate shortcut, respectively.'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
             translate('OpenLP.ShortcutListDialog', 'Shortcut'),
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index ddf84fdd6..26bfddadd 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -78,20 +78,21 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             self.close()
 
     def keyReleaseEvent(self, event):
-        Qt = QtCore.Qt
         if not self.primaryPushButton.isChecked() and \
             not self.alternatePushButton.isChecked():
             return
         key = event.key()
-        if key == Qt.Key_Shift or key == Qt.Key_Control or \
-            key == Qt.Key_Meta or key == Qt.Key_Alt:
+        if key == QtCore.Qt.Key_Shift or key == QtCore.Qt.Key_Control or \
+            key == QtCore.Qt.Key_Meta or key == QtCore.Qt.Key_Alt:
             return
         key_string = QtGui.QKeySequence(key).toString()
-        if event.modifiers() & Qt.ControlModifier == Qt.ControlModifier:
+        if event.modifiers() & QtCore.Qt.ControlModifier == \
+            QtCore.Qt.ControlModifier:
             key_string = u'Ctrl+' + key_string
-        if event.modifiers() & Qt.AltModifier == Qt.AltModifier:
+        if event.modifiers() & QtCore.Qt.AltModifier == QtCore.Qt.AltModifier:
             key_string = u'Alt+' + key_string
-        if event.modifiers() & Qt.ShiftModifier == Qt.ShiftModifier:
+        if event.modifiers() & QtCore.Qt.ShiftModifier == \
+            QtCore.Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
         # The action we are attempting to change.
@@ -377,6 +378,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             new_shortcuts.append(shortcuts[1])
         self.changedActions[action] = new_shortcuts
         self.refreshShortcutList()
+        self.onCurrentItemChanged(self.treeWidget.currentItem())
 
     def onClearAlternateButtonClicked(self, toggled):
         """
@@ -394,6 +396,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
             new_shortcuts.append(action.defaultShortcuts[1])
         self.changedActions[action] = new_shortcuts
         self.refreshShortcutList()
+        self.onCurrentItemChanged(self.treeWidget.currentItem())
 
     def _actionShortcuts(self, action):
         """

From b7a1554abda5e718744261006240f97210d11f38 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 10 Apr 2011 09:07:02 +0200
Subject: [PATCH 35/47] fixed objectName

---
 openlp/core/ui/shortcutlistdialog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index 32fe68b95..288086cba 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -33,7 +33,7 @@ class Ui_ShortcutListDialog(object):
         shortcutListDialog.setObjectName(u'shortcutListDialog')
         shortcutListDialog.resize(500, 438)
         self.shortcutListLayout = QtGui.QVBoxLayout(shortcutListDialog)
-        self.shortcutListLayout.setObjectName(u'shortcutLitLayout')
+        self.shortcutListLayout.setObjectName(u'shortcutListLayout')
         self.descriptionLabel = QtGui.QLabel(shortcutListDialog)
         self.descriptionLabel.setObjectName(u'descriptionLabel')
         self.descriptionLabel.setWordWrap(True) 

From 9dbd54bf8f6396c1121ca13b0dec77f07809862c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 10 Apr 2011 20:44:27 +0200
Subject: [PATCH 36/47] more fixes

---
 openlp/core/ui/servicemanager.py      |  4 ++--
 openlp/plugins/songs/lib/mediaitem.py | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index adafe5fd6..5e14ec637 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -691,9 +691,9 @@ class ServiceManager(QtGui.QWidget):
         Called by the SlideController to request a preview item be made live
         and allows the next preview to be updated if relevent.
         """
-        id, row = message.split(u':')
+        uuid, row = message.split(u':')
         for sitem in self.serviceItems:
-            if sitem[u'service_item']._uuid == id:
+            if sitem[u'service_item']._uuid == uuid:
                 item = self.serviceManagerList.topLevelItem(sitem[u'order'] - 1)
                 self.serviceManagerList.setCurrentItem(item)
                 self.makeLive(int(row))
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index f4803d653..e2882ed29 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -283,19 +283,20 @@ class SongMediaItem(MediaManagerItem):
         self.remoteTriggered = None
         self.remoteSong = -1
 
-    def onRemoteEdit(self, songid):
+    def onRemoteEdit(self, message):
         """
         Called by ServiceManager or SlideController by event passing
         the Song Id in the payload along with an indicator to say which
         type of display is required.
         """
-        log.debug(u'onRemoteEdit %s' % songid)
-        fields = songid.split(u':')
-        valid = self.parent.manager.get_object(Song, fields[1])
+        log.debug(u'onRemoteEdit %s' % message)
+        remote_type, song_id = message.split(u':')
+        song_id = int(song_id)
+        valid = self.parent.manager.get_object(Song, song_id)
         if valid:
-            self.remoteSong = fields[1]
-            self.remoteTriggered = fields[0]
-            self.edit_song_form.loadSong(fields[1], (fields[0] == u'P'))
+            self.remoteSong = song_id
+            self.remoteTriggered = remote_type
+            self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
             self.edit_song_form.exec_()
 
     def onEditClick(self):

From de616b9d1a35358b12af6d77af528d3d29b30372 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 11 Apr 2011 16:17:43 +0200
Subject: [PATCH 37/47] fixed OpenOffice import being available even if
 OpenOffice is not installed

---
 openlp/plugins/songs/lib/oooimport.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index c9c05907e..2ab66820c 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -39,12 +39,8 @@ if os.name == u'nt':
     PAGE_AFTER = 5
     PAGE_BOTH = 6
 else:
-    try:
-        import uno
-        from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, \
-            PAGE_BOTH
-    except ImportError:
-        pass
+    import uno
+    from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
 
 class OooImport(SongImport):
     """

From 073d6c8403aa7c21cfe5a8ad0a8733d11c401100 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 11 Apr 2011 16:34:14 +0200
Subject: [PATCH 38/47] disable 'next button' if importer is not available

---
 openlp/plugins/songs/forms/songimportform.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 6d20c8f41..468d2f341 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -66,7 +66,17 @@ class SongImportForm(OpenLPWizard):
         self.formatStack.setCurrentIndex(0)
         QtCore.QObject.connect(self.formatComboBox,
             QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.formatStack.setCurrentIndex)
+            self.onCurrentIndexChanged)
+
+    def onCurrentIndexChanged(self, index):
+        """
+        Called when the format combo box's index changed. We have to check if
+        the import is available and accordingly to disable or enable the next
+        button.
+        """
+        self.formatStack.setCurrentIndex(index)
+        next_button = self.button(QtGui.QWizard.NextButton)
+        next_button.setEnabled(SongFormat.get_availability(index))
 
     def customInit(self):
         """

From 53660fe23fa47dc59800c4d838561856574234a4 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Mon, 11 Apr 2011 17:01:42 +0200
Subject: [PATCH 39/47] enable/disable next button if bible importer is not
 available

---
 openlp/plugins/bibles/forms/bibleimportform.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index 117ffaf4c..35cd17c4b 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -85,8 +85,18 @@ class BibleImportForm(OpenLPWizard):
         """
         OpenLPWizard.setupUi(self, image)
         QtCore.QObject.connect(self.formatComboBox,
-            QtCore.SIGNAL(u'currentIndexChanged(int)'), self.selectStack,
-            QtCore.SLOT(u'setCurrentIndex(int)'))
+            QtCore.SIGNAL(u'currentIndexChanged(int)'),
+            self.onCurrentIndexChanged)
+
+    def onCurrentIndexChanged(self, index):
+        """
+        Called when the format combo box's index changed. We have to check if
+        the import is available and accordingly to disable or enable the next
+        button.
+        """
+        self.selectStack.setCurrentIndex(index)
+        next_button = self.button(QtGui.QWizard.NextButton)
+        next_button.setEnabled(BibleFormat.get_availability(index))
 
     def customInit(self):
         """

From ad16ba8ef189915b7193222b6d1e026b6cf7e6dc Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 11 Apr 2011 18:49:14 +0100
Subject: [PATCH 40/47] Fix missing value

---
 openlp/plugins/bibles/lib/mediaitem.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 73ed0c9bd..1630ea62f 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -326,7 +326,8 @@ class BibleMediaItem(MediaManagerItem):
             self.settingsSection + u'/advanced bible',
             QtCore.QVariant(u'')).toString()
         find_and_set_in_combo_box(self.advancedVersionComboBox, book)
-        self.initialiseAdvancedBible(unicode(book))
+        if book != u'':
+            self.initialiseAdvancedBible(unicode(book))
 
     def reloadBibles(self):
         log.debug(u'Reloading Bibles')
@@ -840,4 +841,4 @@ class BibleMediaItem(MediaManagerItem):
             self.settings.layout_style)
         QtCore.QSettings().setValue(
             self.settingsSection + u'/verse layout style',
-            QtCore.QVariant(self.settings.layout_style))
\ No newline at end of file
+            QtCore.QVariant(self.settings.layout_style))

From 1f91c4c82d3343a52a61c5aac489e20fa95138d2 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 11 Apr 2011 19:02:24 +0100
Subject: [PATCH 41/47] if book

---
 openlp/plugins/bibles/lib/mediaitem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 1630ea62f..eac3eaeae 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -326,7 +326,7 @@ class BibleMediaItem(MediaManagerItem):
             self.settingsSection + u'/advanced bible',
             QtCore.QVariant(u'')).toString()
         find_and_set_in_combo_box(self.advancedVersionComboBox, book)
-        if book != u'':
+        if book:
             self.initialiseAdvancedBible(unicode(book))
 
     def reloadBibles(self):

From 7ba5497764eca875d779987a7f6be0f2edea3481 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 11 Apr 2011 19:15:02 +0100
Subject: [PATCH 42/47] Improved version

---
 openlp/plugins/bibles/lib/mediaitem.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index eac3eaeae..d6ffbc898 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -322,11 +322,11 @@ class BibleMediaItem(MediaManagerItem):
                 self.advancedVersionComboBox.addItem(bible)
                 self.advancedSecondComboBox.addItem(bible)
         # set the default value
-        book = QtCore.QSettings().value(
+        bible = QtCore.QSettings().value(
             self.settingsSection + u'/advanced bible',
             QtCore.QVariant(u'')).toString()
-        find_and_set_in_combo_box(self.advancedVersionComboBox, book)
-        if book:
+        if bible in bibles:
+            find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
             self.initialiseAdvancedBible(unicode(book))
 
     def reloadBibles(self):

From 427c2a18434834e48500b0d35502af6f71209fe0 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 11 Apr 2011 19:27:01 +0100
Subject: [PATCH 43/47] oops

---
 openlp/plugins/bibles/lib/mediaitem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index d6ffbc898..b0d4c8bca 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -327,7 +327,7 @@ class BibleMediaItem(MediaManagerItem):
             QtCore.QVariant(u'')).toString()
         if bible in bibles:
             find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
-            self.initialiseAdvancedBible(unicode(book))
+            self.initialiseAdvancedBible(unicode(bible))
 
     def reloadBibles(self):
         log.debug(u'Reloading Bibles')

From 962f038c9b79853ee9440e4d53aee8c973a61892 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 12 Apr 2011 11:37:59 +0200
Subject: [PATCH 44/47] fixed bug #744337

Fixes: https://launchpad.net/bugs/744337
---
 openlp/plugins/songs/lib/openlyricsexport.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py
index d3367bfa9..17cc14421 100644
--- a/openlp/plugins/songs/lib/openlyricsexport.py
+++ b/openlp/plugins/songs/lib/openlyricsexport.py
@@ -73,6 +73,8 @@ class OpenLyricsExport(object):
                 u', '.join([author.display_name for author in song.authors]))
             filename = re.sub(
                 r'[/\\?*|<>\[\]":<>+%]+', u'_', filename).strip(u'_')
-            tree.write(os.path.join(self.save_path, filename),
+            file_object = open(os.path.join(self.save_path, filename), u'w')
+            tree.write(file_object,
                 encoding=u'utf-8', xml_declaration=True, pretty_print=True)
+            file_object.close()
         return True

From 9a1be997811c0167587d7f8cadecf622e5d6d830 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 12 Apr 2011 11:55:02 +0200
Subject: [PATCH 45/47] added comments; same fix for import

---
 openlp/plugins/songs/lib/openlyricsexport.py | 6 +++---
 openlp/plugins/songs/lib/openlyricsimport.py | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py
index 17cc14421..59b720d3e 100644
--- a/openlp/plugins/songs/lib/openlyricsexport.py
+++ b/openlp/plugins/songs/lib/openlyricsexport.py
@@ -73,8 +73,8 @@ class OpenLyricsExport(object):
                 u', '.join([author.display_name for author in song.authors]))
             filename = re.sub(
                 r'[/\\?*|<>\[\]":<>+%]+', u'_', filename).strip(u'_')
-            file_object = open(os.path.join(self.save_path, filename), u'w')
-            tree.write(file_object,
+            # Pass a file object, because lxml does not cope with some special
+            # characters in the path (see lp:757673 and lp:744337).
+            tree.write(open(os.path.join(self.save_path, filename), u'w'),
                 encoding=u'utf-8', xml_declaration=True, pretty_print=True)
-            file_object.close()
         return True
diff --git a/openlp/plugins/songs/lib/openlyricsimport.py b/openlp/plugins/songs/lib/openlyricsimport.py
index 208ef3e52..c29abc0b5 100644
--- a/openlp/plugins/songs/lib/openlyricsimport.py
+++ b/openlp/plugins/songs/lib/openlyricsimport.py
@@ -63,7 +63,9 @@ class OpenLyricsImport(SongImport):
             self.import_wizard.incrementProgressBar(
                 WizardStrings.ImportingType % os.path.basename(file_path))
             try:
-                parsed_file = etree.parse(file_path, parser)
+                # Pass a file object, because lxml does not cope with some
+                # special characters in the path (see lp:757673 and lp:744337).
+                parsed_file = etree.parse(open(file_path, u'r'), parser)
                 xml = unicode(etree.tostring(parsed_file))
                 if self.openLyrics.xml_to_song(xml) is None:
                     log.debug(u'File could not be imported: %s' % file_path)

From c6833003851d7e70681a87429cec43e830556c5c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 12 Apr 2011 23:01:27 +0200
Subject: [PATCH 46/47] fixed weight

---
 openlp/core/utils/actions.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 76b72c55c..0c4eee655 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -154,10 +154,13 @@ class CategoryList(object):
         return False
 
     def append(self, name, actions=None):
+        weight = 0
+        if len(self.categories) > 0:
+            weight = self.categories[-1].weight + 1
         if actions:
-            self.add(name, actions=actions)
+            self.add(name, weight, actions)
         else:
-            self.add(name)
+            self.add(name, weight)
 
     def add(self, name, weight=0, actions=None):
         category = ActionCategory(name, weight)
@@ -168,7 +171,7 @@ class CategoryList(object):
                 else:
                     category.actions.append(action)
         self.categories.append(category)
-        self.categories.sort(key=lambda cat: cat.weight, reverse=True)
+        self.categories.sort(key=lambda cat: cat.weight)
 
     def remove(self, name):
         for category in self.categories:
@@ -270,8 +273,7 @@ class ActionList(object):
             for category in self.categories:
                 if category.name == name:
                     category.weight = weight
-            self.categories.categories.sort(
-                key=lambda cat: cat.weight, reverse=True)
+            self.categories.categories.sort(key=lambda cat: cat.weight)
             return
         self.categories.add(name, weight)
 
@@ -280,5 +282,5 @@ class CategoryOrder(object):
     """
     An enumeration class for category weights.
     """
-    standardMenu = 100
-    standardToolbar = 90
+    standardMenu = -20
+    standardToolbar = -10

From 28dec27ed2847b524d23fff4dbe57ce01a4e79b9 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Tue, 12 Apr 2011 23:12:07 +0200
Subject: [PATCH 47/47] fixed bug #758206

Fixes: https://launchpad.net/bugs/758206
---
 openlp/core/lib/mediamanageritem.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 13277876d..7671064df 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -274,8 +274,8 @@ class MediaManagerItem(QtGui.QWidget):
             context_menu_action(
                 self.listView, u':/general/general_preview.png',
                 self.plugin.getString(StringContent.Preview)[u'title'],
-                self.onPreviewClick, [QtCore.Qt.Key_Enter],
-                context=QtCore.Qt.WidgetShortcut))
+                self.onPreviewClick, [QtCore.Qt.Key_Enter,
+                QtCore.Qt.Key_Return], context=QtCore.Qt.WidgetShortcut))
         self.listView.addAction(
             context_menu_action(
                 self.listView, u':/general/general_live.png',