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

Fixes

Browse Source
This commit is contained in:
Philip Ridout 2019-02-15 20:22:02 +00:00
parent 8bc6cfc1a5
commit 6d7c19256b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ class ThemeListWidgetItem(QtWidgets.QListWidgetItem):
""" """
self.setIcon(build_icon(thumbnail_path)) self.setIcon(build_icon(thumbnail_path))
class FirstTimeForm(QtWidgets.QWizard, UiFirstTimeWizard, RegistryProperties): class FirstTimeForm(QtWidgets.QWizard, UiFirstTimeWizard, RegistryProperties):
""" """
This is the Theme Import Wizard, which allows easy creation and editing of OpenLP themes. This is the Theme Import Wizard, which allows easy creation and editing of OpenLP themes.
@ -172,9 +173,9 @@ class FirstTimeForm(QtWidgets.QWizard, UiFirstTimeWizard, RegistryProperties):
try: try:
web_config = get_web_page('{host}{name}'.format(host=self.web, name='download_3.0.json'), web_config = get_web_page('{host}{name}'.format(host=self.web, name='download_3.0.json'),
headers={'User-Agent': user_agent}) headers={'User-Agent': user_agent})
web_config = Path( # web_config = Path(
'C:\\Users\\sroom\\Documents\\Phill Ridout\\play_ground\\openlp\\ftw-json\\download_3.0.json' # 'C:\\Users\\sroom\\Documents\\Phill Ridout\\play_ground\\openlp\\ftw-json\\download_3.0.json'
).read_text(encoding='utf-8') # TODO: Remove!!!!! # ).read_text(encoding='utf-8') # TODO: Remove!!!!!
except ConnectionError as e: except ConnectionError as e:
QtWidgets.QMessageBox.critical(self, translate('OpenLP.FirstTimeWizard', 'Network Error'), QtWidgets.QMessageBox.critical(self, translate('OpenLP.FirstTimeWizard', 'Network Error'),
translate('OpenLP.FirstTimeWizard', 'There was a network error attempting ' translate('OpenLP.FirstTimeWizard', 'There was a network error attempting '

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

@ -220,7 +220,7 @@ class UiFirstTimeWizard(object):
self.theme_combo_box.setEditable(False) self.theme_combo_box.setEditable(False)
self.default_theme_layout.addWidget(self.theme_combo_box, stretch=1) self.default_theme_layout.addWidget(self.theme_combo_box, stretch=1)
self.theme_options_layout.addLayout(self.default_theme_layout, stretch=1) self.theme_options_layout.addLayout(self.default_theme_layout, stretch=1)
self.select_buttons_layout = QtWidgets.QHBoxLayout(self.themes_page) self.select_buttons_layout = QtWidgets.QHBoxLayout()
self.themes_select_all_button = QtWidgets.QToolButton(self.themes_page) self.themes_select_all_button = QtWidgets.QToolButton(self.themes_page)
self.themes_select_all_button.setIcon(UiIcons().plus) self.themes_select_all_button.setIcon(UiIcons().plus)
self.select_buttons_layout.addWidget(self.themes_select_all_button, stretch=1, alignment=QtCore.Qt.AlignRight) self.select_buttons_layout.addWidget(self.themes_select_all_button, stretch=1, alignment=QtCore.Qt.AlignRight)

4
tests/interfaces/openlp_core/ui/test_firsttimeform.py
View File

@ -4,7 +4,7 @@
############################################################################### ###############################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2017 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software; you can redistribute it and/or modify it #
# under the terms of the GNU General Public License as published by the Free # # under the terms of the GNU General Public License as published by the Free #
@ -31,8 +31,6 @@ from openlp.core.ui.firsttimeform import ThemeListWidgetItem
from openlp.core.ui.icons import UiIcons from openlp.core.ui.icons import UiIcons
from tests.helpers.testmixin import TestMixin from tests.helpers.testmixin import TestMixin
# TODO: BZR ADD!!!!!!!!!!!!!
class TestThemeListWidgetItem(TestCase, TestMixin): class TestThemeListWidgetItem(TestCase, TestMixin):
def setUp(self): def setUp(self):