forked from openlp/openlp
Move version check
This commit is contained in:
parent
2f12c075c2
commit
7b1de0f995
|
@ -105,6 +105,7 @@ class OpenLP(QtGui.QApplication):
|
||||||
if show_splash:
|
if show_splash:
|
||||||
# now kill the splashscreen
|
# now kill the splashscreen
|
||||||
self.splash.finish(self.mainWindow)
|
self.splash.finish(self.mainWindow)
|
||||||
|
self.mainWindow.versionCheck()
|
||||||
return self.exec_()
|
return self.exec_()
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
@ -562,7 +562,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
||||||
screen_number = self.getMonitorNumber()
|
screen_number = self.getMonitorNumber()
|
||||||
self.mainDisplay.setup(screen_number)
|
self.mainDisplay.setup(screen_number)
|
||||||
self.setFocus()
|
self.setFocus()
|
||||||
self.versionCheck()
|
|
||||||
if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
|
if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
|
||||||
self.ServiceManagerContents.onLoadService(True)
|
self.ServiceManagerContents.onLoadService(True)
|
||||||
if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
|
if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
|
||||||
|
|
|
@ -292,6 +292,7 @@ class SongMediaItem(MediaManagerItem):
|
||||||
service_item.theme = song.theme_name
|
service_item.theme = song.theme_name
|
||||||
service_item.editEnabled = True
|
service_item.editEnabled = True
|
||||||
service_item.editId = item_id
|
service_item.editId = item_id
|
||||||
|
service_item.verse_order = song.verse_order
|
||||||
if song.lyrics.startswith(u'<?xml version='):
|
if song.lyrics.startswith(u'<?xml version='):
|
||||||
songXML=SongXMLParser(song.lyrics)
|
songXML=SongXMLParser(song.lyrics)
|
||||||
verseList = songXML.get_verses()
|
verseList = songXML.get_verses()
|
||||||
|
|
Loading…
Reference in New Issue