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

Fix comments from last merge

Browse Source 
Fix BiblePlugin Theme storage and usage
This commit is contained in:
Tim Bentley 2009-05-18 05:41:49 +01:00
parent a5615fd4fe
commit 27027eb051
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openlp/plugins/bibles/lib/biblestab.py
View File

@ -3,7 +3,7 @@
""" """
OpenLP - Open Source Lyrics Projection OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008 Martin Thompson, Tim Bentley, Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
This program is free software; you can redistribute it and/or modify it under 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 Software the terms of the GNU General Public License as published by the Free Software
@ -18,7 +18,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from PyQt4 import QtCore, QtGui from PyQt4 import Qt, QtCore, QtGui
from openlp.core import translate from openlp.core import translate
from openlp import convertStringToBoolean from openlp import convertStringToBoolean
@ -144,6 +144,8 @@ class BiblesTab(SettingsTab):
QtCore.SIGNAL("pressed()"), self.onParagraphRadioButtonPressed) QtCore.SIGNAL("pressed()"), self.onParagraphRadioButtonPressed)
QtCore.QObject.connect(self.DisplayStyleComboBox, QtCore.QObject.connect(self.DisplayStyleComboBox,
QtCore.SIGNAL("activated(int)"), self.onDisplayStyleComboBoxChanged) QtCore.SIGNAL("activated(int)"), self.onDisplayStyleComboBoxChanged)
QtCore.QObject.connect(self.BibleThemeComboBox,
QtCore.SIGNAL("activated(int)"), self.onBibleThemeComboBoxChanged)
def retranslateUi(self): def retranslateUi(self):
self.VerseDisplayGroupBox.setTitle(translate('SettingsForm', 'Verse Display')) self.VerseDisplayGroupBox.setTitle(translate('SettingsForm', 'Verse Display'))
@ -160,6 +162,9 @@ class BiblesTab(SettingsTab):
self.BibleSearchGroupBox.setTitle(translate('SettingsForm', 'Search')) self.BibleSearchGroupBox.setTitle(translate('SettingsForm', 'Search'))
self.BibleSearchCheckBox.setText(translate('SettingsForm', 'Search-as-you-type')) self.BibleSearchCheckBox.setText(translate('SettingsForm', 'Search-as-you-type'))
def onBibleThemeComboBoxChanged(self):
self.bible_theme = self.BibleThemeComboBox.currentText()
def onDisplayStyleComboBoxChanged(self): def onDisplayStyleComboBoxChanged(self):
self.display_style = self.DisplayStyleComboBox.currentIndex() self.display_style = self.DisplayStyleComboBox.currentIndex()
@ -182,11 +187,11 @@ class BiblesTab(SettingsTab):
self.bible_search = True self.bible_search = True
def load(self): def load(self):
self.paragraph_style = convertStringToBoolean(self.config.get_config('paragraph style', u'True')) self.paragraph_style = convertStringToBoolean(self.config.get_config(u'paragraph style', u'True'))
self.show_new_chapters = convertStringToBoolean(self.config.get_config('display new chapter', u"False")) self.show_new_chapters = convertStringToBoolean(self.config.get_config(u'display new chapter', u"False"))
self.display_style = int(self.config.get_config('display brackets', '0')) self.display_style = int(self.config.get_config(u'display brackets', u'0'))
self.bible_theme = int(self.config.get_config('bible theme', '0')) self.bible_theme = int(self.config.get_config(u'bible theme', u'0'))
self.bible_search = convertStringToBoolean(self.config.get_config('search as type', u'True')) self.bible_search = convertStringToBoolean(self.config.get_config(u'search as type', u'True'))
if self.paragraph_style: if self.paragraph_style:
self.ParagraphRadioButton.setChecked(True) self.ParagraphRadioButton.setChecked(True)
else: else:
@ -194,23 +199,23 @@ class BiblesTab(SettingsTab):
self.NewChaptersCheckBox.setChecked(self.show_new_chapters) self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
self.DisplayStyleComboBox.setCurrentIndex(self.display_style) self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
self.BibleSearchCheckBox.setChecked(self.bible_search) self.BibleSearchCheckBox.setChecked(self.bible_search)
if self.bible_theme == 0: # must be new set to first
self.BibleThemeComboBox.setCurrentIndex(self.bible_theme)
else:
pass # TODO need to code
self.bible_theme = None
def save(self): def save(self):
self.config.set_config("paragraph style", str(self.paragraph_style)) self.config.set_config(u'paragraph style', str(self.paragraph_style))
self.config.set_config("display new chapter", str(self.show_new_chapters)) self.config.set_config(u'display new chapter', str(self.show_new_chapters))
self.config.set_config("display brackets", str(self.display_style)) self.config.set_config(u'display brackets', str(self.display_style))
self.config.set_config("search as type", str(self.bible_search)) self.config.set_config(u'search as type', str(self.bible_search))
self.config.set_config("bible theme", str(self.bible_theme)) self.config.set_config(u'bible theme', str(self.bible_theme))
def updateThemeList(self, theme_list): def updateThemeList(self, theme_list):
""" """
Called from ThemeManager when the Themes have changed Called from ThemeManager when the Themes have changed
""" """
self.BibleThemeComboBox.clear() self.BibleThemeComboBox.clear()
self.BibleThemeComboBox.addItem(u'')
for theme in theme_list: for theme in theme_list:
self.BibleThemeComboBox.addItem(theme) self.BibleThemeComboBox.addItem(theme)
id = self.BibleThemeComboBox.findText(str(self.bible_theme), QtCore.Qt.MatchExactly)
if id == -1:
id = 0 # Not Found
self.BibleThemeComboBox.setCurrentIndex(id)

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -100,7 +100,7 @@ class MediaMediaItem(MediaManagerItem):
files = QtGui.QFileDialog.getOpenFileNames(None, files = QtGui.QFileDialog.getOpenFileNames(None,
translate('MediaMediaItem', u'Select Media(s) items'), translate('MediaMediaItem', u'Select Media(s) items'),
self.parent.config.get_last_dir(), self.parent.config.get_last_dir(),
u'Images (*.avi *.mpeg);;Audio (*.mp3 *.ogg *.wma);;All files (*)') u'Videos (*.avi *.mpeg);;Audio (*.mp3 *.ogg *.wma);;All files (*)')
if len(files) > 0: if len(files) > 0:
self.loadMediaList(files) self.loadMediaList(files)
dir, filename = os.path.split(str(files[0])) dir, filename = os.path.split(str(files[0]))