mirror of https://gitlab.com/openlp/openlp.git
do not override build-ins, clean ups
This commit is contained in:
parent
ceeaa0c359
commit
7adb4bbdb5
|
@ -102,11 +102,9 @@ class OpenLP(QtGui.QApplication):
|
||||||
Run the OpenLP application.
|
Run the OpenLP application.
|
||||||
"""
|
"""
|
||||||
self.is_event_loop_active = False
|
self.is_event_loop_active = False
|
||||||
# On Windows, the args passed into the constructor are ignored. Not
|
# On Windows, the args passed into the constructor are ignored. Not very handy, so set the ones we want to use.
|
||||||
# very handy, so set the ones we want to use. On Linux and FreeBSD, in
|
# On Linux and FreeBSD, in order to set the WM_CLASS property for X11, we pass "OpenLP" in as a command line
|
||||||
# order to set the WM_CLASS property for X11, we pass "OpenLP" in as a
|
# argument. This interferes with files being passed in as command line arguments, so we remove it from the list.
|
||||||
# command line argument. This interferes with files being passed in as
|
|
||||||
# command line arguments, so we remove it from the list.
|
|
||||||
if 'OpenLP' in args:
|
if 'OpenLP' in args:
|
||||||
args.remove('OpenLP')
|
args.remove('OpenLP')
|
||||||
self.args.extend(args)
|
self.args.extend(args)
|
||||||
|
|
|
@ -244,7 +244,7 @@ def build_html(item, screen, is_live, background, image=None, plugins=None):
|
||||||
js_additions += plugin.getDisplayJavaScript()
|
js_additions += plugin.getDisplayJavaScript()
|
||||||
html_additions += plugin.getDisplayHtml()
|
html_additions += plugin.getDisplayHtml()
|
||||||
html = HTMLSRC % (
|
html = HTMLSRC % (
|
||||||
build_background_css(item, width, height),
|
build_background_css(item, width),
|
||||||
css_additions,
|
css_additions,
|
||||||
build_footer_css(item, height),
|
build_footer_css(item, height),
|
||||||
build_lyrics_css(item, webkit_ver),
|
build_lyrics_css(item, webkit_ver),
|
||||||
|
@ -269,7 +269,7 @@ def webkit_version():
|
||||||
return webkit_ver
|
return webkit_ver
|
||||||
|
|
||||||
|
|
||||||
def build_background_css(item, width, height):
|
def build_background_css(item, width):
|
||||||
"""
|
"""
|
||||||
Build the background css
|
Build the background css
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ class MediaSlider(QtGui.QSlider):
|
||||||
"""
|
"""
|
||||||
Allows the mouse events of a slider to be overridden and extra functionality added
|
Allows the mouse events of a slider to be overridden and extra functionality added
|
||||||
"""
|
"""
|
||||||
def __init__(self, direction, manager, controller, parent=None):
|
def __init__(self, direction, manager, controller):
|
||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -578,9 +578,9 @@ class SlideController(DisplayController):
|
||||||
width = self.main_window.controlSplitter.sizes()[self.split]
|
width = self.main_window.controlSplitter.sizes()[self.split]
|
||||||
for framenumber in range(len(self.service_item.get_frames())):
|
for framenumber in range(len(self.service_item.get_frames())):
|
||||||
self.preview_list_widget.setRowHeight(framenumber, width / self.ratio)
|
self.preview_list_widget.setRowHeight(framenumber, width / self.ratio)
|
||||||
self.onControllerSizeChanged(self.controller.width(), self.controller.height())
|
self.onControllerSizeChanged(self.controller.width())
|
||||||
|
|
||||||
def onControllerSizeChanged(self, width, height):
|
def onControllerSizeChanged(self, width):
|
||||||
"""
|
"""
|
||||||
Change layout of display control buttons on controller size change
|
Change layout of display control buttons on controller size change
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -274,12 +274,12 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
||||||
self.setWindowTitle(UiStrings().NewTheme)
|
self.setWindowTitle(UiStrings().NewTheme)
|
||||||
return QtGui.QWizard.exec_(self)
|
return QtGui.QWizard.exec_(self)
|
||||||
|
|
||||||
def initializePage(self, id):
|
def initializePage(self, page_id):
|
||||||
"""
|
"""
|
||||||
Set up the pages for Initial run through dialog
|
Set up the pages for Initial run through dialog
|
||||||
"""
|
"""
|
||||||
log.debug(u'initializePage %s' % id)
|
log.debug(u'initializePage %s' % page_id)
|
||||||
wizardPage = self.page(id)
|
wizardPage = self.page(page_id)
|
||||||
if wizardPage == self.backgroundPage:
|
if wizardPage == self.backgroundPage:
|
||||||
self.setBackgroundPageValues()
|
self.setBackgroundPageValues()
|
||||||
elif wizardPage == self.mainAreaPage:
|
elif wizardPage == self.mainAreaPage:
|
||||||
|
|
Loading…
Reference in New Issue