Andreas Preikschat has proposed merging lp:~googol/openlp/trivial into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~googol/openlp/trivial/+merge/104831 Hello, - random clean ups -- https://code.launchpad.net/~googol/openlp/trivial/+merge/104831 Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/lib/dockwidget.py' --- openlp/core/lib/dockwidget.py 2011-12-27 10:33:55 +0000 +++ openlp/core/lib/dockwidget.py 2012-05-05 12:30:25 +0000 @@ -53,8 +53,7 @@ self.setWindowIcon(build_icon(icon)) # Sort out the minimum width. screens = ScreenList.get_instance() - screen_width = screens.current[u'size'].width() - mainwindow_docbars = screen_width / 5 + mainwindow_docbars = screens.current[u'size'].width() / 5 if mainwindow_docbars > 300: self.setMinimumWidth(300) else: === modified file 'openlp/core/lib/renderer.py' --- openlp/core/lib/renderer.py 2012-05-02 18:25:37 +0000 +++ openlp/core/lib/renderer.py 2012-05-05 12:30:25 +0000 @@ -125,7 +125,7 @@ Set the appropriate theme depending on the theme level. Called by the service item when building a display frame - ``theme`` + ``override_theme`` The name of the song-level theme. None means the service item wants to use the given value. === modified file 'openlp/core/lib/serviceitem.py' --- openlp/core/lib/serviceitem.py 2012-05-02 18:25:37 +0000 +++ openlp/core/lib/serviceitem.py 2012-05-05 12:30:25 +0000 @@ -313,17 +313,12 @@ self.from_plugin = header[u'from_plugin'] self.capabilities = header[u'capabilities'] # Added later so may not be present in older services. - if u'search' in header: - self.search_string = header[u'search'] - self.data_string = header[u'data'] - if u'xml_version' in header: - self.xml_version = header[u'xml_version'] - if u'start_time' in header: - self.start_time = header[u'start_time'] - if u'end_time' in header: - self.end_time = header[u'end_time'] - if u'media_length' in header: - self.media_length = header[u'media_length'] + self.search_string = header.get(u'search', u'') + self.data_string = header.get(u'data', u'') + self.xml_version = header.get(u'xml_version') + self.start_time = header.get(u'start_time', 0) + self.end_time = header.get(u'end_time', 0) + self.media_length = header.get(u'media_length', 0) if u'background_audio' in header: self.background_audio = [] for filename in header[u'background_audio']: === modified file 'openlp/core/ui/servicemanager.py' --- openlp/core/ui/servicemanager.py 2012-04-29 15:31:56 +0000 +++ openlp/core/ui/servicemanager.py 2012-05-05 12:30:25 +0000 @@ -51,7 +51,7 @@ """ Set up key bindings and mouse behaviour for the service list """ - def __init__(self, serviceManager, parent=None, name=None): + def __init__(self, serviceManager, parent=None): QtGui.QTreeWidget.__init__(self, parent) self.serviceManager = serviceManager @@ -101,7 +101,6 @@ QtGui.QWidget.__init__(self, parent) self.mainwindow = mainwindow self.serviceItems = [] - self.serviceName = u'' self.suffixes = [] self.dropPosition = 0 self.expandTabs = False
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp