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

Style fixes for Tim

This commit is contained in:
Stewart Becker 2014-07-24 20:28:57 +01:00
parent 4c5b264a3b
commit d90fcface2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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:

4
tests/functional/openlp_core_lib/test_htmlbuilder.py
View File

@ -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.')