forked from openlp/openlp
Bible Plugin - Hide Duel verse Combo be default
This commit is contained in:
parent
742eac2487
commit
0828335939
@ -27,6 +27,7 @@ import logging
|
|||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
|
||||||
from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
|
from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
|
||||||
|
from openlp.core.lib import Receiver
|
||||||
from settingsdialog import Ui_SettingsDialog
|
from settingsdialog import Ui_SettingsDialog
|
||||||
|
|
||||||
log = logging.getLogger(u'SettingsForm')
|
log = logging.getLogger(u'SettingsForm')
|
||||||
@ -64,6 +65,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
|
|||||||
def accept(self):
|
def accept(self):
|
||||||
for tab_index in range(0, self.SettingsTabWidget.count()):
|
for tab_index in range(0, self.SettingsTabWidget.count()):
|
||||||
self.SettingsTabWidget.widget(tab_index).save()
|
self.SettingsTabWidget.widget(tab_index).save()
|
||||||
|
Receiver().send_message(u'config_updated')
|
||||||
return QtGui.QDialog.accept(self)
|
return QtGui.QDialog.accept(self)
|
||||||
|
|
||||||
def postSetUp(self):
|
def postSetUp(self):
|
||||||
|
@ -97,7 +97,6 @@ class BiblesTab(SettingsTab):
|
|||||||
self.LayoutStyleComboBox.addItem(QtCore.QString())
|
self.LayoutStyleComboBox.addItem(QtCore.QString())
|
||||||
self.LayoutStyleLayout.addWidget(self.LayoutStyleComboBox)
|
self.LayoutStyleLayout.addWidget(self.LayoutStyleComboBox)
|
||||||
self.VerseDisplayLayout.addWidget(self.LayoutStyleWidget, 2, 0, 1, 1)
|
self.VerseDisplayLayout.addWidget(self.LayoutStyleWidget, 2, 0, 1, 1)
|
||||||
|
|
||||||
self.BibleThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
|
self.BibleThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
|
||||||
self.BibleThemeWidget.setObjectName(u'BibleThemeWidget')
|
self.BibleThemeWidget.setObjectName(u'BibleThemeWidget')
|
||||||
self.BibleThemeLayout = QtGui.QHBoxLayout(self.BibleThemeWidget)
|
self.BibleThemeLayout = QtGui.QHBoxLayout(self.BibleThemeWidget)
|
||||||
@ -111,10 +110,13 @@ class BiblesTab(SettingsTab):
|
|||||||
self.BibleThemeComboBox.setObjectName(u'BibleThemeComboBox')
|
self.BibleThemeComboBox.setObjectName(u'BibleThemeComboBox')
|
||||||
self.BibleThemeComboBox.addItem(QtCore.QString())
|
self.BibleThemeComboBox.addItem(QtCore.QString())
|
||||||
self.BibleThemeLayout.addWidget(self.BibleThemeComboBox)
|
self.BibleThemeLayout.addWidget(self.BibleThemeComboBox)
|
||||||
self.VerseDisplayLayout.addWidget(self.BibleThemeWidget, 3, 0, 1, 1)
|
self.BibleDuelCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
|
||||||
|
self.BibleDuelCheckBox.setObjectName(u'BibleDuelCheckBox')
|
||||||
|
self.VerseDisplayLayout.addWidget(self.BibleDuelCheckBox, 3, 0, 1, 1)
|
||||||
|
self.VerseDisplayLayout.addWidget(self.BibleThemeWidget, 4, 0, 1, 1)
|
||||||
self.ChangeNoteLabel = QtGui.QLabel(self.VerseDisplayGroupBox)
|
self.ChangeNoteLabel = QtGui.QLabel(self.VerseDisplayGroupBox)
|
||||||
self.ChangeNoteLabel.setObjectName(u'ChangeNoteLabel')
|
self.ChangeNoteLabel.setObjectName(u'ChangeNoteLabel')
|
||||||
self.VerseDisplayLayout.addWidget(self.ChangeNoteLabel, 4, 0, 1, 1)
|
self.VerseDisplayLayout.addWidget(self.ChangeNoteLabel, 5, 0, 1, 1)
|
||||||
self.BibleLeftLayout.addWidget(self.VerseDisplayGroupBox)
|
self.BibleLeftLayout.addWidget(self.VerseDisplayGroupBox)
|
||||||
self.BibleLeftSpacer = QtGui.QSpacerItem(40, 20,
|
self.BibleLeftSpacer = QtGui.QSpacerItem(40, 20,
|
||||||
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
|
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
|
||||||
@ -139,6 +141,9 @@ class BiblesTab(SettingsTab):
|
|||||||
QtCore.QObject.connect(self.LayoutStyleComboBox,
|
QtCore.QObject.connect(self.LayoutStyleComboBox,
|
||||||
QtCore.SIGNAL(u'activated(int)'),
|
QtCore.SIGNAL(u'activated(int)'),
|
||||||
self.onLayoutStyleComboBoxChanged)
|
self.onLayoutStyleComboBoxChanged)
|
||||||
|
QtCore.QObject.connect(self.BibleDuelCheckBox,
|
||||||
|
QtCore.SIGNAL(u'stateChanged(int)'),
|
||||||
|
self.onBibleDuelCheckBox)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
|
QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
|
||||||
|
|
||||||
@ -169,6 +174,8 @@ class BiblesTab(SettingsTab):
|
|||||||
3, translate(u'SettingsForm', u'[ and ]'))
|
3, translate(u'SettingsForm', u'[ and ]'))
|
||||||
self.ChangeNoteLabel.setText(translate(u'SettingsForm',
|
self.ChangeNoteLabel.setText(translate(u'SettingsForm',
|
||||||
u'Note:\nChanges don\'t affect verses already in the service'))
|
u'Note:\nChanges don\'t affect verses already in the service'))
|
||||||
|
self.BibleDuelCheckBox.setText(
|
||||||
|
translate(u'SettingsForm', u'Display Duel Bible Verses'))
|
||||||
|
|
||||||
def onBibleThemeComboBoxChanged(self):
|
def onBibleThemeComboBoxChanged(self):
|
||||||
self.bible_theme = self.BibleThemeComboBox.currentText()
|
self.bible_theme = self.BibleThemeComboBox.currentText()
|
||||||
@ -179,13 +186,18 @@ class BiblesTab(SettingsTab):
|
|||||||
def onLayoutStyleComboBoxChanged(self):
|
def onLayoutStyleComboBoxChanged(self):
|
||||||
self.layout_style = self.LayoutStyleComboBox.currentIndex()
|
self.layout_style = self.LayoutStyleComboBox.currentIndex()
|
||||||
|
|
||||||
def onNewChaptersCheckBoxChanged(self):
|
def onNewChaptersCheckBoxChanged(self, check_state):
|
||||||
check_state = self.NewChaptersCheckBox.checkState()
|
|
||||||
self.show_new_chapters = False
|
self.show_new_chapters = False
|
||||||
# we have a set value convert to True/False
|
# we have a set value convert to True/False
|
||||||
if check_state == QtCore.Qt.Checked:
|
if check_state == QtCore.Qt.Checked:
|
||||||
self.show_new_chapters = True
|
self.show_new_chapters = True
|
||||||
|
|
||||||
|
def onBibleDuelCheckBox(self, check_state):
|
||||||
|
self.duel_bibles = False
|
||||||
|
# we have a set value convert to True/False
|
||||||
|
if check_state == QtCore.Qt.Checked:
|
||||||
|
self.duel_bibles = True
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
self.show_new_chapters = str_to_bool(
|
self.show_new_chapters = str_to_bool(
|
||||||
self.config.get_config(u'display new chapter', u'False'))
|
self.config.get_config(u'display new chapter', u'False'))
|
||||||
@ -194,9 +206,12 @@ class BiblesTab(SettingsTab):
|
|||||||
self.layout_style = int(
|
self.layout_style = int(
|
||||||
self.config.get_config(u'verse layout style', u'0'))
|
self.config.get_config(u'verse layout style', u'0'))
|
||||||
self.bible_theme = self.config.get_config(u'bible theme', u'0')
|
self.bible_theme = self.config.get_config(u'bible theme', u'0')
|
||||||
|
self.duel_bibles = str_to_bool(
|
||||||
|
self.config.get_config(u'duel bibles', u'True'))
|
||||||
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.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
|
self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
|
||||||
|
self.BibleDuelCheckBox.setChecked(self.duel_bibles)
|
||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
self.config.set_config(
|
self.config.set_config(
|
||||||
@ -205,6 +220,7 @@ class BiblesTab(SettingsTab):
|
|||||||
u'display brackets', unicode(self.display_style))
|
u'display brackets', unicode(self.display_style))
|
||||||
self.config.set_config(
|
self.config.set_config(
|
||||||
u'verse layout style', unicode(self.layout_style))
|
u'verse layout style', unicode(self.layout_style))
|
||||||
|
self.config.set_config(u'duel bibles', unicode(self.duel_bibles))
|
||||||
self.config.set_config(u'bible theme', unicode(self.bible_theme))
|
self.config.set_config(u'bible theme', unicode(self.bible_theme))
|
||||||
|
|
||||||
def updateThemeList(self, theme_list):
|
def updateThemeList(self, theme_list):
|
||||||
|
@ -28,7 +28,7 @@ import time
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import translate, MediaManagerItem, Receiver, \
|
from openlp.core.lib import translate, MediaManagerItem, Receiver, \
|
||||||
BaseListWithDnD
|
BaseListWithDnD, str_to_bool
|
||||||
from openlp.plugins.bibles.forms import BibleImportForm
|
from openlp.plugins.bibles.forms import BibleImportForm
|
||||||
from openlp.plugins.bibles.lib.manager import BibleMode
|
from openlp.plugins.bibles.lib.manager import BibleMode
|
||||||
|
|
||||||
@ -203,6 +203,17 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
QtCore.SIGNAL(u'pressed()'), self.onAdvancedSearchButton)
|
QtCore.SIGNAL(u'pressed()'), self.onAdvancedSearchButton)
|
||||||
QtCore.QObject.connect(self.QuickSearchButton,
|
QtCore.QObject.connect(self.QuickSearchButton,
|
||||||
QtCore.SIGNAL(u'pressed()'), self.onQuickSearchButton)
|
QtCore.SIGNAL(u'pressed()'), self.onQuickSearchButton)
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'config_updated'), self.configUpdated)
|
||||||
|
|
||||||
|
def configUpdated(self):
|
||||||
|
if str_to_bool(
|
||||||
|
self.parent.config.get_config(u'duel bibles', u'False')):
|
||||||
|
self.AdvancedSecondBibleComboBox.setVisible(True)
|
||||||
|
self.QuickSecondBibleComboBox.setVisible(True)
|
||||||
|
else:
|
||||||
|
self.AdvancedSecondBibleComboBox.setVisible(False)
|
||||||
|
self.QuickSecondBibleComboBox.setVisible(False)
|
||||||
|
|
||||||
def retranslateUi(self):
|
def retranslateUi(self):
|
||||||
log.debug(u'retranslateUi')
|
log.debug(u'retranslateUi')
|
||||||
@ -242,6 +253,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
log.debug(u'bible manager initialise')
|
log.debug(u'bible manager initialise')
|
||||||
self.loadBibles()
|
self.loadBibles()
|
||||||
self.parent.biblemanager.set_media_manager(self)
|
self.parent.biblemanager.set_media_manager(self)
|
||||||
|
self.configUpdated()
|
||||||
log.debug(u'bible manager initialise complete')
|
log.debug(u'bible manager initialise complete')
|
||||||
|
|
||||||
def setQuickMessage(self, text):
|
def setQuickMessage(self, text):
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
|
from openlp.core.lib import SettingsTab, str_to_bool, translate
|
||||||
|
|
||||||
class SongsTab(SettingsTab):
|
class SongsTab(SettingsTab):
|
||||||
"""
|
"""
|
||||||
@ -70,5 +70,3 @@ class SongsTab(SettingsTab):
|
|||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
self.config.set_config(u'search as type', unicode(self.bible_search))
|
self.config.set_config(u'search as type', unicode(self.bible_search))
|
||||||
Receiver().send_message(u'config_updated')
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user