raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge comments

Browse Source
This commit is contained in:
Tim Bentley 2017-09-29 19:53:04 +01:00
parent 0c1b1dc2a5
commit cd1b6715b6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/api/http/server.py
View File

@ -89,7 +89,7 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
self.thread.start() self.thread.start()
Registry().register_function('download_website', self.first_time) Registry().register_function('download_website', self.first_time)
Registry().register_function('get_website_version', self.website_version) Registry().register_function('get_website_version', self.website_version)
Registry().set_flag('website_version', '0001_01_01') Registry().set_flag('website_version', '0.0')
def bootstrap_post_set_up(self): def bootstrap_post_set_up(self):
""" """
@ -126,7 +126,7 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
Import web site code if active Import web site code if active
""" """
self.application.process_events() self.application.process_events()
progress = Progress(self) progress = DownloadProgressDialog(self)
progress.forceShow() progress.forceShow()
self.application.process_events() self.application.process_events()
time.sleep(1) time.sleep(1)
@ -147,12 +147,12 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
Registry().set_flag('website_version', self.version) Registry().set_flag('website_version', self.version)
class Progress(QtWidgets.QProgressDialog): class DownloadProgressDialog(QtWidgets.QProgressDialog):
""" """
Local class to handle download display based and supporting httputils:get_web_page Local class to handle download display based and supporting httputils:get_web_page
""" """
def __init__(self, parent): def __init__(self, parent):
super(Progress, self).__init__(parent.main_window) super(DownloadProgressDialog, self).__init__(parent.main_window)
self.parent = parent self.parent = parent
self.setWindowModality(QtCore.Qt.WindowModal) self.setWindowModality(QtCore.Qt.WindowModal)
self.setWindowTitle(translate('RemotePlugin', 'Importing Website')) self.setWindowTitle(translate('RemotePlugin', 'Importing Website'))

2
openlp/core/api/tab.py
View File

@ -222,6 +222,8 @@ class ApiTab(SettingsTab):
self.remote_url.setText('<a href="{url}">{url}</a>'.format(url=http_url)) self.remote_url.setText('<a href="{url}">{url}</a>'.format(url=http_url))
http_url_temp = http_url + 'stage' http_url_temp = http_url + 'stage'
self.stage_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp)) self.stage_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
http_url_temp = http_url + 'chords'
self.chords_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
http_url_temp = http_url + 'main' http_url_temp = http_url + 'main'
self.live_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp)) self.live_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))

2
openlp/core/common/settings.py
View File

@ -177,7 +177,7 @@ class Settings(QtCore.QSettings):
'images/background color': '#000000', 'images/background color': '#000000',
'media/players': 'system,webkit', 'media/players': 'system,webkit',
'media/override player': QtCore.Qt.Unchecked, 'media/override player': QtCore.Qt.Unchecked,
'remotes/download version': '0000_00_00', 'remotes/download version': '0.0',
'players/background color': '#000000', 'players/background color': '#000000',
'servicemanager/last directory': None, 'servicemanager/last directory': None,
'servicemanager/last file': None, 'servicemanager/last file': None,