forked from openlp/openlp
Merge differing trees and remove whitspaces
This commit is contained in:
commit
b952b2cdbc
|
@ -31,7 +31,6 @@ import logging
|
||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import build_icon
|
|
||||||
from openlp.core.lib.ui import create_widget_action
|
from openlp.core.lib.ui import create_widget_action
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
|
@ -137,7 +137,7 @@ class AlertsPlugin(Plugin):
|
||||||
text=translate('AlertsPlugin', '&Alert'),
|
text=translate('AlertsPlugin', '&Alert'),
|
||||||
icon=u':/plugins/plugin_alerts.png',
|
icon=u':/plugins/plugin_alerts.png',
|
||||||
statustip=translate('AlertsPlugin', 'Show an alert message.'),
|
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)
|
self.serviceManager.mainwindow.toolsMenu.addAction(self.toolsAlertItem)
|
||||||
|
|
||||||
def initialise(self):
|
def initialise(self):
|
||||||
|
|
Loading…
Reference in New Issue