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

clean ups

This commit is contained in:
Andreas Preikschat 2012-05-05 14:24:25 +02:00
parent ccc5c20984
commit baf1c792e5
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/dockwidget.py
View File

@ -53,8 +53,7 @@ class OpenLPDockWidget(QtGui.QDockWidget):
self.setWindowIcon(build_icon(icon)) self.setWindowIcon(build_icon(icon))
# Sort out the minimum width. # Sort out the minimum width.
screens = ScreenList.get_instance() screens = ScreenList.get_instance()
screen_width = screens.current[u'size'].width() mainwindow_docbars = screens.current[u'size'].width() / 5
mainwindow_docbars = screen_width / 5
if mainwindow_docbars > 300: if mainwindow_docbars > 300:
self.setMinimumWidth(300) self.setMinimumWidth(300)
else: else:

2
openlp/core/lib/renderer.py
View File

@ -125,7 +125,7 @@ class Renderer(object):
Set the appropriate theme depending on the theme level. Set the appropriate theme depending on the theme level.
Called by the service item when building a display frame Called by the service item when building a display frame
``theme`` ``override_theme``
The name of the song-level theme. None means the service The name of the song-level theme. None means the service
item wants to use the given value. item wants to use the given value.

17
openlp/core/lib/serviceitem.py
View File

@ -313,17 +313,12 @@ class ServiceItem(object):
self.from_plugin = header[u'from_plugin'] self.from_plugin = header[u'from_plugin']
self.capabilities = header[u'capabilities'] self.capabilities = header[u'capabilities']
# Added later so may not be present in older services. # Added later so may not be present in older services.
if u'search' in header: self.search_string = header.get(u'search', u'')
self.search_string = header[u'search'] self.data_string = header.get(u'data', u'')
self.data_string = header[u'data'] self.xml_version = header.get(u'xml_version')
if u'xml_version' in header: self.start_time = header.get(u'start_time', 0)
self.xml_version = header[u'xml_version'] self.end_time = header.get(u'end_time', 0)
if u'start_time' in header: self.media_length = header.get(u'media_length', 0)
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']
if u'background_audio' in header: if u'background_audio' in header:
self.background_audio = [] self.background_audio = []
for filename in header[u'background_audio']: for filename in header[u'background_audio']:

3
openlp/core/ui/servicemanager.py
View File

@ -51,7 +51,7 @@ class ServiceManagerList(QtGui.QTreeWidget):
""" """
Set up key bindings and mouse behaviour for the service list 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) QtGui.QTreeWidget.__init__(self, parent)
self.serviceManager = serviceManager self.serviceManager = serviceManager
@ -101,7 +101,6 @@ class ServiceManager(QtGui.QWidget):
QtGui.QWidget.__init__(self, parent) QtGui.QWidget.__init__(self, parent)
self.mainwindow = mainwindow self.mainwindow = mainwindow
self.serviceItems = [] self.serviceItems = []
self.serviceName = u''
self.suffixes = [] self.suffixes = []
self.dropPosition = 0 self.dropPosition = 0
self.expandTabs = False self.expandTabs = False