diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 831babcf5..f6ce8bb06 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -97,7 +97,7 @@ class OpenLP(QtGui.QApplication):
self.shared_memory.detach()
return result
- def run(self, args, testing=False):
+ def run(self, args):
"""
Run the OpenLP application.
"""
@@ -110,10 +110,6 @@ class OpenLP(QtGui.QApplication):
if 'OpenLP' in args:
args.remove('OpenLP')
self.args.extend(args)
- # provide a listener for widgets to reqest a screen update.
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'cursor_busy'), self.set_busy_cursor)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'cursor_normal'), self.set_normal_cursor)
# Decide how many screens we have and their size
screens = ScreenList.create(self.desktop())
# First time checks in settings
@@ -139,7 +135,7 @@ class OpenLP(QtGui.QApplication):
# make sure Qt really display the splash screen
self.processEvents()
# start the main app window
- self.main_window = MainWindow(self)
+ self.main_window = MainWindow()
self.main_window.show()
if show_splash:
# now kill the splashscreen
@@ -156,9 +152,13 @@ class OpenLP(QtGui.QApplication):
VersionThread(self.main_window).start()
Receiver.send_message(u'live_display_blank_check')
self.main_window.app_startup()
- # Skip exec_() for gui tests
- if not testing:
- return self.exec_()
+ return self.exec_()
+
+ def close_splash_screen(self):
+ """
+ Close the splash screen when requested.
+ """
+ self.splash.close()
def is_already_running(self):
"""
@@ -199,6 +199,12 @@ class OpenLP(QtGui.QApplication):
self.set_normal_cursor()
self.exception_form.exec_()
+ def process_events(self):
+ """
+ Wrapper to make ProcessEvents visible and named correctly
+ """
+ self.processEvents()
+
def set_busy_cursor(self):
"""
Sets the Busy Cursor for the Application
@@ -211,6 +217,7 @@ class OpenLP(QtGui.QApplication):
Sets the Normal Cursor for the Application
"""
self.restoreOverrideCursor()
+ self.processEvents()
def event(self, event):
"""
@@ -235,7 +242,7 @@ def set_up_logging(log_path):
logfile.setFormatter(logging.Formatter(u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
log.addHandler(logfile)
if log.isEnabledFor(logging.DEBUG):
- print 'Logging to:', filename
+ print('Logging to: %s' % filename)
def main(args=None):
@@ -255,7 +262,6 @@ def main(args=None):
parser.add_option('-d', '--dev-version', dest='dev_version', action='store_true',
help='Ignore the version file and pull the version directly from Bazaar')
parser.add_option('-s', '--style', dest='style', help='Set the Qt4 style (passed directly to Qt4).')
- parser.add_option('--testing', dest='testing', action='store_true', help='Run by testing framework')
# Parse command line options and deal with them.
# Use args supplied programatically if possible.
(options, args) = parser.parse_args(args) if args else parser.parse_args()
@@ -276,38 +282,37 @@ def main(args=None):
# Initialise the resources
qInitResources()
# Now create and actually run the application.
- app = OpenLP(qt_args)
- app.setOrganizationName(u'OpenLP')
- app.setOrganizationDomain(u'openlp.org')
+ application = OpenLP(qt_args)
+ application.setOrganizationName(u'OpenLP')
+ application.setOrganizationDomain(u'openlp.org')
if options.portable:
- app.setApplicationName(u'OpenLPPortable')
+ application.setApplicationName(u'OpenLPPortable')
Settings.setDefaultFormat(Settings.IniFormat)
# Get location OpenLPPortable.ini
- app_path = AppLocation.get_directory(AppLocation.AppDir)
- set_up_logging(os.path.abspath(os.path.join(app_path, u'..', u'..', u'Other')))
+ application_path = AppLocation.get_directory(AppLocation.AppDir)
+ set_up_logging(os.path.abspath(os.path.join(application_path, u'..', u'..', u'Other')))
log.info(u'Running portable')
- portable_settings_file = os.path.abspath(os.path.join(app_path, u'..', u'..', u'Data', u'OpenLP.ini'))
+ portable_settings_file = os.path.abspath(os.path.join(application_path, u'..', u'..', u'Data', u'OpenLP.ini'))
# Make this our settings file
log.info(u'INI file: %s', portable_settings_file)
Settings.set_filename(portable_settings_file)
portable_settings = Settings()
# Set our data path
- data_path = os.path.abspath(os.path.join(app_path, u'..', u'..', u'Data',))
+ data_path = os.path.abspath(os.path.join(application_path, u'..', u'..', u'Data',))
log.info(u'Data path: %s', data_path)
# Point to our data path
portable_settings.setValue(u'advanced/data path', data_path)
portable_settings.setValue(u'advanced/is portable', True)
portable_settings.sync()
else:
- app.setApplicationName(u'OpenLP')
+ application.setApplicationName(u'OpenLP')
set_up_logging(AppLocation.get_directory(AppLocation.CacheDir))
Registry.create()
- app.setApplicationVersion(get_application_version()[u'version'])
+ Registry().register(u'application', application)
+ application.setApplicationVersion(get_application_version()[u'version'])
# Instance check
- if not options.testing:
- # Instance check
- if app.is_already_running():
- sys.exit()
+ if application.is_already_running():
+ sys.exit()
# First time checks in settings
if not Settings().value(u'general/has run wizard'):
if not FirstTimeLanguageForm().exec_():
@@ -315,19 +320,14 @@ def main(args=None):
sys.exit()
# i18n Set Language
language = LanguageManager.get_language()
- app_translator, default_translator = LanguageManager.get_translator(language)
- if not app_translator.isEmpty():
- app.installTranslator(app_translator)
+ application_translator, default_translator = LanguageManager.get_translator(language)
+ if not application_translator.isEmpty():
+ application.installTranslator(application_translator)
if not default_translator.isEmpty():
- app.installTranslator(default_translator)
+ application.installTranslator(default_translator)
else:
log.debug(u'Could not find default_translator.')
if not options.no_error_form:
- sys.excepthook = app.hook_exception
- # Do not run method app.exec_() when running gui tests
- if options.testing:
- app.run(qt_args, testing=True)
- # For gui tests we need access to window instances and their components
- return app
- else:
- sys.exit(app.run(qt_args))
+ sys.excepthook = application.hook_exception
+ sys.exit(application.run(qt_args))
+
diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 5601fa530..398e8c29c 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -61,8 +61,7 @@ def init_db(url, auto_flush=True, auto_commit=False):
"""
engine = create_engine(url, poolclass=NullPool)
metadata = MetaData(bind=engine)
- session = scoped_session(sessionmaker(autoflush=auto_flush,
- autocommit=auto_commit, bind=engine))
+ session = scoped_session(sessionmaker(autoflush=auto_flush, autocommit=auto_commit, bind=engine))
return session, metadata
diff --git a/openlp/core/lib/dockwidget.py b/openlp/core/lib/dockwidget.py
index 743607dd6..c7fa0e6eb 100644
--- a/openlp/core/lib/dockwidget.py
+++ b/openlp/core/lib/dockwidget.py
@@ -35,7 +35,7 @@ import logging
from PyQt4 import QtGui
-from openlp.core.lib import build_icon, ScreenList
+from openlp.core.lib import ScreenList, build_icon
log = logging.getLogger(__name__)
diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py
index 285e92bc9..df24694b0 100644
--- a/openlp/core/lib/eventreceiver.py
+++ b/openlp/core/lib/eventreceiver.py
@@ -47,24 +47,12 @@ class EventReceiver(QtCore.QObject):
``mainwindow_status_text``
Changes the bottom status bar text on the mainwindow.
- ``openlp_warning_message``
- Displays a standalone Warning Message.
-
``openlp_error_message``
Displays a standalone Error Message.
``openlp_information_message``
Displays a standalone Information Message.
- ``cursor_busy``
- Makes the cursor got to a busy form.
-
- ``cursor_normal``
- Resets the cursor to default.
-
- ``openlp_process_events``
- Requests the Application to flush the events queue.
-
``openlp_version_check``
Version has changed so pop up window.
@@ -121,29 +109,6 @@ class EventReceiver(QtCore.QObject):
``slidecontroller_live_stop_loop``
Stop the loop on the main display.
-
- **Servicemanager related signals**
-
- ``servicemanager_new_service``
- A new service is being loaded or created.
-
- ``servicemanager_previous_item``
- Display the previous item in the service.
-
- ``servicemanager_preview_live``
- Requests a Preview item from the Service Manager to update live and add
- a new item to the preview panel.
-
- ``servicemanager_next_item``
- Display the next item in the service.
-
- ``servicemanager_set_item``
- Go live on a specific item, by index.
-
- ``service_item_update``
- Passes back to the service manager the service item after it has been
- processed by the plugin.
-
**Display signals**
``update_display_css``
diff --git a/openlp/core/lib/formattingtags.py b/openlp/core/lib/formattingtags.py
index abbc18f16..b7bbd7322 100644
--- a/openlp/core/lib/formattingtags.py
+++ b/openlp/core/lib/formattingtags.py
@@ -31,7 +31,7 @@ Provide HTML Tag management and Formatting Tag access class
"""
import cPickle
-from openlp.core.lib import translate, Settings
+from openlp.core.lib import Settings, translate
class FormattingTags(object):
diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 9726079f7..7d738a664 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -39,7 +39,7 @@ import Queue
from PyQt4 import QtCore
-from openlp.core.lib import resize_image, image_to_byte, Receiver, Registry, ScreenList
+from openlp.core.lib import Receiver, Registry, ScreenList, resize_image, image_to_byte
log = logging.getLogger(__name__)
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 056ad5424..bb8ee2f70 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -332,9 +332,9 @@ class MediaManagerItem(QtGui.QWidget):
Settings().value(self.settingsSection + u'/last directory'), self.onNewFileMasks)
log.info(u'New files(s) %s', files)
if files:
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.validateAndLoad(files)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def loadFile(self, files):
"""
@@ -718,3 +718,13 @@ class MediaManagerItem(QtGui.QWidget):
return self._theme_manager
theme_manager = property(_get_theme_manager)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index 0fd5ec2e3..bad7defb8 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -409,6 +409,12 @@ class Plugin(QtCore.QObject):
"""
pass
+ def new_service_created(self):
+ """
+ The plugin's needs to handle a new song creation
+ """
+ pass
+
def _get_main_window(self):
"""
Adds the main window to the class dynamically
@@ -418,3 +424,13 @@ class Plugin(QtCore.QObject):
return self._main_window
main_window = property(_get_main_window)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index fbc422992..a6fd2a848 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -212,3 +212,13 @@ class PluginManager(object):
if plugin.name == name:
return plugin
return None
+
+ def new_service_created(self):
+ """
+ Loop through all the plugins and give them an opportunity to handle a new service
+ """
+ log.info(u'plugins - new service created')
+ for plugin in self.plugins:
+ if plugin.isActive():
+ plugin.new_service_created()
+
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 7b7027efd..ca2a3b073 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -31,8 +31,8 @@ import logging
from PyQt4 import QtGui, QtCore, QtWebKit
-from openlp.core.lib import ServiceItem, expand_tags, build_lyrics_format_css, build_lyrics_outline_css, Receiver, \
- ItemCapabilities, FormattingTags, ImageSource, Registry, ScreenList
+from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, Receiver, Registry, ScreenList, \
+ ServiceItem, expand_tags, build_lyrics_format_css, build_lyrics_outline_css
from openlp.core.lib.theme import ThemeLevel
from openlp.core.ui import MainDisplay
diff --git a/openlp/core/lib/screen.py b/openlp/core/lib/screen.py
index 9c118de99..c0272ff81 100644
--- a/openlp/core/lib/screen.py
+++ b/openlp/core/lib/screen.py
@@ -139,8 +139,7 @@ class ScreenList(object):
"""
screen_list = []
for screen in self.screen_list:
- screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'),
- screen[u'number'] + 1)
+ screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'), screen[u'number'] + 1)
if screen[u'primary']:
screen_name = u'%s (%s)' % (screen_name, translate('OpenLP.ScreenList', 'primary'))
screen_list.append(screen_name)
@@ -237,8 +236,7 @@ class ScreenList(object):
y = window.y() + (window.height() / 2)
for screen in self.screen_list:
size = screen[u'size']
- if x >= size.x() and x <= (size.x() + size.width()) and \
- y >= size.y() and y <= (size.y() + size.height()):
+ if x >= size.x() and x <= (size.x() + size.width()) and y >= size.y() and y <= (size.y() + size.height()):
return screen[u'number']
def load_screen_settings(self):
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 743f6b00a..47c9852a8 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -39,7 +39,7 @@ import uuid
from PyQt4 import QtGui
-from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, ImageSource, Settings, Registry
+from openlp.core.lib import ImageSource, Settings, Registry, build_icon, clean_tags, expand_tags, translate
log = logging.getLogger(__name__)
diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py
index 33a779bfd..7e72c6d4c 100644
--- a/openlp/core/lib/settings.py
+++ b/openlp/core/lib/settings.py
@@ -74,7 +74,8 @@ class Settings(QtCore.QSettings):
The first entry is the *old key*; it will be removed.
- The second entry is the *new key*; we will add it to the config.
+ The second entry is the *new key*; we will add it to the config. If this is just an empty string, we just remove
+ the old key.
The last entry is a list containing two-pair tuples. If the list is empty, no conversion is made. Otherwise each
pair describes how to convert the old setting's value::
@@ -86,66 +87,68 @@ class Settings(QtCore.QSettings):
So, if the type of the old value is bool, then there must be two rules.
"""
__default_settings__ = {
- u'advanced/x11 bypass wm': X11_BYPASS_DEFAULT,
+ u'advanced/add page break': False,
u'advanced/alternate rows': not sys.platform.startswith(u'win'),
- u'advanced/default service enabled': True,
- u'advanced/enable exit confirmation': True,
- u'advanced/save current plugin': False,
- u'advanced/single click preview': False,
- # 7 stands for now, 0 to 6 is Monday to Sunday.
- u'advanced/default service day': 7,
- u'advanced/max recent files': 20,
- u'advanced/is portable': False,
- u'advanced/hide mouse': True,
u'advanced/current media plugin': -1,
- u'advanced/double click live': False,
u'advanced/data path': u'',
- u'advanced/default service hour': 11,
u'advanced/default color': u'#ffffff',
u'advanced/default image': u':/graphics/openlp-splash-screen.png',
- u'advanced/expand service item': False,
- u'advanced/recent file count': 4,
- u'advanced/default service name': UiStrings().DefaultServiceName,
+ # 7 stands for now, 0 to 6 is Monday to Sunday.
+ u'advanced/default service day': 7,
+ u'advanced/default service enabled': True,
+ u'advanced/default service hour': 11,
u'advanced/default service minute': 0,
- u'advanced/slide limits': SlideLimits.End,
- u'advanced/print slide text': False,
- u'advanced/add page break': False,
+ u'advanced/default service name': UiStrings().DefaultServiceName,
+ u'advanced/display size': 0,
+ u'advanced/double click live': False,
+ u'advanced/enable exit confirmation': True,
+ u'advanced/expand service item': False,
+ u'advanced/hide mouse': True,
+ u'advanced/is portable': False,
+ u'advanced/max recent files': 20,
u'advanced/print file meta data': False,
u'advanced/print notes': False,
- u'advanced/display size': 0,
+ u'advanced/print slide text': False,
+ u'advanced/recent file count': 4,
+ u'advanced/save current plugin': False,
+ u'advanced/slide limits': SlideLimits.End,
+ u'advanced/single click preview': False,
+ u'advanced/x11 bypass wm': X11_BYPASS_DEFAULT,
u'crashreport/last directory': u'',
u'displayTags/html_tags': u'',
+ u'general/audio repeat list': False,
+ u'general/auto open': False,
+ u'general/auto preview': False,
+ u'general/audio start paused': True,
+ u'general/auto unblank': False,
+ u'general/blank warning': False,
u'general/ccli number': u'',
u'general/has run wizard': False,
- u'general/update check': True,
u'general/language': u'[en]',
- u'general/songselect password': u'',
- u'general/recent files': [],
- u'general/save prompt': False,
- u'general/auto preview': False,
- u'general/view mode': u'default',
- u'general/auto open': False,
- u'general/enable slide loop': True,
- u'general/show splash': True,
- u'general/screen blank': False,
- # The other display settings (display position and dimensions) are defined in the ScreenList class due to a
- # circular dependency.
- u'general/override position': False,
- u'general/loop delay': 5,
- u'general/songselect username': u'',
- u'general/audio repeat list': False,
- u'general/auto unblank': False,
- u'general/display on monitor': True,
- u'general/audio start paused': True,
# This defaults to yesterday in order to force the update check to run when you've never run it before.
u'general/last version test': datetime.datetime.now().date() - datetime.timedelta(days=1),
- u'general/blank warning': False,
+ u'general/loop delay': 5,
+ u'general/recent files': [],
+ u'general/save prompt': False,
+ u'general/screen blank': False,
+ u'general/show splash': True,
+ u'general/songselect password': u'',
+ u'general/songselect username': u'',
+ u'general/update check': True,
+ u'general/view mode': u'default',
+ # The other display settings (display position and dimensions) are defined in the ScreenList class due to a
+ # circular dependency.
+ u'general/display on monitor': True,
+ u'general/override position': False,
+ u'media/players': u'webkit',
+ u'media/override player': QtCore.Qt.Unchecked,
u'players/background color': u'#000000',
- u'servicemanager/service theme': u'',
+ u'servicemanager/last directory': u'',
u'servicemanager/last file': u'',
+ u'servicemanager/service theme': u'',
+ u'SettingsImport/file_date_created': datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
u'SettingsImport/Make_Changes': u'At_Own_RISK',
u'SettingsImport/type': u'OpenLP_settings_export',
- u'SettingsImport/file_date_created': datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
u'SettingsImport/version': u'',
u'shortcuts/aboutItem': [QtGui.QKeySequence(u'Ctrl+F1')],
u'shortcuts/audioPauseItem': [],
@@ -213,39 +216,37 @@ class Settings(QtCore.QSettings):
u'shortcuts/viewLivePanel': [QtGui.QKeySequence(u'F12')],
u'shortcuts/viewServiceManagerItem': [QtGui.QKeySequence(u'F9')],
u'shortcuts/webSiteItem': [],
- u'themes/theme level': ThemeLevel.Song,
u'themes/global theme': u'',
u'themes/last directory': u'',
u'themes/last directory export': u'',
u'themes/last directory import': u'',
- u'user interface/main window position': QtCore.QPoint(0, 0),
- u'user interface/preview panel': True,
+ u'themes/theme level': ThemeLevel.Song,
u'user interface/live panel': True,
- u'user interface/main window geometry': QtCore.QByteArray(),
- u'user interface/preview splitter geometry': QtCore.QByteArray(),
- u'user interface/lock panel': False,
- u'user interface/mainwindow splitter geometry': QtCore.QByteArray(),
u'user interface/live splitter geometry': QtCore.QByteArray(),
+ u'user interface/lock panel': False,
+ u'user interface/main window geometry': QtCore.QByteArray(),
+ u'user interface/main window position': QtCore.QPoint(0, 0),
+ u'user interface/main window splitter geometry': QtCore.QByteArray(),
u'user interface/main window state': QtCore.QByteArray(),
- u'media/players': u'webkit',
- u'media/override player': QtCore.Qt.Unchecked,
- # Old settings (not used anymore). Have to be here, so that old setting.config backups can be imported.
- u'advanced/stylesheet fix': u'',
- u'servicemanager/last directory': u''
+ u'user interface/preview panel': True,
+ u'user interface/preview splitter geometry': QtCore.QByteArray()
}
__file_path__ = u''
__obsolete_settings__ = [
+ # Changed during 1.9.x development.
(u'bibles/bookname language', u'bibles/book name language', []),
(u'general/enable slide loop', u'advanced/slide limits', [(SlideLimits.Wrap, True), (SlideLimits.End, False)]),
+ (u'songs/ccli number', u'general/ccli number', []),
+ # Changed during 2.1.x development.
+ (u'advanced/stylesheet fix', u'', []),
+ (u'bibles/last directory 1', u'bibles/last directory import', []),
+ (u'media/background color', u'players/background color', []),
(u'themes/last directory', u'themes/last directory import', []),
(u'themes/last directory 1', u'themes/last directory export', []),
- (u'servicemanager/last directory', u'', []),
(u'songs/last directory 1', u'songs/last directory import', []),
- (u'bibles/last directory 1', u'bibles/last directory import', []),
(u'songusage/last directory 1', u'songusage/last directory export', []),
- (u'shortcuts/makeLive', u'shortcuts/make_live', []),
- (u'advanced/stylesheet fix', u'', []),
- (u'media/background color', u'players/background color', [])
+ (u'user interface/mainwindow splitter geometry', u'user interface/main window splitter geometry', []),
+ (u'shortcuts/makeLive', u'shortcuts/make_live', [])
]
@staticmethod
@@ -296,6 +297,11 @@ class Settings(QtCore.QSettings):
if new_key:
# Get the value of the old_key.
old_value = super(Settings, self).value(old_key)
+ # When we want to convert the value, we have to figure out the default value (because we cannot get
+ # the default value from the central settings dict.
+ if rules:
+ default_value = rules[0][1]
+ old_value = self._convert_value(old_value, default_value)
# Iterate over our rules and check what the old_value should be "converted" to.
for new, old in rules:
# If the value matches with the condition (rule), then use the provided value. This is used to
@@ -311,8 +317,6 @@ class Settings(QtCore.QSettings):
Returns the value for the given ``key``. The returned ``value`` is of the same type as the default value in the
*Settings.__default_settings__* dict.
- **Note**, this method only converts a few types and might need to be extended if a certain type is missing!
-
``key``
The key to return the value from.
"""
@@ -322,6 +326,21 @@ class Settings(QtCore.QSettings):
else:
default_value = Settings.__default_settings__[key]
setting = super(Settings, self).value(key, default_value)
+ return self._convert_value(setting, default_value)
+
+ def _convert_value(self, setting, default_value):
+ """
+ This converts the given ``setting`` to the type of the given ``default_value``.
+
+ ``setting``
+ The setting to convert. This could be ``true`` for example.Settings()
+
+ ``default_value``
+ Indication the type the setting should be converted to. For example ``True`` (type is boolean), meaning that
+ we convert the string ``true`` to a python boolean.
+
+ **Note**, this method only converts a few types and might need to be extended if a certain type is missing!
+ """
# On OS X (and probably on other platforms too) empty value from QSettings is represented as type
# PyQt4.QtCore.QPyNullVariant. This type has to be converted to proper 'None' Python type.
if isinstance(setting, QtCore.QPyNullVariant) and setting.isNull():
diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py
index 0d869d724..4f4aa0596 100644
--- a/openlp/core/lib/ui.py
+++ b/openlp/core/lib/ui.py
@@ -33,7 +33,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, translate, Receiver, UiStrings
+from openlp.core.lib import Receiver, UiStrings, build_icon, translate
from openlp.core.utils.actions import ActionList
@@ -67,7 +67,7 @@ def add_welcome_page(parent, image):
parent.addPage(parent.welcomePage)
-def create_button_box(dialog, name, standard_buttons, custom_buttons=[]):
+def create_button_box(dialog, name, standard_buttons, custom_buttons=None):
"""
Creates a QDialogButtonBox with the given buttons. The ``accepted()`` and
``rejected()`` signals of the button box are connected with the dialogs
@@ -88,6 +88,8 @@ def create_button_box(dialog, name, standard_buttons, custom_buttons=[]):
QtGui.QAbstractButton it is added with QDialogButtonBox.ActionRole.
Otherwhise the item has to be a tuple of a button and a ButtonRole.
"""
+ if custom_buttons is None:
+ custom_buttons = []
buttons = QtGui.QDialogButtonBox.NoButton
if u'ok' in standard_buttons:
buttons |= QtGui.QDialogButtonBox.Ok
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index cf04f4927..0115d8af2 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -29,7 +29,7 @@
from PyQt4 import QtGui
-from openlp.core.lib import build_icon, translate, UiStrings
+from openlp.core.lib import UiStrings, build_icon, translate
from openlp.core.lib.ui import create_button, create_button_box
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index 08a98d918..7cd89c252 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -37,7 +37,7 @@ import sys
from PyQt4 import QtCore, QtGui
from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate, build_icon
-from openlp.core.utils import get_images_filter, AppLocation, format_time
+from openlp.core.utils import AppLocation, format_time, get_images_filter
from openlp.core.lib import SlideLimits
log = logging.getLogger(__name__)
@@ -449,7 +449,7 @@ class AdvancedTab(SettingsTab):
settings.setValue(u'enable exit confirmation', self.enable_auto_close_check_box.isChecked())
settings.setValue(u'hide mouse', self.hide_mouse_check_box.isChecked())
settings.setValue(u'x11 bypass wm', self.x11_bypass_check_box.isChecked())
- settings.setValue(u'alternate rows', self.alternate_rows_check_box.isChecked())
+ settings.setValue(u'alternate rows', self.alternate_rows_check_box.isChecked())
settings.setValue(u'default color', self.default_color)
settings.setValue(u'default image', self.default_file_edit.text())
settings.setValue(u'slide limits', self.slide_limits)
@@ -666,7 +666,7 @@ class AdvancedTab(SettingsTab):
The state of the check box (boolean).
"""
self.display_changed = True
-
+
def on_alternate_rows_check_box_toggled(self, checked):
"""
Notify user about required restart.
@@ -681,17 +681,17 @@ class AdvancedTab(SettingsTab):
def on_end_slide_button_clicked(self):
"""
Stop at the end either top ot bottom
- """
+ """
self.slide_limits = SlideLimits.End
def on_wrap_slide_button_clicked(self):
"""
- Wrap round the service item
- """
+ Wrap round the service item
+ """
self.slide_limits = SlideLimits.Wrap
def on_next_item_button_clicked(self):
"""
Advance to the next service item
- """
+ """
self.slide_limits = SlideLimits.Next
diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py
index 580e5ae71..0d8a7c74f 100644
--- a/openlp/core/ui/exceptionform.py
+++ b/openlp/core/ui/exceptionform.py
@@ -88,7 +88,7 @@ except AttributeError:
WEBKIT_VERSION = u'-'
-from openlp.core.lib import translate, UiStrings, Settings
+from openlp.core.lib import UiStrings, Settings, translate
from openlp.core.utils import get_application_version
from exceptiondialog import Ui_ExceptionDialog
@@ -141,9 +141,9 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
u'pyUNO bridge: %s\n' % UNO_VERSION
if platform.system() == u'Linux':
if os.environ.get(u'KDE_FULL_SESSION') == u'true':
- system = system + u'Desktop: KDE SC\n'
+ system += u'Desktop: KDE SC\n'
elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
- system = system + u'Desktop: GNOME\n'
+ system += u'Desktop: GNOME\n'
return (openlp_version, description, traceback, system, libraries)
def onSaveReportButtonClicked(self):
diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index ca80b9f10..daedbb94e 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -41,8 +41,8 @@ from ConfigParser import SafeConfigParser
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, check_directory_exists, Settings, Registry
-from openlp.core.utils import get_web_page, AppLocation, get_filesystem_encoding
+from openlp.core.lib import PluginStatus, Receiver, Settings, Registry, build_icon, check_directory_exists, translate
+from openlp.core.utils import AppLocation, get_web_page, get_filesystem_encoding
from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
log = logging.getLogger(__name__)
@@ -152,13 +152,13 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
# Download the theme screenshots.
self.themeScreenshotThread = ThemeScreenshotThread(self)
self.themeScreenshotThread.start()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def nextId(self):
"""
Determine the next page in the Wizard to go to.
"""
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if self.currentId() == FirstTimePage.Plugins:
if not self.webAccess:
return FirstTimePage.NoInternet
@@ -169,14 +169,13 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
elif self.currentId() == FirstTimePage.NoInternet:
return FirstTimePage.Progress
elif self.currentId() == FirstTimePage.Themes:
- Receiver.send_message(u'cursor_busy')
- Receiver.send_message(u'openlp_process_events')
+ self.application.set_busy_cursor()
while not self.themeScreenshotThread.isFinished():
time.sleep(0.1)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Build the screenshot icons, as this can not be done in the thread.
self._buildThemeScreenshots()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
return FirstTimePage.Defaults
else:
return self.currentId() + 1
@@ -187,7 +186,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
"""
# Keep track of the page we are at. Triggering "Cancel" causes pageId
# to be a -1.
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if pageId != -1:
self.lastId = pageId
if pageId == FirstTimePage.Plugins:
@@ -219,16 +218,15 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if self.hasRunWizard:
self.cancelButton.setVisible(False)
elif pageId == FirstTimePage.Progress:
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.repaint()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Try to give the wizard a chance to redraw itself
time.sleep(0.2)
self._preWizard()
self._performWizard()
self._postWizard()
- Receiver.send_message(u'cursor_normal')
- Receiver.send_message(u'openlp_process_events')
+ self.application.set_normal_cursor()
def updateScreenListCombo(self):
"""
@@ -250,16 +248,15 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.was_download_cancelled = True
while self.themeScreenshotThread.isRunning():
time.sleep(0.1)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def onNoInternetFinishButtonClicked(self):
"""
Process the triggering of the "Finish" button on the No Internet page.
"""
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self._performWizard()
- Receiver.send_message(u'cursor_normal')
- Receiver.send_message(u'openlp_process_events')
+ self.application.set_normal_cursor()
Settings().setValue(u'general/has run wizard', True)
self.close()
@@ -335,7 +332,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.progressLabel.setText(status_text)
if increment > 0:
self.progressBar.setValue(self.progressBar.value() + increment)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def _preWizard(self):
"""
@@ -343,10 +340,10 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
"""
self.max_progress = 0
self.finishButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Loop through the songs list and increase for each selected item
for i in xrange(self.songsListWidget.count()):
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
item = self.songsListWidget.item(i)
if item.checkState() == QtCore.Qt.Checked:
filename = item.data(QtCore.Qt.UserRole)
@@ -355,7 +352,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
# Loop through the Bibles list and increase for each selected item
iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
while iterator.value():
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
item = iterator.value()
if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
filename = item.data(0, QtCore.Qt.UserRole)
@@ -364,7 +361,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
iterator += 1
# Loop through the themes list and increase for each selected item
for i in xrange(self.themesListWidget.count()):
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
item = self.themesListWidget.item(i)
if item.checkState() == QtCore.Qt.Checked:
filename = item.data(QtCore.Qt.UserRole)
@@ -372,7 +369,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.max_progress += size
if self.max_progress:
# Add on 2 for plugins status setting plus a "finished" point.
- self.max_progress = self.max_progress + 2
+ self.max_progress += 2
self.progressBar.setValue(0)
self.progressBar.setMinimum(0)
self.progressBar.setMaximum(self.max_progress)
@@ -384,7 +381,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard', 'Setting Up'))
self.progressPage.setSubTitle(u'Setup complete.')
self.repaint()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Try to give the wizard a chance to repaint itself
time.sleep(0.1)
@@ -411,7 +408,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.finishButton.setEnabled(True)
self.cancelButton.setVisible(False)
self.nextButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def _performWizard(self):
"""
@@ -489,3 +486,13 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
return self._theme_manager
theme_manager = property(_get_theme_manager)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/ui/formattingtagdialog.py b/openlp/core/ui/formattingtagdialog.py
index fbf5707ed..8c72a9120 100644
--- a/openlp/core/ui/formattingtagdialog.py
+++ b/openlp/core/ui/formattingtagdialog.py
@@ -31,7 +31,7 @@ The UI widgets for the formatting tags window.
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, UiStrings
+from openlp.core.lib import UiStrings, translate
from openlp.core.lib.ui import create_button_box
diff --git a/openlp/core/ui/formattingtagform.py b/openlp/core/ui/formattingtagform.py
index 1085afbcd..b3611b1d7 100644
--- a/openlp/core/ui/formattingtagform.py
+++ b/openlp/core/ui/formattingtagform.py
@@ -33,7 +33,7 @@ cannot be changed.
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, FormattingTags
+from openlp.core.lib import FormattingTags, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 4626d36d2..e88ae2b15 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -33,7 +33,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, Settings, SettingsTab, translate, ScreenList, UiStrings
+from openlp.core.lib import Receiver, Settings, SettingsTab, ScreenList, UiStrings, translate
log = logging.getLogger(__name__)
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 04567a16e..badf55548 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -42,8 +42,8 @@ import sys
from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
from PyQt4.phonon import Phonon
-from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte, translate, expand_tags,\
- Settings, ImageSource, Registry
+from openlp.core.lib import Receiver, ServiceItem, Settings, ImageSource, Registry, build_html, expand_tags, \
+ image_to_byte, translate
from openlp.core.lib.theme import BackgroundType
from openlp.core.lib import ScreenList
@@ -243,7 +243,7 @@ class MainDisplay(Display):
log.debug(u'text to display')
# Wait for the webview to update before displaying text.
while not self.webLoaded:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.setGeometry(self.screen[u'size'])
if animate:
self.frame.evaluateJavaScript(u'show_text("%s")' % slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
@@ -347,18 +347,18 @@ class MainDisplay(Display):
Generates a preview of the image displayed.
"""
log.debug(u'preview for %s', self.isLive)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# We must have a service item to preview.
if self.isLive and hasattr(self, u'serviceItem'):
# Wait for the fade to finish before geting the preview.
# Important otherwise preview will have incorrect text if at all!
if self.serviceItem.themedata and self.serviceItem.themedata.display_slide_transition:
while self.frame.evaluateJavaScript(u'show_text_complete()') == u'false':
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Wait for the webview to update before getting the preview.
# Important otherwise first preview will miss the background !
while not self.webLoaded:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# if was hidden keep it hidden
if self.isLive:
if self.hideMode:
@@ -503,6 +503,16 @@ class MainDisplay(Display):
image_manager = property(_get_image_manager)
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
+
class AudioPlayer(QtCore.QObject):
"""
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 5ab76f464..5e21a6c28 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -41,13 +41,13 @@ from datetime import datetime
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Renderer, build_icon, OpenLPDockWidget, PluginManager, Receiver, translate, ImageManager, \
- PluginStatus, Registry, Settings, ScreenList
+from openlp.core.lib import Renderer, OpenLPDockWidget, PluginManager, Receiver, ImageManager, PluginStatus, Registry, \
+ Settings, ScreenList, build_icon, check_directory_exists, translate
from openlp.core.lib.ui import UiStrings, create_action
from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, SlideController, PluginForm, \
MediaDockManager, ShortcutListForm, FormattingTagForm
from openlp.core.ui.media import MediaController
-from openlp.core.utils import AppLocation, add_actions, LanguageManager, get_application_version, \
+from openlp.core.utils import AppLocation, LanguageManager, add_actions, get_application_version, \
get_filesystem_encoding
from openlp.core.utils.actions import ActionList, CategoryOrder
from openlp.core.ui.firsttimeform import FirstTimeForm
@@ -455,14 +455,13 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
log.info(u'MainWindow loaded')
- def __init__(self, application):
+ def __init__(self):
"""
This constructor sets up the interface, the various managers, and the
plugins.
"""
QtGui.QMainWindow.__init__(self)
Registry().register(u'main_window', self)
- self.application = application
self.clipboard = self.application.clipboard()
self.arguments = self.application.args
# Set up settings sections for the main application (not for use by plugins).
@@ -487,7 +486,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.recentFiles = []
# Set up the path with plugins
plugin_path = AppLocation.get_directory(AppLocation.PluginsDir)
- self.pluginManager = PluginManager(plugin_path)
+ self.plugin_manager = PluginManager(plugin_path)
self.imageManager = ImageManager()
# Set up the interface
self.setupUi(self)
@@ -538,10 +537,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'cleanup'), self.clean_up)
# Media Manager
QtCore.QObject.connect(self.mediaToolBox, QtCore.SIGNAL(u'currentChanged(int)'), self.onMediaToolBoxChanged)
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
# Simple message boxes
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'openlp_error_message'), self.onErrorMessage)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'openlp_warning_message'), self.onWarningMessage)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'openlp_information_message'),
self.onInformationMessage)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'set_new_data_path'), self.setNewDataPath)
@@ -553,25 +551,25 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Define the media Dock Manager
self.mediaDockManager = MediaDockManager(self.mediaToolBox)
log.info(u'Load Plugins')
- self.pluginManager.find_plugins(plugin_path)
+ self.plugin_manager.find_plugins(plugin_path)
# hook methods have to happen after find_plugins. Find plugins needs
# the controllers hence the hooks have moved from setupUI() to here
# Find and insert settings tabs
log.info(u'hook settings')
- self.pluginManager.hook_settings_tabs(self.settingsForm)
+ self.plugin_manager.hook_settings_tabs(self.settingsForm)
# Find and insert media manager items
log.info(u'hook media')
- self.pluginManager.hook_media_manager()
+ self.plugin_manager.hook_media_manager()
# Call the hook method to pull in import menus.
log.info(u'hook menus')
- self.pluginManager.hook_import_menu(self.fileImportMenu)
+ self.plugin_manager.hook_import_menu(self.fileImportMenu)
# Call the hook method to pull in export menus.
- self.pluginManager.hook_export_menu(self.fileExportMenu)
+ self.plugin_manager.hook_export_menu(self.fileExportMenu)
# Call the hook method to pull in tools menus.
- self.pluginManager.hook_tools_menu(self.toolsMenu)
+ self.plugin_manager.hook_tools_menu(self.toolsMenu)
# Call the initialise method to setup plugins.
log.info(u'initialise plugins')
- self.pluginManager.initialise_plugins()
+ self.plugin_manager.initialise_plugins()
# Create the displays as all necessary components are loaded.
self.previewController.screenSizeChanged()
self.liveController.screenSizeChanged()
@@ -587,7 +585,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Hide/show the theme combobox on the service manager
self.serviceManagerContents.theme_change()
# Reset the cursor
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def setAutoLanguage(self, value):
"""
@@ -648,22 +646,22 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
Give all the plugins a chance to perform some tasks at startup
"""
- Receiver.send_message(u'openlp_process_events')
- for plugin in self.pluginManager.plugins:
+ self.application.process_events()
+ for plugin in self.plugin_manager.plugins:
if plugin.isActive():
plugin.app_startup()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def first_time(self):
"""
Import themes if first time
"""
- Receiver.send_message(u'openlp_process_events')
- for plugin in self.pluginManager.plugins:
+ self.application.process_events()
+ for plugin in self.plugin_manager.plugins:
if hasattr(plugin, u'first_time'):
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
plugin.first_time()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
shutil.rmtree(temp_dir, True)
@@ -684,14 +682,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
QtGui.QMessageBox.No)
if answer == QtGui.QMessageBox.No:
return
- Receiver.send_message(u'cursor_busy')
screens = ScreenList()
first_run_wizard = FirstTimeForm(screens, self)
first_run_wizard.exec_()
if first_run_wizard.was_download_cancelled:
return
+ self.application.set_busy_cursor()
self.first_time()
- for plugin in self.pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
self.activePlugin = plugin
oldStatus = self.activePlugin.status
self.activePlugin.setStatus()
@@ -707,6 +705,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Check if any Bibles downloaded. If there are, they will be
# processed.
Receiver.send_message(u'bibles_load_list', True)
+ self.application.set_normal_cursor()
def blankCheck(self):
"""
@@ -723,21 +722,21 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
Display an error message
"""
- Receiver.send_message(u'close_splash')
+ self.application.close_splash_screen()
QtGui.QMessageBox.critical(self, data[u'title'], data[u'message'])
- def onWarningMessage(self, data):
+ def warning_message(self, message):
"""
Display a warning message
"""
- Receiver.send_message(u'close_splash')
- QtGui.QMessageBox.warning(self, data[u'title'], data[u'message'])
+ self.application.close_splash_screen()
+ QtGui.QMessageBox.warning(self, message[u'title'], message[u'message'])
def onInformationMessage(self, data):
"""
Display an informational message
"""
- Receiver.send_message(u'close_splash')
+ self.application.close_splash_screen()
QtGui.QMessageBox.information(self, data[u'title'], data[u'message'])
def onHelpWebSiteClicked(self):
@@ -841,10 +840,17 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
setting_sections.extend([self.headerSection])
setting_sections.extend([u'crashreport'])
# Add plugin sections.
- for plugin in self.pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
setting_sections.extend([plugin.name])
+ # Copy the settings file to the tmp dir, because we do not want to change the original one.
+ temp_directory = os.path.join(unicode(gettempdir()), u'openlp')
+ check_directory_exists(temp_directory)
+ temp_config = os.path.join(temp_directory, os.path.basename(import_file_name))
+ shutil.copyfile(import_file_name, temp_config)
settings = Settings()
- import_settings = Settings(import_file_name, Settings.IniFormat)
+ import_settings = Settings(temp_config, Settings.IniFormat)
+ # Remove/rename old settings to prepare the import.
+ import_settings.remove_obsolete_settings()
# Lets do a basic sanity check. If it contains this string we can
# assume it was created by OpenLP and so we'll load what we can
# from it, and just silently ignore anything we don't recognise
@@ -904,7 +910,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
return
# Make sure it's a .conf file.
if not export_file_name.endswith(u'conf'):
- export_file_name = export_file_name + u'.conf'
+ export_file_name += u'.conf'
temp_file = os.path.join(unicode(gettempdir(),
get_filesystem_encoding()), u'openlp', u'exportConf.tmp')
self.saveSettings()
@@ -918,7 +924,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
setting_sections.extend([self.themesSettingsSection])
setting_sections.extend([self.displayTagsSection])
# Add plugin sections.
- for plugin in self.pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
setting_sections.extend([plugin.name])
# Delete old files if found.
if os.path.exists(temp_file):
@@ -1003,14 +1009,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
renderer.
"""
log.debug(u'screenChanged')
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.imageManager.update_display()
self.renderer.update_display()
self.previewController.screenSizeChanged()
self.liveController.screenSizeChanged()
self.setFocus()
self.activateWindow()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def closeEvent(self, event):
"""
@@ -1070,7 +1076,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
Settings().setValue(u'advanced/current media plugin', self.mediaToolBox.currentIndex())
# Call the cleanup method to shutdown plugins.
log.info(u'cleanup plugins')
- self.pluginManager.finalise_plugins()
+ self.plugin_manager.finalise_plugins()
if save_settings:
# Save settings
self.saveSettings()
@@ -1223,7 +1229,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.restoreState(settings.value(u'main window state'))
self.liveController.splitter.restoreState(settings.value(u'live splitter geometry'))
self.previewController.splitter.restoreState(settings.value(u'preview splitter geometry'))
- self.controlSplitter.restoreState(settings.value(u'mainwindow splitter geometry'))
+ self.controlSplitter.restoreState(settings.value(u'main window splitter geometry'))
settings.endGroup()
def saveSettings(self):
@@ -1244,7 +1250,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
settings.setValue(u'main window geometry', self.saveGeometry())
settings.setValue(u'live splitter geometry', self.liveController.splitter.saveState())
settings.setValue(u'preview splitter geometry', self.previewController.splitter.saveState())
- settings.setValue(u'mainwindow splitter geometry', self.controlSplitter.saveState())
+ settings.setValue(u'main window splitter geometry', self.controlSplitter.saveState())
settings.endGroup()
def updateRecentFilesMenu(self):
@@ -1309,14 +1315,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.loadProgressBar.show()
self.loadProgressBar.setMaximum(size)
self.loadProgressBar.setValue(0)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def incrementProgressBar(self):
"""
Increase the Progress Bar value by 1
"""
self.loadProgressBar.setValue(self.loadProgressBar.value() + 1)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def finishedProgressBar(self):
"""
@@ -1331,7 +1337,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
if event.timerId() == self.timer_id:
self.timer_id = 0
self.loadProgressBar.hide()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def setNewDataPath(self, new_data_path):
"""
@@ -1352,23 +1358,22 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
log.info(u'Changing data path to %s' % self.newDataPath)
old_data_path = unicode(AppLocation.get_data_path())
# Copy OpenLP data to new location if requested.
+ self.application.set_busy_cursor()
if self.copyData:
log.info(u'Copying data to new path')
try:
- Receiver.send_message(u'openlp_process_events')
- Receiver.send_message(u'cursor_busy')
self.showStatusMessage(
translate('OpenLP.MainWindow', 'Copying OpenLP data to new data directory location - %s '
'- Please wait for copy to finish').replace('%s', self.newDataPath))
dir_util.copy_tree(old_data_path, self.newDataPath)
log.info(u'Copy sucessful')
except (IOError, os.error, DistutilsFileError), why:
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
log.exception(u'Data copy failed %s' % unicode(why))
QtGui.QMessageBox.critical(self, translate('OpenLP.MainWindow', 'New Data Directory Error'),
translate('OpenLP.MainWindow',
'OpenLP Data directory copy failed\n\n%s').replace('%s', unicode(why)),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return False
else:
log.info(u'No data copy requested')
@@ -1378,3 +1383,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Check if the new data path is our default.
if self.newDataPath == AppLocation.get_directory(AppLocation.DataDir):
settings.remove(u'advanced/data path')
+ self.application.set_normal_cursor()
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index 6d0c002de..73cd5b263 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -35,7 +35,7 @@ import os
import datetime
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, Receiver, translate, Settings, Registry, UiStrings
+from openlp.core.lib import OpenLPToolbar, Receiver, Settings, Registry, UiStrings, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players
from openlp.core.ui.media.mediaplayer import MediaPlayer
@@ -750,4 +750,4 @@ class MediaController(object):
self._service_manager = Registry().get(u'service_manager')
return self._service_manager
- service_manager = property(_get_service_manager)
\ No newline at end of file
+ service_manager = property(_get_service_manager)
diff --git a/openlp/core/ui/media/mediaplayer.py b/openlp/core/ui/media/mediaplayer.py
index 1357ead13..df9254706 100644
--- a/openlp/core/ui/media/mediaplayer.py
+++ b/openlp/core/ui/media/mediaplayer.py
@@ -29,6 +29,7 @@
"""
The :mod:`~openlp.core.ui.media.mediaplayer` module contains the MediaPlayer class.
"""
+from openlp.core.lib import Registry
from openlp.core.ui.media import MediaState
@@ -149,3 +150,13 @@ class MediaPlayer(object):
Returns Information about the player
"""
return u''
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
\ No newline at end of file
diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py
index 6ec640d2c..267466a98 100644
--- a/openlp/core/ui/media/phononplayer.py
+++ b/openlp/core/ui/media/phononplayer.py
@@ -36,7 +36,7 @@ from datetime import datetime
from PyQt4 import QtGui
from PyQt4.phonon import Phonon
-from openlp.core.lib import Receiver, translate, Settings
+from openlp.core.lib import Settings, translate
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
@@ -168,7 +168,7 @@ class PhononPlayer(MediaPlayer):
current_state = display.mediaObject.state()
if current_state == Phonon.ErrorState:
return False
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if (datetime.now() - start).seconds > 5:
return False
return True
diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py
index cfa274d0c..c2224369a 100644
--- a/openlp/core/ui/media/playertab.py
+++ b/openlp/core/ui/media/playertab.py
@@ -31,7 +31,7 @@ The :mod:`~openlp.core.ui.media.playertab` module holds the configuration tab fo
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings
+from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate
from openlp.core.lib.ui import create_button
from openlp.core.ui.media import get_media_players, set_media_players
diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py
index 713a28969..6d5a45549 100644
--- a/openlp/core/ui/media/vlcplayer.py
+++ b/openlp/core/ui/media/vlcplayer.py
@@ -37,7 +37,7 @@ import sys
from PyQt4 import QtGui
-from openlp.core.lib import Receiver, translate, Settings
+from openlp.core.lib import Settings, translate
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
@@ -187,7 +187,7 @@ class VlcPlayer(MediaPlayer):
while not mediaState == display.vlcMedia.get_state():
if display.vlcMedia.get_state() == vlc.State.Error:
return False
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if (datetime.now() - start).seconds > 60:
return False
return True
diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py
index 0a768fe37..963e4e6f7 100644
--- a/openlp/core/ui/media/webkitplayer.py
+++ b/openlp/core/ui/media/webkitplayer.py
@@ -33,7 +33,7 @@ from PyQt4 import QtGui
import logging
-from openlp.core.lib import translate, Settings
+from openlp.core.lib import Settings, translate
from openlp.core.ui.media import MediaState
from openlp.core.ui.media.mediaplayer import MediaPlayer
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index 83f8b21a7..77fcf66c7 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -31,7 +31,7 @@ The UI widgets of the plugin view dialog
#"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, UiStrings
+from openlp.core.lib import UiStrings, translate
from openlp.core.lib.ui import create_button_box
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index bb133a225..c371bc689 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -33,7 +33,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import PluginStatus, Receiver, translate
+from openlp.core.lib import PluginStatus, Registry, translate
from plugindialog import Ui_PluginViewDialog
log = logging.getLogger(__name__)
@@ -68,7 +68,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
self._clearDetails()
self.programaticChange = True
pluginListWidth = 0
- for plugin in self.parent().pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
item = QtGui.QListWidgetItem(self.pluginListWidget)
# We do this just to make 100% sure the status is an integer as
# sometimes when it's loaded from the config, it isn't cast to int.
@@ -121,10 +121,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
if self.pluginListWidget.currentItem() is None:
self._clearDetails()
return
- plugin_name_singular = \
- self.pluginListWidget.currentItem().text().split(u'(')[0][:-1]
+ plugin_name_singular = self.pluginListWidget.currentItem().text().split(u'(')[0][:-1]
self.activePlugin = None
- for plugin in self.parent().pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
if plugin.status != PluginStatus.Disabled:
if plugin.nameStrings[u'singular'] == plugin_name_singular:
self.activePlugin = plugin
@@ -141,9 +140,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
if self.programaticChange or status == PluginStatus.Disabled:
return
if status == PluginStatus.Inactive:
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.activePlugin.toggleStatus(PluginStatus.Active)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
self.activePlugin.app_startup()
else:
self.activePlugin.toggleStatus(PluginStatus.Inactive)
@@ -156,3 +155,23 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
status_text = translate('OpenLP.PluginForm', '%s (Disabled)')
self.pluginListWidget.currentItem().setText(
status_text % self.activePlugin.nameStrings[u'singular'])
+
+ def _get_plugin_manager(self):
+ """
+ Adds the plugin manager to the class dynamically
+ """
+ if not hasattr(self, u'_plugin_manager'):
+ self._plugin_manager = Registry().get(u'plugin_manager')
+ return self._plugin_manager
+
+ plugin_manager = property(_get_plugin_manager)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py
index 7f7abcf27..03ad043d2 100644
--- a/openlp/core/ui/printservicedialog.py
+++ b/openlp/core/ui/printservicedialog.py
@@ -31,7 +31,7 @@ The UI widgets of the print service dialog.
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, translate, SpellTextEdit, UiStrings
+from openlp.core.lib import SpellTextEdit, UiStrings, build_icon, translate
class ZoomSize(object):
diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 101ee9acb..d9fa54f36 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -36,7 +36,7 @@ import os
from PyQt4 import QtCore, QtGui
from lxml import html
-from openlp.core.lib import translate, get_text_file_string, Receiver, Settings, UiStrings, Registry
+from openlp.core.lib import Receiver, Settings, UiStrings, Registry, translate, get_text_file_string
from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize
from openlp.core.utils import AppLocation
@@ -178,7 +178,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
self._addElement(u'body', parent=html_data)
self._addElement(u'h1', cgi.escape(self.titleLineEdit.text()),
html_data.body, classId=u'serviceTitle')
- for index, item in enumerate(self.service_manager.serviceItems):
+ for index, item in enumerate(self.service_manager.service_items):
self._addPreviewItem(html_data.body, item[u'service_item'], index)
# Add the custom service notes:
if self.footerTextEdit.toPlainText():
@@ -428,4 +428,4 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
self._main_window = Registry().get(u'main_window')
return self._main_window
- main_window = property(_get_main_window)
\ No newline at end of file
+ main_window = property(_get_main_window)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index fb4c7e84e..cfa0d4707 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -42,8 +42,8 @@ log = logging.getLogger(__name__)
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, ItemCapabilities, SettingsManager, \
- translate, str_to_bool, check_directory_exists, Settings, PluginStatus, Registry, UiStrings
+from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, ItemCapabilities, Settings, PluginStatus, Registry, \
+ UiStrings, build_icon, translate, str_to_bool, check_directory_exists
from openlp.core.lib.theme import ThemeLevel
from openlp.core.lib.ui import critical_error_message_box, create_widget_action, find_and_set_in_combo_box
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm
@@ -211,18 +211,10 @@ class ServiceManagerDialog(object):
QtCore.QObject.connect(self.service_manager_list, QtCore.SIGNAL(u'itemExpanded(QTreeWidgetItem*)'),
self.expanded)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_list'), self.update_theme_list)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_preview_live'),
- self.preview_live)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_next_item'), self.next_item)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_previous_item'),
- self.previous_item)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_set_item'), self.on_set_item)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_updated'), self.config_updated)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_screen_changed'),
self.regenerate_service_Items)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_global'), self.theme_change)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'service_item_update'),
- self.service_item_update)
# Last little bits of setting up
self.service_theme = Settings().value(self.main_window.serviceManagerSettingsSection + u'/service theme')
self.servicePath = AppLocation.get_section_data_path(u'servicemanager')
@@ -458,7 +450,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
self.service_id += 1
self.set_modified(False)
Settings().setValue(u'servicemanager/last file', u'')
- Receiver.send_message(u'servicemanager_new_service')
+ self.plugin_manager.new_service_created()
def save_file(self):
"""
@@ -486,7 +478,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
missing_list = []
audio_files = []
total_size = 0
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
# Number of items + 1 to zip it
self.main_window.displayProgressBar(len(self.service_items) + 1)
# Get list of missing files, and list of files to write
@@ -502,7 +494,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
else:
write_list.append(path_from)
if missing_list:
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
title = translate('OpenLP.ServiceManager', 'Service File(s) Missing')
message = translate('OpenLP.ServiceManager',
'The following file(s) in the service are missing:\n\t%s\n\n'
@@ -512,7 +504,6 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
if answer == QtGui.QMessageBox.Cancel:
self.main_window.finishedProgressBar()
return False
- Receiver.send_message(u'cursor_busy')
# Check if item contains a missing file.
for item in list(self.service_items):
self.main_window.incrementProgressBar()
@@ -573,7 +564,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
if zip_file:
zip_file.close()
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
if success:
try:
shutil.copy(temp_file_name, path_file_name)
@@ -602,7 +593,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
log.debug(u'ServiceManager.save_file - %s', path_file_name)
Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/last directory', path)
service = []
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
# Number of items + 1 to zip it
self.main_window.displayProgressBar(len(self.service_items) + 1)
for item in self.service_items:
@@ -631,7 +622,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
if zip_file:
zip_file.close()
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
if success:
try:
shutil.copy(temp_file_name, path_file_name)
@@ -670,11 +661,11 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
# SaveAs from osz to oszl is not valid as the files will be deleted
# on exit which is not sensible or usable in the long term.
if self._file_name.endswith(u'oszl') or self.service_has_all_original_files:
- file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path,
+ file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path,
translate('OpenLP.ServiceManager',
'OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)'))
else:
- file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path,
+ file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path,
translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);;'))
if not file_name:
return False
@@ -708,6 +699,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
return False
zip_file = None
file_to = None
+ self.application.set_busy_cursor()
try:
zip_file = zipfile.ZipFile(file_name)
for zip_info in zip_file.infolist():
@@ -728,7 +720,6 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
if osfile.endswith(u'osd'):
p_file = os.path.join(self.servicePath, osfile)
if 'p_file' in locals():
- Receiver.send_message(u'cursor_busy')
file_to = open(p_file, u'r')
items = cPickle.load(file_to)
file_to.close()
@@ -773,6 +764,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
QtGui.QMessageBox.information(self, translate('OpenLP.ServiceManager', 'Corrupt File'),
translate('OpenLP.ServiceManager',
'This file is either corrupt or it is not an OpenLP 2 service file.'))
+ self.application.set_normal_cursor()
return
finally:
if file_to:
@@ -780,7 +772,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
if zip_file:
zip_file.close()
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
self.repaint_service_list(-1, -1)
def load_Last_file(self):
@@ -952,12 +944,20 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
self.add_service_item(self.serviceItemEditForm.get_service_item(),
replace=True, expand=self.service_items[item][u'expanded'])
- def preview_live(self, message):
+ def preview_live(self, unique_identifier, row):
"""
Called by the SlideController to request a preview item be made live
and allows the next preview to be updated if relevant.
+
+
+ ``unique_identifier``
+ Reference to the service_item
+
+
+ ``row``
+ individual row number
+
"""
- unique_identifier, row = message.split(u':')
for sitem in self.service_items:
if sitem[u'service_item'].unique_identifier == unique_identifier:
item = self.service_manager_list.topLevelItem(sitem[u'order'] - 1)
@@ -983,9 +983,13 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
lookFor = 1
serviceIterator += 1
- def previous_item(self, message):
+ def previous_item(self, last_slide=False):
"""
Called by the SlideController to select the previous service item.
+
+ ``last_slide``
+ Is this the last slide in the service_item
+
"""
if not self.service_manager_list.selectedItems():
return
@@ -995,7 +999,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
serviceIterator = QtGui.QTreeWidgetItemIterator(self.service_manager_list)
while serviceIterator.value():
if serviceIterator.value() == selected:
- if message == u'last slide' and prevItemLastSlide:
+ if last_slide and prevItemLastSlide:
pos = prevItem.data(0, QtCore.Qt.UserRole)
check_expanded = self.service_items[pos - 1][u'expanded']
self.service_manager_list.setCurrentItem(prevItemLastSlide)
@@ -1254,7 +1258,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
Rebuild the service list as things have changed and a
repaint is the easiest way to do this.
"""
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
log.debug(u'regenerate_service_Items')
# force reset of renderer as theme data has changed
self.service_has_all_original_files = True
@@ -1286,14 +1290,14 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
self.set_modified()
# Repaint it once only at the end
self.repaint_service_list(-1, -1)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
- def service_item_update(self, message):
+ def service_item_update(self, edit_id, unique_identifier, temporary=False):
"""
Triggered from plugins to update service items.
Save the values as they will be used as part of the service load
"""
- edit_id, self.load_item_unique_identifier, temporary = message.split(u':')
+ self.load_item_unique_identifier = unique_identifier
self.load_item_edit_id = int(edit_id)
self.load_item_temporary = str_to_bool(temporary)
@@ -1361,7 +1365,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
"""
Send the current item to the Preview slide controller
"""
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
item, child = self.find_service_item()
if self.service_items[item][u'service_item'].is_valid:
self.preview_controller.addServiceManagerItem(self.service_items[item][u'service_item'], child)
@@ -1369,7 +1373,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
critical_error_message_box(translate('OpenLP.ServiceManager', 'Missing Display Handler'),
translate('OpenLP.ServiceManager',
'Your item cannot be displayed as there is no handler to display it'))
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def get_service_item(self):
"""
@@ -1402,7 +1406,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
return
if row != -1:
child = row
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
if self.service_items[item][u'service_item'].is_valid:
self.live_controller.addServiceManagerItem(self.service_items[item][u'service_item'], child)
if Settings().value(self.main_window.generalSettingsSection + u'/auto preview'):
@@ -1417,7 +1421,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
critical_error_message_box(translate('OpenLP.ServiceManager', 'Missing Display Handler'),
translate('OpenLP.ServiceManager',
'Your item cannot be displayed as the plugin required to display it is missing or inactive'))
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def remote_edit(self):
"""
@@ -1630,3 +1634,13 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog):
return self._main_window
main_window = property(_get_main_window)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py
index 7d624ab8c..c62349104 100644
--- a/openlp/core/ui/servicenoteform.py
+++ b/openlp/core/ui/servicenoteform.py
@@ -31,7 +31,7 @@ The :mod:`~openlp.core.ui.servicenoteform` module contains the `ServiceNoteForm`
"""
from PyQt4 import QtGui
-from openlp.core.lib import translate, SpellTextEdit, Registry
+from openlp.core.lib import SpellTextEdit, Registry, translate
from openlp.core.lib.ui import create_button_box
@@ -83,4 +83,4 @@ class ServiceNoteForm(QtGui.QDialog):
self._main_window = Registry().get(u'main_window')
return self._main_window
- main_window = property(_get_main_window)
\ No newline at end of file
+ main_window = property(_get_main_window)
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 0543f1087..438898048 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -33,7 +33,7 @@ import logging
from PyQt4 import QtGui
-from openlp.core.lib import Receiver, build_icon, PluginStatus, Registry
+from openlp.core.lib import Receiver, PluginStatus, Registry, build_icon
from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
from openlp.core.ui.media import PlayerTab
from settingsdialog import Ui_SettingsDialog
@@ -165,4 +165,4 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
self._service_manager = Registry().get(u'service_manager')
return self._service_manager
- service_manager = property(_get_service_manager)
\ No newline at end of file
+ service_manager = property(_get_service_manager)
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index ff07c6242..b628156b8 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -33,7 +33,7 @@ import re
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, Settings
+from openlp.core.lib import Registry, Settings
from openlp.core.utils import translate
from openlp.core.utils.actions import ActionList
from shortcutlistdialog import Ui_ShortcutListDialog
@@ -438,7 +438,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
if changing_action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
is_valid = False
if not is_valid:
- Receiver.send_message(u'openlp_warning_message', {
+ self.main_window.warning_message( {
u'title': translate('OpenLP.ShortcutListDialog', 'Duplicate Shortcut'),
u'message': translate('OpenLP.ShortcutListDialog',
'The shortcut "%s" is already assigned to another action, '
@@ -478,3 +478,13 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
button.setChecked(checked)
if enabled is not None:
button.setEnabled(enabled)
+
+ def _get_main_window(self):
+ """
+ Adds the main window to the class dynamically
+ """
+ if not hasattr(self, u'_main_window'):
+ self._main_window = Registry().get(u'main_window')
+ return self._main_window
+
+ main_window = property(_get_main_window)
\ No newline at end of file
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index de50f0ddd..607ae1dd5 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -36,8 +36,8 @@ from collections import deque
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, translate, build_icon, build_html, \
- ServiceItem, ImageSource, SlideLimits, ServiceItemAction, Settings, Registry, UiStrings, ScreenList
+from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, ServiceItem, ImageSource, SlideLimits, \
+ ServiceItemAction, Settings, Registry, UiStrings, ScreenList, build_icon, build_html, translate
from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType
from openlp.core.lib.ui import create_action
from openlp.core.utils.actions import ActionList, CategoryOrder
@@ -230,7 +230,7 @@ class SlideController(DisplayController):
self.playSlidesOnce = create_action(self, u'playSlidesOnce', text=UiStrings().PlaySlidesToEnd,
icon=u':/media/media_time.png', checked=False, shortcuts=[],
category=self.category, triggers=self.onPlaySlidesOnce)
- if Settings().value(self.parent().generalSettingsSection + u'/enable slide loop'):
+ if Settings().value(self.parent().advancedSettingsSection + u'/slide limits') == SlideLimits.Wrap:
self.playSlidesMenu.setDefaultAction(self.playSlidesLoop)
else:
self.playSlidesMenu.setDefaultAction(self.playSlidesOnce)
@@ -518,12 +518,12 @@ class SlideController(DisplayController):
self.keypress_loop = True
keypressCommand = self.keypress_queue.popleft()
if keypressCommand == ServiceItemAction.Previous:
- Receiver.send_message('servicemanager_previous_item')
+ self.service_manager.previous_item()
elif keypressCommand == ServiceItemAction.PreviousLastSlide:
# Go to the last slide of the previous item
- Receiver.send_message('servicemanager_previous_item', u'last slide')
+ self.service_manager.previous_item(last_slide=True)
else:
- Receiver.send_message('servicemanager_next_item')
+ self.service_manager.next_item()
self.keypress_loop = False
def screenSizeChanged(self):
@@ -608,7 +608,7 @@ class SlideController(DisplayController):
elif width < 300 and not self.hideMenu.isVisible():
self.toolbar.setWidgetVisible(self.wideMenu, False)
self.toolbar.setWidgetVisible(self.hideMenuList)
-
+
def onSongBarHandler(self):
"""
Some song handler
@@ -1271,8 +1271,7 @@ class SlideController(DisplayController):
row = self.previewListWidget.currentRow()
if -1 < row < self.previewListWidget.rowCount():
if self.serviceItem.from_service:
- Receiver.send_message('servicemanager_preview_live', u'%s:%s' %
- (self.serviceItem.unique_identifier, row))
+ self.service_manager.preview_live(self.serviceItem.unique_identifier, row)
else:
self.live_controller.addServiceManagerItem(self.serviceItem, row)
diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py
index 39ac8e8d9..c6f259499 100644
--- a/openlp/core/ui/splashscreen.py
+++ b/openlp/core/ui/splashscreen.py
@@ -29,7 +29,6 @@
"""
The splash screen
"""
-from openlp.core.lib import Receiver
from PyQt4 import QtCore, QtGui
@@ -44,7 +43,6 @@ class SplashScreen(QtGui.QSplashScreen):
"""
QtGui.QSplashScreen.__init__(self)
self.setupUi()
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'close_splash'), self.close)
def setupUi(self):
"""
diff --git a/openlp/core/ui/starttimedialog.py b/openlp/core/ui/starttimedialog.py
index e13c86430..7e370abbc 100644
--- a/openlp/core/ui/starttimedialog.py
+++ b/openlp/core/ui/starttimedialog.py
@@ -31,7 +31,7 @@ The UI widgets for the time dialog
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, UiStrings
+from openlp.core.lib import UiStrings, translate
from openlp.core.lib.ui import create_button_box
diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py
index 7c9e694f0..2ab918b6f 100644
--- a/openlp/core/ui/starttimeform.py
+++ b/openlp/core/ui/starttimeform.py
@@ -33,7 +33,7 @@ from PyQt4 import QtGui
from starttimedialog import Ui_StartTimeDialog
-from openlp.core.lib import translate, UiStrings, Registry
+from openlp.core.lib import UiStrings, Registry, translate
from openlp.core.lib.ui import critical_error_message_box
@@ -105,4 +105,4 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
self._main_window = Registry().get(u'main_window')
return self._main_window
- main_window = property(_get_main_window)
\ No newline at end of file
+ main_window = property(_get_main_window)
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index f1a7a3010..a23e08207 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -34,7 +34,7 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, translate, UiStrings, Registry
+from openlp.core.lib import Receiver, UiStrings, Registry, translate
from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import ThemeLayoutForm
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index c0010a268..08746b884 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -38,9 +38,9 @@ import re
from xml.etree.ElementTree import ElementTree, XML
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, get_text_file_string, build_icon, Receiver, SettingsManager, translate, \
- check_item_selected, check_directory_exists, create_thumb, validate_thumb, ImageSource, Settings, Registry, \
- UiStrings
+from openlp.core.lib import ImageSource, OpenLPToolbar, Receiver, Registry, SettingsManager, Settings, UiStrings, \
+ get_text_file_string, build_icon, translate, check_item_selected, check_directory_exists, create_thumb, \
+ validate_thumb
from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, BackgroundGradientType
from openlp.core.lib.ui import critical_error_message_box, create_widget_action
from openlp.core.theme import Theme
@@ -153,13 +153,14 @@ class ThemeManager(QtGui.QWidget):
"""
Import new themes downloaded by the first time wizard
"""
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
files = SettingsManager.get_files(self.settingsSection, u'.otz')
for theme_file in files:
theme_file = os.path.join(self.path, theme_file)
self.unzipTheme(theme_file, self.path)
delete_file(theme_file)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
+
def config_updated(self):
"""
@@ -367,7 +368,7 @@ class ThemeManager(QtGui.QWidget):
path = QtGui.QFileDialog.getExistingDirectory(self,
translate('OpenLP.ThemeManager', 'Save Theme - (%s)') % theme,
Settings().value(self.settingsSection + u'/last directory export'))
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
if path:
Settings().setValue(self.settingsSection + u'/last directory export', path)
theme_path = os.path.join(path, theme + u'.otz')
@@ -391,7 +392,8 @@ class ThemeManager(QtGui.QWidget):
finally:
if theme_zip:
theme_zip.close()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
+
def on_import_theme(self):
"""
@@ -406,12 +408,12 @@ class ThemeManager(QtGui.QWidget):
log.info(u'New Themes %s', unicode(files))
if not files:
return
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
for file_name in files:
Settings().setValue(self.settingsSection + u'/last directory import', unicode(file_name))
self.unzip_theme(file_name, self.path)
self.load_themes()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def load_themes(self, first_time=False):
"""
@@ -848,3 +850,13 @@ class ThemeManager(QtGui.QWidget):
return self._main_window
main_window = property(_get_main_window)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py
index b502d11e0..0cf491e72 100644
--- a/openlp/core/ui/themestab.py
+++ b/openlp/core/ui/themestab.py
@@ -31,7 +31,7 @@ The Themes configuration tab
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings
+from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate
from openlp.core.lib.theme import ThemeLevel
from openlp.core.lib.ui import find_and_set_in_combo_box
diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index 7a434e998..fb23a2ac6 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -31,7 +31,7 @@ The Create/Edit theme wizard
"""
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, build_icon, UiStrings
+from openlp.core.lib import UiStrings, build_icon, translate
from openlp.core.lib.theme import HorizontalType, BackgroundType, BackgroundGradientType
from openlp.core.lib.ui import add_welcome_page, create_valign_selection_widgets
diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py
index c876d887b..744dd8087 100644
--- a/openlp/core/ui/wizard.py
+++ b/openlp/core/ui/wizard.py
@@ -34,7 +34,7 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, Receiver, Settings, translate, UiStrings
+from openlp.core.lib import Receiver, Registry, Settings, UiStrings, build_icon, translate
from openlp.core.lib.ui import add_welcome_page
log = logging.getLogger(__name__)
@@ -219,7 +219,7 @@ class OpenLPWizard(QtGui.QWizard):
self.progressLabel.setText(status_text)
if increment > 0:
self.progressBar.setValue(self.progressBar.value() + increment)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def preWizard(self):
"""
@@ -237,7 +237,7 @@ class OpenLPWizard(QtGui.QWizard):
self.progressBar.setValue(self.progressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def getFileName(self, title, editbox, setting_name, filters=u''):
"""
@@ -286,3 +286,13 @@ class OpenLPWizard(QtGui.QWizard):
if folder:
editbox.setText(folder)
Settings().setValue(self.plugin.settingsSection + u'/' + setting_name, folder)
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 14aa19b30..f1c05e668 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -39,7 +39,7 @@ from subprocess import Popen, PIPE
import sys
import urllib2
-from openlp.core.lib import Settings
+from openlp.core.lib import Registry, Settings
from PyQt4 import QtGui, QtCore
@@ -424,7 +424,7 @@ def get_web_page(url, header=None, update_openlp=False):
if not page:
return None
if update_openlp:
- Receiver.send_message(u'openlp_process_events')
+ Registry().get(u'application').process_events()
log.debug(page)
return page
diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py
index f69bb40c6..00a0d0079 100644
--- a/openlp/core/utils/languagemanager.py
+++ b/openlp/core/utils/languagemanager.py
@@ -36,7 +36,7 @@ import sys
from PyQt4 import QtCore, QtGui
from openlp.core.utils import AppLocation
-from openlp.core.lib import translate, Settings
+from openlp.core.lib import Settings, translate
log = logging.getLogger(__name__)
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 29727b79d..de2c92f7e 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -29,9 +29,9 @@
import logging
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings
+from openlp.core.lib import Plugin, Settings, StringContent, build_icon, translate
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action, UiStrings
from openlp.core.lib.theme import VerticalType
diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py
index 60451f20c..05aff7fd6 100644
--- a/openlp/plugins/alerts/lib/alertstab.py
+++ b/openlp/plugins/alerts/lib/alertstab.py
@@ -29,8 +29,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings
-from openlp.core.ui import AlertLocation
+from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate
from openlp.core.lib.ui import create_valign_selection_widgets
class AlertsTab(SettingsTab):
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 9a584dc63..8fcbaebc1 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -31,8 +31,8 @@ import logging
from PyQt4 import QtGui
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings
-from openlp.core.lib.ui import create_action, UiStrings
+from openlp.core.lib import Plugin, StringContent, build_icon, translate
+from openlp.core.lib.ui import UiStrings, create_action
from openlp.core.utils.actions import ActionList
from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
LanguageSelection
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index 05469eae9..3b1455f68 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -34,7 +34,7 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, translate, Settings, UiStrings
+from openlp.core.lib import Settings, UiStrings, translate
from openlp.core.lib.db import delete_database
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
@@ -578,7 +578,7 @@ class BibleImportForm(OpenLPWizard):
self.progressLabel.setText(translate('BiblesPlugin.ImportWizardForm', 'Registering Bible...'))
else:
self.progressLabel.setText(WizardStrings.StartingImport)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def performWizard(self):
"""
diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py
index 0b2f214f7..f7f16aace 100644
--- a/openlp/plugins/bibles/forms/bibleupgradeform.py
+++ b/openlp/plugins/bibles/forms/bibleupgradeform.py
@@ -36,7 +36,7 @@ from tempfile import gettempdir
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, translate, check_directory_exists, Settings, UiStrings
+from openlp.core.lib import Receiver, Settings, UiStrings, translate, check_directory_exists
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.core.utils import AppLocation, delete_file, get_filesystem_encoding
@@ -335,7 +335,7 @@ class BibleUpgradeForm(OpenLPWizard):
"""
OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Starting upgrade...'))
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def performWizard(self):
"""
@@ -465,7 +465,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.newbibles[number].create_verse(db_book.id,
int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text']))
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.newbibles[number].session.commit()
else:
language_id = self.newbibles[number].get_object(BibleMeta, u'language_id')
@@ -511,7 +511,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.newbibles[number].create_verse(db_book.id,
int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text']))
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.newbibles[number].session.commit()
if not self.success.get(number, True):
self.incrementProgressBar(translate('BiblesPlugin.UpgradeWizardForm',
diff --git a/openlp/plugins/bibles/forms/editbibleform.py b/openlp/plugins/bibles/forms/editbibleform.py
index 26a58d14b..939cd8383 100644
--- a/openlp/plugins/bibles/forms/editbibleform.py
+++ b/openlp/plugins/bibles/forms/editbibleform.py
@@ -32,7 +32,7 @@ import re
from PyQt4 import QtGui
-from openlp.core.lib import Receiver, translate, UiStrings
+from openlp.core.lib import Registry, UiStrings, translate
from openlp.core.lib.ui import critical_error_message_box
from editbibledialog import Ui_EditBibleDialog
from openlp.plugins.bibles.lib import BibleStrings
@@ -122,8 +122,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
if book.name != custom_names[abbr]:
if not self.validateBook(custom_names[abbr], abbr):
return
- Receiver.send_message(u'openlp_process_events')
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.manager.save_meta_data(self.bible, version, copyright, permissions, book_name_language)
if not self.webbible:
for abbr, book in self.books.iteritems():
@@ -132,7 +131,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
book.name = custom_names[abbr]
self.manager.update_book(self.bible, book)
self.bible = None
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
QtGui.QDialog.accept(self)
def validateMeta(self, name, copyright):
@@ -189,3 +188,13 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
% new_book_name)
return False
return True
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py
index 2ba2ff590..219b91f90 100644
--- a/openlp/plugins/bibles/lib/__init__.py
+++ b/openlp/plugins/bibles/lib/__init__.py
@@ -33,7 +33,7 @@ plugin.
import logging
import re
-from openlp.core.lib import translate, Settings
+from openlp.core.lib import Settings, translate
log = logging.getLogger(__name__)
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index 291930a4b..0ac667697 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -31,7 +31,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, SettingsTab, translate, Settings, UiStrings
+from openlp.core.lib import Receiver, SettingsTab, Settings, UiStrings, translate
from openlp.core.lib.ui import find_and_set_in_combo_box
from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, update_reference_separators, \
get_reference_separator, LanguageSelection
diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py
index c09461721..4f491c5cc 100644
--- a/openlp/plugins/bibles/lib/csvbible.py
+++ b/openlp/plugins/bibles/lib/csvbible.py
@@ -62,7 +62,7 @@ import logging
import chardet
import csv
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import translate
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
log = logging.getLogger(__name__)
@@ -118,7 +118,7 @@ class CSVBible(BibleDB):
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
self.create_book(unicode(line[2], details['encoding']), book_ref_id, book_details[u'testament_id'])
book_list[int(line[0])] = unicode(line[2], details['encoding'])
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
except (IOError, IndexError):
log.exception(u'Loading books from file failed')
success = False
@@ -157,7 +157,7 @@ class CSVBible(BibleDB):
verse_text = unicode(line[3], u'cp1252')
self.create_verse(book.id, line[1], line[2], verse_text)
self.wizard.incrementProgressBar(translate('BiblesPlugin.CSVBible', 'Importing verses... done.'))
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.session.commit()
except IOError:
log.exception(u'Loading verses from file failed')
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index 11bdd09e7..7b6c94353 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -34,11 +34,11 @@ import re
import sqlite3
from PyQt4 import QtCore
-from sqlalchemy import Column, ForeignKey, or_, Table, types, func
+from sqlalchemy import Column, ForeignKey, Table, or_, types, func
from sqlalchemy.orm import class_mapper, mapper, relation
from sqlalchemy.orm.exc import UnmappedClassError
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import Receiver, Registry, translate
from openlp.core.lib.db import BaseModel, init_db, Manager
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.utils import AppLocation, clean_filename
@@ -360,7 +360,7 @@ class BibleDB(QtCore.QObject, Manager):
``book``
The name of the book, according to the selected language.
-
+
``language_selection``
The language selection the user has chosen in the settings
section of the Bible.
@@ -549,6 +549,16 @@ class BibleDB(QtCore.QObject, Manager):
verses = self.session.query(Verse).all()
log.debug(verses)
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
+
class BiblesResourcesDB(QtCore.QObject, Manager):
"""
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 327f03565..17791cef3 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -38,7 +38,7 @@ from HTMLParser import HTMLParseError
from BeautifulSoup import BeautifulSoup, NavigableString, Tag
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import Registry, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.utils import get_web_page
from openlp.plugins.bibles.lib import SearchResults
@@ -164,7 +164,7 @@ class BGExtract(object):
if len(verse_parts) > 1:
verse = int(verse_parts[0])
except TypeError:
- log.warn(u'Illegal verse number: %s', unicode(raw_verse_num))
+ log.warn(u'Illegal verse number: %s', unicode(verse))
verses.append((verse, text))
verse_list = {}
for verse, text in verses[::-1]:
@@ -203,8 +203,7 @@ class BGExtract(object):
if clean_verse_num:
verse_text = raw_verse_num.next
part = raw_verse_num.next.next
- while not (isinstance(part, Tag) and
- part.get(u'class') == u'versenum'):
+ while not (isinstance(part, Tag) and part.get(u'class') == u'versenum'):
# While we are still in the same verse grab all the text.
if isinstance(part, NavigableString):
verse_text += part
@@ -235,9 +234,10 @@ class BGExtract(object):
soup = get_soup_for_bible_ref(
u'http://www.biblegateway.com/passage/?%s' % url_params,
pre_parse_regex=r'', pre_parse_substitute='', cleaner=cleaner)
+ self.application.process_events()
if not soup:
return None
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
div = soup.find('div', 'result-text-style-normal')
self._clean_soup(div)
span_list = div.findAll('span', 'text')
@@ -281,7 +281,7 @@ class BGExtract(object):
if not soup:
send_error_message(u'parse')
return None
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
content = soup.find(u'table', u'infotable')
if content:
content = content.findAll(u'tr')
@@ -319,17 +319,15 @@ class BSExtract(object):
``chapter``
Chapter number
"""
- log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
- book_name, chapter)
+ log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter)
url_version = urllib.quote(version.encode("utf-8"))
url_book_name = urllib.quote(book_name.encode("utf-8"))
- chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % \
- (url_version, url_book_name, chapter)
+ chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % (url_version, url_book_name, chapter)
header = (u'Accept-Language', u'en')
soup = get_soup_for_bible_ref(chapter_url, header)
if not soup:
return None
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
content = soup.find(u'div', u'content')
if not content:
log.error(u'No verses found in the Bibleserver response.')
@@ -339,7 +337,7 @@ class BSExtract(object):
verse_number = re.compile(r'v(\d{1,2})(\d{3})(\d{3}) verse.*')
verses = {}
for verse in content:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
versenumber = int(verse_number.sub(r'\3', verse[u'class']))
verses[versenumber] = verse.contents[1].rstrip(u'\n')
return SearchResults(book_name, chapter, verses)
@@ -354,8 +352,7 @@ class BSExtract(object):
"""
log.debug(u'BSExtract.get_books_from_http("%s")', version)
urlversion = urllib.quote(version.encode("utf-8"))
- chapter_url = u'http://m.bibleserver.com/overlay/selectBook?'\
- 'translation=%s' % (urlversion)
+ chapter_url = u'http://m.bibleserver.com/overlay/selectBook?translation=%s' % (urlversion)
soup = get_soup_for_bible_ref(chapter_url)
if not soup:
return None
@@ -365,9 +362,7 @@ class BSExtract(object):
send_error_message(u'parse')
return None
content = content.findAll(u'li')
- return [
- book.contents[0].contents[0] for book in content
- ]
+ return [book.contents[0].contents[0] for book in content]
class CWExtract(object):
@@ -392,17 +387,15 @@ class CWExtract(object):
``chapter``
Chapter number
"""
- log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
- book_name, chapter)
+ log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter)
url_book_name = book_name.replace(u' ', u'-')
url_book_name = url_book_name.lower()
url_book_name = urllib.quote(url_book_name.encode("utf-8"))
- chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \
- (version, url_book_name, chapter)
+ chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % (version, url_book_name, chapter)
soup = get_soup_for_bible_ref(chapter_url)
if not soup:
return None
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
html_verses = soup.findAll(u'span', u'versetext')
if not html_verses:
log.error(u'No verses found in the CrossWalk response.')
@@ -412,27 +405,25 @@ class CWExtract(object):
reduce_spaces = re.compile(r'[ ]{2,}')
fix_punctuation = re.compile(r'[ ]+([.,;])')
for verse in html_verses:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
verse_number = int(verse.contents[0].contents[0])
verse_text = u''
for part in verse.contents:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if isinstance(part, NavigableString):
- verse_text = verse_text + part
+ verse_text += part
elif part and part.attrMap and \
- (part.attrMap[u'class'] == u'WordsOfChrist' or \
- part.attrMap[u'class'] == u'strongs'):
+ (part.attrMap[u'class'] == u'WordsOfChrist' or part.attrMap[u'class'] == u'strongs'):
for subpart in part.contents:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if isinstance(subpart, NavigableString):
- verse_text = verse_text + subpart
- elif subpart and subpart.attrMap and \
- subpart.attrMap[u'class'] == u'strongs':
+ verse_text += subpart
+ elif subpart and subpart.attrMap and subpart.attrMap[u'class'] == u'strongs':
for subsub in subpart.contents:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if isinstance(subsub, NavigableString):
- verse_text = verse_text + subsub
- Receiver.send_message(u'openlp_process_events')
+ verse_text += subsub
+ self.application.process_events()
# Fix up leading and trailing spaces, multiple spaces, and spaces
# between text and , and .
verse_text = verse_text.strip(u'\n\r\t ')
@@ -449,8 +440,7 @@ class CWExtract(object):
The version of the bible like NIV for New International Version
"""
log.debug(u'CWExtract.get_books_from_http("%s")', version)
- chapter_url = u'http://www.biblestudytools.com/%s/'\
- % (version)
+ chapter_url = u'http://www.biblestudytools.com/%s/' % (version)
soup = get_soup_for_bible_ref(chapter_url)
if not soup:
return None
@@ -504,9 +494,7 @@ class HTTPBible(BibleDB):
``True`` on success, ``False`` on failure.
"""
self.wizard.progressBar.setMaximum(68)
- self.wizard.incrementProgressBar(translate(
- 'BiblesPlugin.HTTPBible',
- 'Registering Bible and loading books...'))
+ self.wizard.incrementProgressBar(translate('BiblesPlugin.HTTPBible', 'Registering Bible and loading books...'))
self.save_meta(u'download_source', self.download_source)
self.save_meta(u'download_name', self.download_name)
if self.proxy_server:
@@ -528,19 +516,16 @@ class HTTPBible(BibleDB):
log.exception(u'Importing books from %s - download name: "%s" '\
'failed' % (self.download_source, self.download_name))
return False
- self.wizard.progressBar.setMaximum(len(books)+2)
- self.wizard.incrementProgressBar(translate(
- 'BiblesPlugin.HTTPBible', 'Registering Language...'))
- bible = BiblesResourcesDB.get_webbible(self.download_name,
- self.download_source.lower())
+ self.wizard.progressBar.setMaximum(len(books) + 2)
+ self.wizard.incrementProgressBar(translate( 'BiblesPlugin.HTTPBible', 'Registering Language...'))
+ bible = BiblesResourcesDB.get_webbible(self.download_name, self.download_source.lower())
if bible[u'language_id']:
language_id = bible[u'language_id']
self.save_meta(u'language_id', language_id)
else:
language_id = self.get_language(bible_name)
if not language_id:
- log.exception(u'Importing books from %s " '\
- 'failed' % self.filename)
+ log.exception(u'Importing books from %s failed' % self.filename)
return False
for book in books:
if self.stop_import_flag:
@@ -548,8 +533,7 @@ class HTTPBible(BibleDB):
self.wizard.incrementProgressBar(translate(
'BiblesPlugin.HTTPBible', 'Importing %s...',
'Importing ...') % book)
- book_ref_id = self.get_book_ref_id_by_name(book, len(books),
- language_id)
+ book_ref_id = self.get_book_ref_id_by_name(book, len(books), language_id)
if not book_ref_id:
log.exception(u'Importing books from %s - download name: "%s" '\
'failed' % (self.download_source, self.download_name))
@@ -598,7 +582,7 @@ class HTTPBible(BibleDB):
return []
book = db_book.name
if BibleDB.get_verse_count(self, book_id, reference[1]) == 0:
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
search_results = self.get_chapter(book, reference[1])
if search_results and search_results.has_verselist():
## We have found a book of the bible lets check to see
@@ -606,14 +590,13 @@ class HTTPBible(BibleDB):
## we get a correct book. For example it is possible
## to request ac and get Acts back.
book_name = search_results.book
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
# Check to see if book/chapter exists.
db_book = self.get_book(book_name)
- self.create_chapter(db_book.id, search_results.chapter,
- search_results.verselist)
- Receiver.send_message(u'openlp_process_events')
- Receiver.send_message(u'cursor_normal')
- Receiver.send_message(u'openlp_process_events')
+ self.create_chapter(db_book.id, search_results.chapter, search_results.verselist)
+ self.application.process_events()
+ self.application.set_normal_cursor()
+ self.application.process_events()
return BibleDB.get_verses(self, reference_list, show_error)
def get_chapter(self, book, chapter):
@@ -660,6 +643,16 @@ class HTTPBible(BibleDB):
log.debug(u'HTTPBible.get_verse_count("%s", %s)', book_id, chapter)
return BiblesResourcesDB.get_verse_count(book_id, chapter)
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
+
def get_soup_for_bible_ref(reference_url, header=None, pre_parse_regex=None,
pre_parse_substitute=None, cleaner=None):
"""
@@ -701,7 +694,7 @@ def get_soup_for_bible_ref(reference_url, header=None, pre_parse_regex=None,
if not soup:
send_error_message(u'parse')
return None
- Receiver.send_message(u'openlp_process_events')
+ Registry().get(u'application').process_events()
return soup
def send_error_message(error_type):
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index aaf91d2c0..83428c35b 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -30,7 +30,7 @@
import logging
import os
-from openlp.core.lib import Receiver, SettingsManager, translate, Settings
+from openlp.core.lib import Receiver, SettingsManager, Settings, translate
from openlp.core.utils import AppLocation, delete_file
from openlp.plugins.bibles.lib import parse_reference, get_reference_separator, LanguageSelection
from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index f9a49ebb1..2df57e626 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -31,8 +31,8 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, translate, create_separated_list, \
- ServiceItemContext, Settings, UiStrings
+from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, UiStrings, \
+ create_separated_list, translate
from openlp.core.lib.searchedit import SearchEdit
from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \
critical_error_message_box, find_and_set_in_combo_box, build_icon
@@ -614,7 +614,7 @@ class BibleMediaItem(MediaManagerItem):
"""
log.debug(u'Advanced Search Button clicked')
self.advancedSearchButton.setEnabled(False)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
bible = self.advancedVersionComboBox.currentText()
second_bible = self.advancedSecondComboBox.currentText()
book = self.advancedBookComboBox.currentText()
@@ -628,7 +628,7 @@ class BibleMediaItem(MediaManagerItem):
verse_range = chapter_from + verse_separator + verse_from + range_separator + chapter_to + \
verse_separator + verse_to
versetext = u'%s %s' % (book, verse_range)
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.search_results = self.plugin.manager.get_verses(bible, versetext, book_ref_id)
if second_bible:
self.second_search_results = self.plugin.manager.get_verses(second_bible, versetext, book_ref_id)
@@ -640,8 +640,7 @@ class BibleMediaItem(MediaManagerItem):
self.displayResults(bible, second_bible)
self.advancedSearchButton.setEnabled(True)
self.checkSearchResult()
- Receiver.send_message(u'cursor_normal')
- Receiver.send_message(u'openlp_process_events')
+ self.application.set_normal_cursor()
def onQuickSearchButton(self):
"""
@@ -650,7 +649,7 @@ class BibleMediaItem(MediaManagerItem):
"""
log.debug(u'Quick Search Button clicked')
self.quickSearchButton.setEnabled(False)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
bible = self.quickVersionComboBox.currentText()
second_bible = self.quickSecondComboBox.currentText()
text = self.quickSearchEdit.text()
@@ -662,7 +661,7 @@ class BibleMediaItem(MediaManagerItem):
self.search_results[0].book.book_reference_id)
else:
# We are doing a 'Text Search'.
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
bibles = self.plugin.manager.get_bibles()
self.search_results = self.plugin.manager.verse_search(bible, second_bible, text)
if second_bible and self.search_results:
@@ -697,8 +696,7 @@ class BibleMediaItem(MediaManagerItem):
self.displayResults(bible, second_bible)
self.quickSearchButton.setEnabled(True)
self.checkSearchResult()
- Receiver.send_message(u'cursor_normal')
- Receiver.send_message(u'openlp_process_events')
+ self.application.set_normal_cursor()
def displayResults(self, bible, second_bible=u''):
"""
diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py
index 732fdc23b..5100a732f 100644
--- a/openlp/plugins/bibles/lib/openlp1.py
+++ b/openlp/plugins/bibles/lib/openlp1.py
@@ -31,7 +31,6 @@ import logging
import sqlite
import sys
-from openlp.core.lib import Receiver
from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
@@ -108,7 +107,7 @@ class OpenLP1Bible(BibleDB):
verse_number = int(verse[1])
text = unicode(verse[2], u'cp1252')
self.create_verse(db_book.id, chapter, verse_number, text)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.session.commit()
connection.close()
return True
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 271af883a..5c8d7803c 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -30,7 +30,7 @@
import logging
from lxml import etree, objectify
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
@@ -129,7 +129,7 @@ class OpenSongBible(BibleDB):
self.wizard.incrementProgressBar(translate('BiblesPlugin.Opensong', 'Importing %s %s...',
'Importing ...')) % (db_book.name, chapter_number)
self.session.commit()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
except etree.XMLSyntaxError as inst:
critical_error_message_box(message=translate('BiblesPlugin.OpenSongImport',
'Incorrect Bible file type supplied. OpenSong Bibles may be '
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index 3fddd7a4b..fe095ab02 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -33,7 +33,7 @@ import chardet
import codecs
import re
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import translate
from openlp.core.utils import AppLocation
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
@@ -182,7 +182,7 @@ class OSISBible(BibleDB):
.replace(u'', u'').replace(u'', u'')
verse_text = self.spaces_regex.sub(u' ', verse_text)
self.create_verse(db_book.id, chapter, verse, verse_text)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.session.commit()
if match_count == 0:
success = False
diff --git a/openlp/plugins/bibles/lib/versereferencelist.py b/openlp/plugins/bibles/lib/versereferencelist.py
index 7b936fdc8..1cb76ffff 100644
--- a/openlp/plugins/bibles/lib/versereferencelist.py
+++ b/openlp/plugins/bibles/lib/versereferencelist.py
@@ -72,12 +72,12 @@ class VerseReferenceList(object):
prev = index - 1
if self.verse_list[prev][u'version'] != verse[u'version']:
result = u'%s (%s)' % (result, self.verse_list[prev][u'version'])
- result = result + u', '
+ result += u', '
if self.verse_list[prev][u'book'] != verse[u'book']:
result = u'%s%s %s:' % (result, verse[u'book'], verse[u'chapter'])
elif self.verse_list[prev][u'chapter'] != verse[u'chapter']:
result = u'%s%s:' % (result, verse[u'chapter'])
- result = result + str(verse[u'start'])
+ result += str(verse[u'start'])
if verse[u'start'] != verse[u'end']:
result = u'%s-%s' % (result, verse[u'end'])
if len(self.version_list) > 1:
@@ -89,8 +89,8 @@ class VerseReferenceList(object):
for index, version in enumerate(self.version_list):
if index > 0:
if result[-1] not in [u';', u',', u'.']:
- result = result + u';'
- result = result + u' '
+ result += u';'
+ result += u' '
result = u'%s%s, %s' % (result, version[u'version'], version[u'copyright'])
if version[u'permission'].strip():
result = result + u', ' + version[u'permission']
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 5792e7aae..1972228d2 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -29,7 +29,7 @@
from PyQt4 import QtGui
-from openlp.core.lib import build_icon, translate, UiStrings
+from openlp.core.lib import UiStrings, build_icon, translate
from openlp.core.lib.ui import create_button_box, create_button
class Ui_CustomEditDialog(object):
diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py
index ee47ba52b..972759e7c 100644
--- a/openlp/plugins/custom/forms/editcustomslidedialog.py
+++ b/openlp/plugins/custom/forms/editcustomslidedialog.py
@@ -29,7 +29,7 @@
from PyQt4 import QtGui
-from openlp.core.lib import translate, SpellTextEdit, build_icon, UiStrings
+from openlp.core.lib import SpellTextEdit, UiStrings, translate
from openlp.core.lib.ui import create_button, create_button_box
class Ui_CustomSlideEditDialog(object):
diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py
index 5b0b7f11f..ba57a6fc2 100644
--- a/openlp/plugins/custom/lib/customtab.py
+++ b/openlp/plugins/custom/lib/customtab.py
@@ -33,7 +33,7 @@ for the Custom Slides plugin, which is inserted into the configuration dialog.
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import SettingsTab, translate, Settings
+from openlp.core.lib import SettingsTab, Settings, translate
class CustomTab(SettingsTab):
"""
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index e434f516a..369d3e419 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -32,8 +32,8 @@ import logging
from PyQt4 import QtCore, QtGui
from sqlalchemy.sql import or_, func, and_
-from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, check_item_selected, translate, \
- ServiceItemContext, Settings, PluginStatus, UiStrings
+from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, PluginStatus, \
+ UiStrings, check_item_selected, translate
from openlp.plugins.custom.forms import EditCustomForm
from openlp.plugins.custom.lib import CustomXMLParser, CustomXMLBuilder
from openlp.plugins.custom.lib.db import CustomSlide
@@ -250,7 +250,7 @@ class CustomMediaItem(MediaManagerItem):
and_(CustomSlide.title == item.title, CustomSlide.theme_name == item.theme,
CustomSlide.credits == item.raw_footer[0][len(item.title) + 1:]))
if custom:
- Receiver.send_message(u'service_item_update', u'%s:%s:%s' % (custom.id, item.unique_identifier, False))
+ self.service_manager.service_item_update(custom.id, item.unique_identifier)
else:
if self.add_custom_from_service:
self.create_from_service_item(item)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 0827e645c..0f2829dbc 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
import logging
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Receiver, ImageSource, Settings
+from openlp.core.lib import Plugin, StringContent, Receiver, ImageSource, Settings, build_icon, translate
from openlp.plugins.images.lib import ImageMediaItem, ImageTab
log = logging.getLogger(__name__)
diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py
index 8e3f1c657..ce3e9b957 100644
--- a/openlp/plugins/images/lib/imagetab.py
+++ b/openlp/plugins/images/lib/imagetab.py
@@ -29,7 +29,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings
+from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate
class ImageTab(SettingsTab):
"""
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 85024229a..0ab73aa46 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -32,9 +32,9 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \
- check_item_selected, check_directory_exists, Receiver, create_thumb, validate_thumb, ServiceItemContext, Settings, \
- UiStrings
+from openlp.core.lib import MediaManagerItem, ItemCapabilities, Receiver, SettingsManager, ServiceItemContext, \
+ Settings, UiStrings, build_icon, check_item_selected, check_directory_exists, create_thumb, translate, \
+ validate_thumb
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.utils import AppLocation, delete_file, locale_compare, get_images_filter
@@ -99,7 +99,7 @@ class ImageMediaItem(MediaManagerItem):
if check_item_selected(self.listView, translate('ImagePlugin.MediaItem','You must select an image to delete.')):
row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True)
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.main_window.displayProgressBar(len(row_list))
for row in row_list:
text = self.listView.item(row)
@@ -109,12 +109,12 @@ class ImageMediaItem(MediaManagerItem):
self.main_window.incrementProgressBar()
SettingsManager.setValue(self.settingsSection + u'/images files', self.getFileList())
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
self.listView.blockSignals(False)
def loadList(self, images, initialLoad=False):
+ self.application.set_busy_cursor()
if not initialLoad:
- Receiver.send_message(u'cursor_busy')
self.main_window.displayProgressBar(len(images))
# Sort the images by its filename considering language specific
# characters.
@@ -138,7 +138,7 @@ class ImageMediaItem(MediaManagerItem):
self.main_window.incrementProgressBar()
if not initialLoad:
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def generateSlideData(self, service_item, item=None, xmlVersion=False,
remote=False, context=ServiceItemContext.Service):
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index deca81f77..02d624c1e 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -32,9 +32,8 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \
- check_item_selected, Receiver, MediaType, ServiceItem, ServiceItemContext, Settings, UiStrings, \
- check_directory_exists
+from openlp.core.lib import ItemCapabilities, MediaManagerItem,MediaType, Receiver, ServiceItem, ServiceItemContext, \
+ Settings, UiStrings, build_icon, check_item_selected, check_directory_exists, translate
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.core.ui import DisplayController, Display, DisplayControllerType
from openlp.core.ui.media import get_media_players, set_media_players
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index 87a56f238..69a21d0a4 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -27,11 +27,9 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
-from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings
-from openlp.core.lib.ui import create_button
-from openlp.core.ui.media import get_media_players, set_media_players
+from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate
class MediaQCheckBox(QtGui.QCheckBox):
"""
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 2a1fcf112..bb463b857 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -31,7 +31,7 @@ import logging
from PyQt4 import QtCore
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings, Registry
+from openlp.core.lib import Plugin, Registry, StringContent, Settings, build_icon, translate
from openlp.plugins.media.lib import MediaMediaItem, MediaTab
log = logging.getLogger(__name__)
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index c19653b78..5a8106f7d 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -189,7 +189,7 @@ class ImpressController(PresentationController):
while list.hasMoreElements():
doc = list.nextElement()
if doc.getImplementationName() != u'com.sun.star.comp.framework.BackingComp':
- cnt = cnt + 1
+ cnt += 1
if cnt > 0:
log.debug(u'OpenOffice not terminated as docs are still open')
else:
@@ -399,7 +399,7 @@ class ImpressDocument(PresentationDocument):
i = 1
while not self.control and i < 150:
time.sleep(0.1)
- i = i + 1
+ i += 1
self.control = self.presentation.getController()
else:
self.control.activate()
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index eee1c5801..1875ca66c 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -32,8 +32,8 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, build_icon, SettingsManager, translate, check_item_selected, Receiver, \
- ItemCapabilities, create_thumb, validate_thumb, ServiceItemContext, Settings, UiStrings
+from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, UiStrings, \
+ build_icon, check_item_selected, create_thumb, translate, validate_thumb
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.core.utils import locale_compare
from openlp.plugins.presentations.lib import MessageListener
@@ -150,9 +150,8 @@ class PresentationMediaItem(MediaManagerItem):
"""
currlist = self.getFileList()
titles = [os.path.split(file)[1] for file in currlist]
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
if not initialLoad:
- Receiver.send_message(u'cursor_busy')
self.main_window.displayProgressBar(len(files))
# Sort the presentations by its filename considering language specific characters.
files.sort(cmp=locale_compare,
@@ -206,10 +205,9 @@ class PresentationMediaItem(MediaManagerItem):
item_name.setIcon(icon)
item_name.setToolTip(file)
self.listView.addItem(item_name)
- Receiver.send_message(u'cursor_normal')
if not initialLoad:
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def onDeleteClick(self):
"""
@@ -219,7 +217,7 @@ class PresentationMediaItem(MediaManagerItem):
items = self.listView.selectedIndexes()
row_list = [item.row() for item in items]
row_list.sort(reverse=True)
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.main_window.displayProgressBar(len(row_list))
for item in items:
filepath = unicode(item.data(QtCore.Qt.UserRole))
@@ -229,7 +227,7 @@ class PresentationMediaItem(MediaManagerItem):
doc.close_presentation()
self.main_window.incrementProgressBar()
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_busy_cursor()
for row in row_list:
self.listView.takeItem(row)
Settings().setValue(self.settingsSection + u'/presentations files', self.getFileList())
@@ -271,7 +269,7 @@ class PresentationMediaItem(MediaManagerItem):
if img:
while img:
service_item.add_from_command(path, name, img)
- i = i + 1
+ i += 1
img = doc.get_thumbnail_path(i, True)
doc.close_presentation()
return True
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 3063bfa7b..cde59209a 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -177,7 +177,7 @@ class Controller(object):
if not self.doc.is_active():
return
if self.doc.slidenumber < self.doc.get_slide_count():
- self.doc.slidenumber = self.doc.slidenumber + 1
+ self.doc.slidenumber += 1
self.poll()
return
if not self.activate():
@@ -203,7 +203,7 @@ class Controller(object):
if not self.doc.is_active():
return
if self.doc.slidenumber > 1:
- self.doc.slidenumber = self.doc.slidenumber - 1
+ self.doc.slidenumber -= 1
self.poll()
return
if not self.activate():
diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
index 5ec629840..c8573c807 100644
--- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
+++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
@@ -71,35 +71,35 @@ class PPTViewer(QtGui.QWidget):
row = 0
grid.addWidget(folder_label, 0, 0)
grid.addWidget(self.folderEdit, 0, 1)
- row = row + 1
+ row += 1
grid.addWidget(x_label, row, 0)
grid.addWidget(self.xEdit, row, 1)
grid.addWidget(y_label, row, 2)
grid.addWidget(self.yEdit, row, 3)
- row = row + 1
+ row += 1
grid.addWidget(width_label, row, 0)
grid.addWidget(self.widthEdit, row, 1)
grid.addWidget(height_label, row, 2)
grid.addWidget(self.heightEdit, row, 3)
- row = row + 1
+ row += 1
grid.addWidget(ppt_label, row, 0)
grid.addWidget(self.pptEdit, row, 1)
grid.addWidget(ppt_dlg_btn, row, 2)
grid.addWidget(ppt_btn, row, 3)
- row = row + 1
+ row += 1
grid.addWidget(slide_label, row, 0)
grid.addWidget(self.slideEdit, row, 1)
grid.addWidget(slide_btn, row, 2)
- row = row + 1
+ row += 1
grid.addWidget(prev, row, 0)
grid.addWidget(next, row, 1)
- row = row + 1
+ row += 1
grid.addWidget(blank, row, 0)
grid.addWidget(unblank, row, 1)
- row = row + 1
+ row += 1
grid.addWidget(restart, row, 0)
grid.addWidget(close, row, 1)
- row = row + 1
+ row += 1
grid.addWidget(stop, row, 0)
grid.addWidget(resume, row, 1)
self.connect(ppt_btn, QtCore.SIGNAL(u'clicked()'), self.openClick)
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index 8f468de63..fad88d7cd 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -33,7 +33,7 @@ import shutil
from PyQt4 import QtCore
-from openlp.core.lib import Receiver, Registry, check_directory_exists, create_thumb, validate_thumb, Settings
+from openlp.core.lib import Receiver, Registry, Settings, check_directory_exists, create_thumb, validate_thumb
from openlp.core.utils import AppLocation
log = logging.getLogger(__name__)
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index c72676860..15b3b2590 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -27,9 +27,9 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
-from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings
+from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate
class PresentationTab(SettingsTab):
"""
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index af12cc9c4..d444fc1c4 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -138,7 +138,9 @@ class HttpResponse(object):
'Content-Type': 'text/html; charset="utf-8"\r\n'
}
- def __init__(self, content='', headers={}, code=None):
+ def __init__(self, content='', headers=None, code=None):
+ if headers is None:
+ headers = {}
self.content = content
for key, value in headers.iteritems():
self.headers[key] = value
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index 1d28355c4..2e42a2b1e 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -29,7 +29,7 @@
from PyQt4 import QtCore, QtGui, QtNetwork
-from openlp.core.lib import Settings, SettingsTab, translate, Receiver
+from openlp.core.lib import Settings, SettingsTab, Receiver, translate
ZERO_URL = u'0.0.0.0'
@@ -133,7 +133,7 @@ class RemoteTab(SettingsTab):
ipAddress = self.addressEdit.text()
url = u'http://%s:%s/' % (ipAddress, self.portSpinBox.value())
self.remoteUrl.setText(u'%s' % (url, url))
- url = url + u'stage'
+ url += u'stage'
self.stageUrl.setText(u'%s' % (url, url))
def load(self):
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 3f6e1e61a..76f190931 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -29,7 +29,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, translate, UiStrings
+from openlp.core.lib import UiStrings, build_icon, translate
from openlp.core.lib.ui import create_button_box, create_button
from openlp.plugins.songs.lib.ui import SongStrings
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 0c0e5c196..46ea0029c 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -38,9 +38,9 @@ import shutil
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import PluginStatus, Receiver, MediaType, translate, create_separated_list, \
- check_directory_exists, Registry, UiStrings
-from openlp.core.lib.ui import UiStrings, set_case_insensitive_completer, critical_error_message_box, \
+from openlp.core.lib import PluginStatus, Receiver, MediaType, Registry, UiStrings, translate, create_separated_list, \
+ check_directory_exists
+from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, \
find_and_set_in_combo_box
from openlp.core.utils import AppLocation
from openlp.plugins.songs.forms import EditVerseForm, MediaFilesForm
@@ -184,7 +184,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
Load the media files into a combobox.
"""
self.audioAddFromMediaButton.setVisible(False)
- for plugin in self.parent().pluginManager.plugins:
+ for plugin in self.plugin_manager.plugins:
if plugin.name == u'media' and plugin.status == PluginStatus.Active:
self.audioAddFromMediaButton.setVisible(True)
self.mediaForm.populateFiles(plugin.mediaItem.getList(MediaType.Audio))
@@ -907,6 +907,16 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
except:
log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml())
+ def _get_plugin_manager(self):
+ """
+ Adds the plugin manager to the class dynamically
+ """
+ if not hasattr(self, u'_plugin_manager'):
+ self._plugin_manager = Registry().get(u'plugin_manager')
+ return self._plugin_manager
+
+ plugin_manager = property(_get_plugin_manager)
+
def _get_theme_manager(self):
"""
Adds the theme manager to the class dynamically
@@ -915,4 +925,5 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self._theme_manager = Registry().get(u'theme_manager')
return self._theme_manager
- theme_manager = property(_get_theme_manager)
\ No newline at end of file
+ theme_manager = property(_get_theme_manager)
+
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index 603af2180..e97a898f7 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -29,8 +29,8 @@
from PyQt4 import QtGui
-from openlp.core.lib import build_icon, translate, SpellTextEdit
-from openlp.core.lib.ui import create_button_box, UiStrings
+from openlp.core.lib import SpellTextEdit, build_icon, translate
+from openlp.core.lib.ui import UiStrings, create_button_box
from openlp.plugins.songs.lib import VerseType
class Ui_EditVerseDialog(object):
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index d39f84de2..6e5c0127e 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -32,8 +32,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib.ui import critical_error_message_box
-from openlp.plugins.songs.lib import VerseType, translate
+from openlp.plugins.songs.lib import VerseType
from editversedialog import Ui_EditVerseDialog
diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py
index 29d4b8609..f4773b3da 100644
--- a/openlp/plugins/songs/forms/songexportform.py
+++ b/openlp/plugins/songs/forms/songexportform.py
@@ -34,7 +34,7 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, Receiver, translate, create_separated_list, UiStrings
+from openlp.core.lib import Receiver, UiStrings, create_separated_list, build_icon, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.plugins.songs.lib import natcmp
@@ -226,7 +226,7 @@ class SongExportForm(OpenLPWizard):
self.directoryLineEdit.clear()
self.searchLineEdit.clear()
# Load the list of songs.
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
songs = self.plugin.manager.get_all_objects(Song)
songs.sort(cmp=natcmp, key=lambda song: song.sort_key)
for song in songs:
@@ -240,7 +240,7 @@ class SongExportForm(OpenLPWizard):
item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsUserCheckable | QtCore.Qt.ItemIsEnabled)
item.setCheckState(QtCore.Qt.Unchecked)
self.availableListWidget.addItem(item)
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def preWizard(self):
"""
@@ -248,7 +248,7 @@ class SongExportForm(OpenLPWizard):
"""
OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate('SongsPlugin.ExportWizardForm', 'Starting export...'))
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def performWizard(self):
"""
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 0e014ba96..b635b309b 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -35,7 +35,7 @@ import os
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Receiver, Settings, UiStrings, translate
+from openlp.core.lib import Settings, UiStrings, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.plugins.songs.lib.importer import SongFormat, SongFormatSelect
@@ -339,7 +339,7 @@ class SongImportForm(OpenLPWizard):
"""
OpenLPWizard.preWizard(self)
self.progressLabel.setText(WizardStrings.StartingImport)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
def performWizard(self):
"""
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index 389579284..2f7ad7915 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -29,7 +29,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, UiStrings
+from openlp.core.lib import UiStrings, build_icon
from openlp.core.lib.ui import create_button_box
from openlp.plugins.songs.lib.ui import SongStrings
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 0c823571b..546791778 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -31,7 +31,7 @@ import logging
from PyQt4 import QtGui, QtCore
from sqlalchemy.sql import and_
-from openlp.core.lib import Receiver, translate, UiStrings
+from openlp.core.lib import Receiver, UiStrings, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.songs.forms import AuthorsForm, TopicsForm, SongBookForm
from openlp.plugins.songs.lib.db import Author, Book, Topic, Song
@@ -374,12 +374,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
"""
Utility method to merge two objects to leave one in the database.
"""
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
merge(dbObject)
reset()
if not self.fromSongEdit:
Receiver.send_message(u'songs_load_list')
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
def mergeAuthors(self, oldAuthor):
"""
@@ -509,3 +509,12 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
deleteButton.setEnabled(True)
editButton.setEnabled(True)
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 39ecb0ae2..c7c24533b 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -571,6 +571,8 @@ def strip_rtf(text, default_encoding=None):
while True:
try:
encoding, default_encoding = get_encoding(font, font_table, default_encoding, failed=failed)
+ if not encoding:
+ return None
out.append(chr(charcode).decode(encoding))
except UnicodeDecodeError:
failed = True
diff --git a/openlp/plugins/songs/lib/easyslidesimport.py b/openlp/plugins/songs/lib/easyslidesimport.py
index 207628b9f..7f9143b70 100644
--- a/openlp/plugins/songs/lib/easyslidesimport.py
+++ b/openlp/plugins/songs/lib/easyslidesimport.py
@@ -162,7 +162,7 @@ class EasySlidesImport(SongImport):
region = self._extractRegion(line)
regionlines[region] = 1 + regionlines.get(region, 0)
elif line[0] == u'[':
- separatorlines = separatorlines + 1
+ separatorlines += 1
# if the song has separators
separators = (separatorlines > 0)
# the number of different regions in song - 1
@@ -200,7 +200,7 @@ class EasySlidesImport(SongImport):
# separators are used, so empty line means slide break
# inside verse
if self._listHas(verses, [reg, vt, vn, inst]):
- inst = inst + 1
+ inst += 1
else:
# separators are not used, so empty line starts a new verse
vt = u'V'
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 3289c0e7f..86fba0562 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -174,7 +174,10 @@ class EasyWorshipSongImport(SongImport):
self.addAuthor(author_name.strip())
if words:
# Format the lyrics
- words, self.encoding = strip_rtf(words, self.encoding)
+ result = strip_rtf(words, self.encoding)
+ if result is None:
+ return
+ words, self.encoding = result
verse_type = VerseType.Tags[VerseType.Verse]
for verse in SLIDE_BREAK_REGEX.split(words):
verse = verse.strip()
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index de1ad22ff..6c38c84da 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -35,8 +35,8 @@ import shutil
from PyQt4 import QtCore, QtGui
from sqlalchemy.sql import or_
-from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, translate, check_item_selected, \
- PluginStatus, create_separated_list, check_directory_exists, ServiceItemContext, Settings, UiStrings
+from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, PluginStatus, ServiceItemContext, Settings, \
+ UiStrings, translate, check_item_selected, create_separated_list, check_directory_exists
from openlp.core.lib.ui import create_widget_action
from openlp.core.utils import AppLocation
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, SongImportForm, SongExportForm
@@ -361,7 +361,7 @@ class SongMediaItem(MediaManagerItem):
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
QtGui.QMessageBox.Yes) == QtGui.QMessageBox.No:
return
- Receiver.send_message(u'cursor_busy')
+ self.application.set_busy_cursor()
self.main_window.displayProgressBar(len(items))
for item in items:
item_id = item.data(QtCore.Qt.UserRole)
@@ -380,7 +380,7 @@ class SongMediaItem(MediaManagerItem):
self.plugin.manager.delete_object(Song, item_id)
self.main_window.incrementProgressBar()
self.main_window.finishedProgressBar()
- Receiver.send_message(u'cursor_normal')
+ self.application.set_normal_cursor()
self.onSearchTextButtonClicked()
def onCloneClick(self):
@@ -526,7 +526,7 @@ class SongMediaItem(MediaManagerItem):
temporary = True
# Update service with correct song id.
if editId:
- Receiver.send_message(u'service_item_update%s:%s:%s' % (editId, item.unique_identifier, temporary))
+ self.service_manager.service_item_update(editId, item.unique_identifier, temporary)
def search(self, string, showError):
"""
diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py
index 7db466dfc..b1698418a 100644
--- a/openlp/plugins/songs/lib/openlyricsexport.py
+++ b/openlp/plugins/songs/lib/openlyricsexport.py
@@ -35,7 +35,7 @@ import os
from lxml import etree
-from openlp.core.lib import check_directory_exists, Receiver, translate
+from openlp.core.lib import Registry, check_directory_exists, translate
from openlp.core.utils import clean_filename
from openlp.plugins.songs.lib import OpenLyrics
@@ -64,7 +64,7 @@ class OpenLyricsExport(object):
openLyrics = OpenLyrics(self.manager)
self.parent.progressBar.setMaximum(len(self.songs))
for song in self.songs:
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
if self.parent.stop_export_flag:
return False
self.parent.incrementProgressBar(translate('SongsPlugin.OpenLyricsExport', 'Exporting "%s"...') %
@@ -80,3 +80,13 @@ class OpenLyricsExport(object):
tree.write(open(os.path.join(self.save_path, filename), u'w'),
encoding=u'utf-8', xml_declaration=True, pretty_print=True)
return True
+
+ def _get_application(self):
+ """
+ Adds the openlp to the class dynamically
+ """
+ if not hasattr(self, u'_application'):
+ self._application = Registry().get(u'application')
+ return self._application
+
+ application = property(_get_application)
diff --git a/openlp/plugins/songs/lib/songproimport.py b/openlp/plugins/songs/lib/songproimport.py
index 7556454d8..0e6b5ee97 100644
--- a/openlp/plugins/songs/lib/songproimport.py
+++ b/openlp/plugins/songs/lib/songproimport.py
@@ -107,7 +107,10 @@ class SongProImport(SongImport):
self.finish()
return
if u'rtf1' in text:
- text, self.encoding = strip_rtf(text, self.encoding)
+ result = strip_rtf(text, self.encoding)
+ if result is None:
+ return
+ text, self.encoding = result
text = text.rstrip()
if not text:
return
diff --git a/openlp/plugins/songs/lib/songshowplusimport.py b/openlp/plugins/songs/lib/songshowplusimport.py
index ae7e403f7..8677c82c2 100644
--- a/openlp/plugins/songs/lib/songshowplusimport.py
+++ b/openlp/plugins/songs/lib/songshowplusimport.py
@@ -203,7 +203,7 @@ class SongShowPlusImport(SongImport):
if verse_name not in self.otherList:
if ignore_unique:
return None
- self.otherCount = self.otherCount + 1
+ self.otherCount += 1
self.otherList[verse_name] = str(self.otherCount)
verse_tag = VerseType.Tags[VerseType.Other]
verse_number = self.otherList[verse_name]
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index 14bac8526..5ac69e991 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -121,7 +121,7 @@ class SundayPlusImport(SongImport):
end = data.find(')', i) + 1
value = data[i:end]
# If we are in the main group.
- if cell == False:
+ if not cell:
if name == 'title':
self.title = self.decode(self.unescape(value))
elif name == 'Author':
@@ -148,7 +148,10 @@ class SundayPlusImport(SongImport):
verse_type = HOTKEY_TO_VERSE_TYPE[value]
if name == 'rtf':
value = self.unescape(value)
- verse, self.encoding = strip_rtf(value, self.encoding)
+ result = strip_rtf(value, self.encoding)
+ if result is None:
+ return
+ verse, self.encoding = result
lines = verse.strip().split('\n')
# If any line inside any verse contains CCLI or
# only Public Domain, we treat this as special data:
diff --git a/openlp/plugins/songs/lib/test/test_import_file.py b/openlp/plugins/songs/lib/test/test_import_file.py
index 231ca1a21..06d1af38f 100644
--- a/openlp/plugins/songs/lib/test/test_import_file.py
+++ b/openlp/plugins/songs/lib/test/test_import_file.py
@@ -36,7 +36,7 @@ import logging
LOG_FILENAME = 'test_import_file.log'
logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
-from test_opensongimport import wizard_stub, progbar_stub
+from test_opensongimport import wizard_stub
def test(filenames):
manager = Manager(u'songs', init_schema)
diff --git a/openlp/plugins/songs/lib/test/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py
index b0e0b34dc..f6bac243b 100644
--- a/openlp/plugins/songs/lib/test/test_importing_lots.py
+++ b/openlp/plugins/songs/lib/test/test_importing_lots.py
@@ -30,18 +30,14 @@
from openlp.plugins.songs.lib.opensongimport import OpenSongImport
from openlp.plugins.songs.lib.db import init_schema
from openlp.core.lib.db import Manager
-from glob import glob
-from zipfile import ZipFile
import os
-from traceback import print_exc
-import sys
import codecs
import logging
LOG_FILENAME = 'import.log'
logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
-from test_opensongimport import wizard_stub, progbar_stub
+from test_opensongimport import wizard_stub
# Useful test function for importing a variety of different files
# Uncomment below depending on what problem trying to make occur!
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 859bef075..22a4d803f 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -69,7 +69,7 @@ import re
from lxml import etree, objectify
from openlp.core.lib import FormattingTags, translate
-from openlp.plugins.songs.lib import clean_song, VerseType
+from openlp.plugins.songs.lib import VerseType, clean_song
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
from openlp.core.utils import get_application_version
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 5285efafc..74a5ce216 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -38,7 +38,7 @@ import sqlite3
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Receiver, UiStrings
+from openlp.core.lib import Plugin, StringContent, UiStrings, build_icon, translate
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.core.utils import get_filesystem_encoding
@@ -96,9 +96,6 @@ class SongsPlugin(Plugin):
action_list.add_action(self.songImportItem, UiStrings().Import)
action_list.add_action(self.songExportItem, UiStrings().Export)
action_list.add_action(self.toolsReindexItem, UiStrings().Tools)
- QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_new_service'),
- self.clearTemporarySongs)
-
def addImportMenuItem(self, import_menu):
"""
@@ -244,9 +241,9 @@ class SongsPlugin(Plugin):
If the first time wizard has run, this function is run to import all the
new songs into the database.
"""
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
self.onToolsReindexItemTriggered()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
db_dir = unicode(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
if not os.path.exists(db_dir):
return
@@ -254,12 +251,12 @@ class SongsPlugin(Plugin):
song_count = 0
for sfile in os.listdir(db_dir):
if sfile.startswith(u'songs_') and sfile.endswith(u'.sqlite'):
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
song_dbs.append(os.path.join(db_dir, sfile))
song_count += self._countSongs(os.path.join(db_dir, sfile))
if not song_dbs:
return
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
progress = QtGui.QProgressDialog(self.main_window)
progress.setWindowModality(QtCore.Qt.WindowModal)
progress.setWindowTitle(translate('OpenLP.Ui', 'Importing Songs'))
@@ -268,11 +265,11 @@ class SongsPlugin(Plugin):
progress.setRange(0, song_count)
progress.setMinimumDuration(0)
progress.forceShow()
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
for db in song_dbs:
importer = OpenLPSongImport(self.manager, filename=db)
importer.doImport(progress)
- Receiver.send_message(u'openlp_process_events')
+ self.application.process_events()
progress.setValue(song_count)
self.mediaItem.onSearchTextButtonClicked()
@@ -281,7 +278,7 @@ class SongsPlugin(Plugin):
Time to tidy up on exit
"""
log.info(u'Songs Finalising')
- self.clearTemporarySongs()
+ self.new_service_created()
# Clean up files and connections
self.manager.finalise()
self.songImportItem.setVisible(False)
@@ -293,13 +290,18 @@ class SongsPlugin(Plugin):
action_list.remove_action(self.toolsReindexItem, UiStrings().Tools)
Plugin.finalise(self)
- def clearTemporarySongs(self):
- # Remove temporary songs
+ def new_service_created(self):
+ """
+ Remove temporary songs from the database
+ """
songs = self.manager.get_all_objects(Song, Song.temporary == True)
for song in songs:
self.manager.delete_object(Song, song.id)
def _countSongs(self, db_file):
+ """
+ Provide a count of the songs in the database
+ """
connection = sqlite3.connect(db_file)
cursor = connection.cursor()
cursor.execute(u'SELECT COUNT(id) AS song_count FROM songs')
diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py
index 8174060bd..b13be8ad2 100644
--- a/openlp/plugins/songusage/forms/songusagedeleteform.py
+++ b/openlp/plugins/songusage/forms/songusagedeleteform.py
@@ -29,7 +29,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, Receiver
+from openlp.core.lib import Receiver, translate
from openlp.plugins.songusage.lib.db import SongUsageItem
from songusagedeletedialog import Ui_SongUsageDeleteDialog
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 398997715..3b3611f0e 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -32,7 +32,7 @@ from datetime import datetime
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import build_icon, Plugin, Receiver, Settings, StringContent, translate
+from openlp.core.lib import Plugin, Receiver, Settings, StringContent, build_icon, translate
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.core.utils.actions import ActionList
diff --git a/scripts/openlp-remoteclient.py b/scripts/openlp-remoteclient.py
deleted file mode 100644
index d29ddd501..000000000
--- a/scripts/openlp-remoteclient.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2013 Raoul Snyman #
-# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
-# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
-# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
-# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
-# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
-# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
-# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU General Public License as published by the Free #
-# Software Foundation; version 2 of the License. #
-# #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
-# more details. #
-# #
-# You should have received a copy of the GNU General Public License along #
-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-###############################################################################
-
-import urllib
-import sys
-from optparse import OptionParser
-
-def sendData(options):
- addr = 'http://%s:%s/send/%s?q=%s' % (options.address, options.port,
- options.event, options.message)
- try:
- urllib.urlopen(addr)
- print u'Message sent ', addr
- except:
- print u'Error thrown ', sys.exc_info()[1]
-
-def main():
- usage = "usage: %prog [-a address] [-p port] [-e event] [-m message]"
- parser = OptionParser(usage=usage)
- parser.add_option("-p", "--port", default=4316,
- help="IP Port number %default ")
- parser.add_option("-a", "--address",
- help="Recipient address ",
- default="localhost")
- parser.add_option("-e", "--event",
- help="Action to be performed",
- default="alerts_text")
- parser.add_option("-m", "--message",
- help="Message to be passed for the action",
- default="")
-
- (options, args) = parser.parse_args()
- if args:
- parser.print_help()
- parser.error("incorrect number of arguments")
- elif options.address is None:
- parser.print_help()
- parser.error("IP address missing")
- else:
- sendData(options)
-
-if __name__ == u'__main__':
- main()
diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py
index dc1d47189..40000946d 100755
--- a/scripts/translation_utils.py
+++ b/scripts/translation_utils.py
@@ -53,8 +53,6 @@ This is done easily via the ``-d``, ``-p`` and ``-u`` options::
"""
import os
import urllib2
-import re
-from shutil import copy
from getpass import getpass
import base64
import json
@@ -62,7 +60,6 @@ import webbrowser
from optparse import OptionParser
from PyQt4 import QtCore
-from BeautifulSoup import BeautifulSoup
SERVER_URL = u'http://www.transifex.net/api/2/project/openlp/'
IGNORED_PATHS = [u'scripts']
@@ -162,7 +159,7 @@ def print_verbose(text):
"""
global verbose_mode, quiet_mode
if not quiet_mode and verbose_mode:
- print u' %s' % text
+ print(u' %s' % text)
def run(command):
"""
@@ -269,8 +266,7 @@ def prepare_project():
def update_translations():
print_quiet(u'Update the translation files')
if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')):
- print u'You have not generated a project file yet, please run this ' + \
- u'script with the -p option.'
+ print(u'You have not generated a project file yet, please run this script with the -p option.')
return
else:
os.chdir(os.path.abspath(u'..'))
@@ -280,10 +276,8 @@ def update_translations():
def generate_binaries():
print_quiet(u'Generate the related *.qm files')
if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')):
- print u'You have not generated a project file yet, please run this ' + \
- u'script with the -p option. It is also recommended that you ' + \
- u'this script with the -u option to update the translation ' + \
- u'files as well.'
+ print(u'You have not generated a project file yet, please run this script with the -p option. It is also ' +
+ u'recommended that you this script with the -u option to update the translation files as well.')
return
else:
os.chdir(os.path.abspath(u'..'))
@@ -383,6 +377,6 @@ def main():
if __name__ == u'__main__':
if os.path.split(os.path.abspath(u'.'))[1] != u'scripts':
- print u'You need to run this script from the scripts directory.'
+ print(u'You need to run this script from the scripts directory.')
else:
main()
diff --git a/setup.py b/setup.py
index b99feaaa7..a96259380 100755
--- a/setup.py
+++ b/setup.py
@@ -152,7 +152,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
url='http://openlp.org/',
license='GNU General Public License',
packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
- scripts=['openlp.pyw'],
+ scripts=['openlp.py'],
include_package_data=True,
zip_safe=False,
install_requires=[
diff --git a/tests/interfaces/openlp_core_ui/test_starttimedialog.py b/tests/interfaces/openlp_core_ui/test_starttimedialog.py
index 918c6637c..990f753ba 100644
--- a/tests/interfaces/openlp_core_ui/test_starttimedialog.py
+++ b/tests/interfaces/openlp_core_ui/test_starttimedialog.py
@@ -1,7 +1,6 @@
"""
Package to test the openlp.core.ui package.
"""
-import sys
from unittest import TestCase
from mock import MagicMock, patch