openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge differing trees and remove whitspaces

This commit is contained in:
M2j 2012-03-04 15:52:09 +01:00
parent 587850bb59 277de83b68
commit b952b2cdbc
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/lib/toolbar.py
View File

@ -31,7 +31,6 @@ import logging
from PyQt4 import QtCore, QtGui
from openlp.core.lib import build_icon
from openlp.core.lib.ui import create_widget_action
log = logging.getLogger(__name__)

2
openlp/plugins/alerts/alertsplugin.py
View File

@ -137,7 +137,7 @@ class AlertsPlugin(Plugin):
text=translate('AlertsPlugin', '&Alert'),
icon=u':/plugins/plugin_alerts.png',
statustip=translate('AlertsPlugin', 'Show an alert message.'),
visible=False, shortcuts=u'F7', triggers=self.onAlertsTrigger)
visible=False, shortcuts=[u'F7'], triggers=self.onAlertsTrigger)
self.serviceManager.mainwindow.toolsMenu.addAction(self.toolsAlertItem)
def initialise(self):