From d90fcface2853d0d6d0f4abc18168e20eb317f97 Mon Sep 17 00:00:00 2001 From: Stewart Becker Date: Thu, 24 Jul 2014 20:28:57 +0100 Subject: [PATCH] Style fixes for Tim --- openlp/core/ui/themestab.py | 6 ++---- tests/functional/openlp_core_lib/test_htmlbuilder.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index 230439566..4b3f8b6eb 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -146,7 +146,7 @@ class ThemesTab(SettingsTab): settings.beginGroup(self.settings_section) self.theme_level = settings.value('theme level') self.global_theme = settings.value('global theme') - wrap_footer = settings.value('wrap footer') + self.wrap_footer_check_box.setChecked(settings.value('wrap footer')) settings.endGroup() if self.theme_level == ThemeLevel.Global: self.global_level_radio_button.setChecked(True) @@ -154,18 +154,16 @@ class ThemesTab(SettingsTab): self.service_level_radio_button.setChecked(True) else: self.song_level_radio_button.setChecked(True) - self.wrap_footer_check_box.setChecked(wrap_footer) def save(self): """ Save the settings """ - wrap_footer = self.wrap_footer_check_box.isChecked() settings = Settings() settings.beginGroup(self.settings_section) settings.setValue('theme level', self.theme_level) settings.setValue('global theme', self.global_theme) - settings.setValue('wrap footer', wrap_footer) + settings.setValue('wrap footer', self.wrap_footer_check_box.isChecked()) settings.endGroup() self.renderer.set_theme_level(self.theme_level) if self.tab_visited: diff --git a/tests/functional/openlp_core_lib/test_htmlbuilder.py b/tests/functional/openlp_core_lib/test_htmlbuilder.py index e98dfc687..4563c98b4 100644 --- a/tests/functional/openlp_core_lib/test_htmlbuilder.py +++ b/tests/functional/openlp_core_lib/test_htmlbuilder.py @@ -320,7 +320,7 @@ class Htmbuilder(TestCase, TestMixin): css = build_lyrics_format_css(theme_data, width, height) # THEN: They should be equal. - assert LYRICS_FORMAT_CSS == css, 'The lyrics format css should be equal.' + self.assertEqual(LYRICS_FORMAT_CSS, css, 'The lyrics format css should be equal.') def build_footer_css_test(self): """ @@ -357,4 +357,4 @@ class Htmbuilder(TestCase, TestMixin): css = build_footer_css(item, height) # THEN: Footer should wrap - assert FOOTER_CSS_WRAP == css, 'The footer strings should be equal.' + self.assertEqual(FOOTER_CSS_WRAP, css, 'The footer strings should be equal.')