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

sort out ftw

Browse Source
This commit is contained in:
Tim Bentley 2017-06-06 21:45:59 +01:00
parent 6d375de3db
commit 08a135de78
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/firsttimeform.py
View File

@ -34,7 +34,6 @@ from configparser import ConfigParser, MissingSectionHeaderError, NoSectionError
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets
from openlp.plugins.remotes.deploy import download_and_check
from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, check_directory_exists, \ from openlp.core.common import Registry, RegistryProperties, AppLocation, Settings, check_directory_exists, \
translate, clean_button_text, trace_error_handler translate, clean_button_text, trace_error_handler
from openlp.core.lib import PluginStatus, build_icon from openlp.core.lib import PluginStatus, build_icon
@ -595,11 +594,6 @@ class FirstTimeForm(QtWidgets.QWizard, UiFirstTimeWizard, RegistryProperties):
os.path.join(themes_destination, theme), os.path.join(themes_destination, theme),
sha256): sha256):
missed_files.append('Theme: {name}'.format(name=theme)) missed_files.append('Theme: {name}'.format(name=theme))
if self.remote_check_box.isChecked():
self._increment_progress_bar(self.downloading.format(
name=translate('OpenLP.FirstTimeWizard', 'Downloading Web Application')), 0)
self.previous_size = 0
download_and_check(self)
if missed_files: if missed_files:
file_list = '' file_list = ''
for entry in missed_files: for entry in missed_files:

2
openlp/core/ui/mainwindow.py
View File

@ -516,7 +516,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
Settings().set_up_default_values() Settings().set_up_default_values()
self.about_form = AboutForm(self) self.about_form = AboutForm(self)
MediaController() MediaController()
if Registry().get_flag('webServer'): if Registry().get_flag('no_web_server'):
websockets.WebSocketServer() websockets.WebSocketServer()
server.HttpServer() server.HttpServer()
SettingsForm(self) SettingsForm(self)

7
openlp/plugins/remotes/remoteplugin.py
View File

@ -81,5 +81,10 @@ class RemotesPlugin(Plugin, OpenLPMixin):
'title': translate('RemotePlugin', 'Web Remote', 'container title') 'title': translate('RemotePlugin', 'Web Remote', 'container title')
} }
def manage_download(self): def first_time(self):
"""
Import web site code if active
"""
self.application.process_events()
download_and_check() download_and_check()
self.application.process_events()