forked from openlp/openlp
Theme Image and Presentation fixes
bzr-revno: 609
This commit is contained in:
commit
1cfa0e560b
@ -250,7 +250,7 @@ class Plugin(object):
|
||||
"""
|
||||
Called by the plugin to remove toolbar
|
||||
"""
|
||||
self.mediadock.removeDock(self.name)
|
||||
self.mediadock.remove_dock(self.name)
|
||||
self.settings.removeTab(self.name)
|
||||
|
||||
def insert_toolbox_item(self):
|
||||
@ -258,6 +258,6 @@ class Plugin(object):
|
||||
Called by plugin to replace toolbar
|
||||
"""
|
||||
if self.media_item is not None:
|
||||
self.mediadock.insertDock(self.media_item, self.icon, self.weight)
|
||||
self.mediadock.insert_dock(self.media_item, self.icon, self.weight)
|
||||
if self.settings_tab is not None:
|
||||
self.settings.insertTab(self.settings_tab, self.weight)
|
||||
|
@ -140,7 +140,7 @@ class PluginManager(object):
|
||||
if plugin.media_item is not None:
|
||||
log.debug(u'Inserting media manager item from %s' % \
|
||||
plugin.name)
|
||||
mediadock.addDock(plugin.media_item, plugin.icon, plugin.weight)
|
||||
mediadock.add_dock(plugin.media_item, plugin.icon, plugin.weight)
|
||||
|
||||
def hook_settings_tabs(self, settingsform=None):
|
||||
"""
|
||||
|
@ -90,6 +90,8 @@ class ThemeXML(object):
|
||||
The path name to be added.
|
||||
"""
|
||||
if self.background_filename is not None and path is not None:
|
||||
self.theme_name = self.theme_name.rstrip().lstrip()
|
||||
self.background_filename = self.background_filename.rstrip().lstrip()
|
||||
self.background_filename = os.path.join(path, self.theme_name,
|
||||
self.background_filename)
|
||||
|
||||
|
@ -108,6 +108,7 @@ class MainDisplay(DisplayLabel):
|
||||
Sets up the screen on a particular screen.
|
||||
@param (integer) screen This is the screen number.
|
||||
"""
|
||||
log.debug(u'Setup %s for %s ' %(self.screens, screenNumber) )
|
||||
screen = self.screens[screenNumber]
|
||||
if screen[u'number'] != screenNumber:
|
||||
# We will most probably never actually hit this bit, but just in
|
||||
|
@ -24,19 +24,19 @@
|
||||
|
||||
import logging
|
||||
|
||||
log = logging.getLogger(u'MediaDockManager')
|
||||
log = logging.getLogger(u'media_dockManager')
|
||||
|
||||
class MediaDockManager(object):
|
||||
|
||||
def __init__(self, mediaDock):
|
||||
self.mediaDock = mediaDock
|
||||
def __init__(self, media_dock):
|
||||
self.media_dock = media_dock
|
||||
|
||||
def addDock(self, media_item, icon, weight):
|
||||
def add_dock(self, media_item, icon, weight):
|
||||
log.info(u'Adding %s dock' % media_item.title)
|
||||
id = self.mediaDock.addItem(
|
||||
id = self.media_dock.addItem(
|
||||
media_item, icon, media_item.title)
|
||||
|
||||
def insertDock(self, media_item, icon, weight):
|
||||
def insert_dock(self, media_item, icon, weight):
|
||||
"""
|
||||
This should insert a dock item at a given location
|
||||
This does not work as it gives a Segmentation error.
|
||||
@ -44,18 +44,18 @@ class MediaDockManager(object):
|
||||
"""
|
||||
log.debug(u'Inserting %s dock' % media_item.title)
|
||||
match = False
|
||||
for dock_index in range(0, self.mediaDock.count()):
|
||||
if self.mediaDock.widget(dock_index).ConfigSection == media_item.title.lower():
|
||||
for dock_index in range(0, self.media_dock.count()):
|
||||
if self.media_dock.widget(dock_index).ConfigSection == media_item.title.lower():
|
||||
match = True
|
||||
break
|
||||
if not match:
|
||||
self.mediaDock.addItem(media_item, icon, media_item.title)
|
||||
self.media_dock.addItem(media_item, icon, media_item.title)
|
||||
|
||||
|
||||
def removeDock(self, name):
|
||||
def remove_dock(self, name):
|
||||
log.debug(u'remove %s dock' % name)
|
||||
for dock_index in range(0, self.mediaDock.count()):
|
||||
if self.mediaDock.widget(dock_index) is not None:
|
||||
if self.mediaDock.widget(dock_index).ConfigSection == name.lower():
|
||||
self.mediaDock.widget(dock_index).hide()
|
||||
self.mediaDock.removeItem(dock_index)
|
||||
for dock_index in range(0, self.media_dock.count()):
|
||||
if self.media_dock.widget(dock_index) is not None:
|
||||
if self.media_dock.widget(dock_index).ConfigSection == name.lower():
|
||||
self.media_dock.widget(dock_index).hide()
|
||||
self.media_dock.removeItem(dock_index)
|
||||
|
@ -153,6 +153,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
|
||||
def onAddTheme(self):
|
||||
self.amendThemeForm.loadTheme(None)
|
||||
self.saveThemeName = u''
|
||||
self.amendThemeForm.exec_()
|
||||
|
||||
def onEditTheme(self):
|
||||
@ -160,6 +161,7 @@ class ThemeManager(QtGui.QWidget):
|
||||
if item is not None:
|
||||
self.amendThemeForm.loadTheme(
|
||||
unicode(item.data(QtCore.Qt.UserRole).toString()))
|
||||
self.saveThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||
self.amendThemeForm.exec_()
|
||||
|
||||
def onDeleteTheme(self):
|
||||
@ -412,8 +414,8 @@ class ThemeManager(QtGui.QWidget):
|
||||
os.mkdir(os.path.join(self.path, name))
|
||||
theme_file = os.path.join(theme_dir, name + u'.xml')
|
||||
log.debug(theme_file)
|
||||
|
||||
result = QtGui.QMessageBox.Yes
|
||||
if self.saveThemeName != name:
|
||||
if os.path.exists(theme_file):
|
||||
result = QtGui.QMessageBox.question(
|
||||
self,
|
||||
@ -421,14 +423,17 @@ class ThemeManager(QtGui.QWidget):
|
||||
translate(u'ThemeManager', u'A theme with this name already exists, would you like to overwrite it?'),
|
||||
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
|
||||
QtGui.QMessageBox.No)
|
||||
else:
|
||||
result == QtGui.QMessageBox.Yes
|
||||
if result == QtGui.QMessageBox.Yes:
|
||||
# Save the theme, overwriting the existing theme if necessary.
|
||||
outfile = open(theme_file, u'w')
|
||||
outfile.write(theme_pretty_xml)
|
||||
outfile.close()
|
||||
if image_from is not None and image_from != image_to:
|
||||
print "if", image_from
|
||||
print "it", image_to
|
||||
shutil.copyfile(image_from, image_to)
|
||||
|
||||
self.generateAndSaveImage(self.path, name, theme_xml)
|
||||
self.loadThemes()
|
||||
else:
|
||||
|
@ -110,9 +110,9 @@ class BiblesTab(SettingsTab):
|
||||
self.BibleThemeComboBox.setObjectName(u'BibleThemeComboBox')
|
||||
self.BibleThemeComboBox.addItem(QtCore.QString())
|
||||
self.BibleThemeLayout.addWidget(self.BibleThemeComboBox)
|
||||
self.BibleDuelCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
|
||||
self.BibleDuelCheckBox.setObjectName(u'BibleDuelCheckBox')
|
||||
self.VerseDisplayLayout.addWidget(self.BibleDuelCheckBox, 3, 0, 1, 1)
|
||||
self.BibleDualCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
|
||||
self.BibleDualCheckBox.setObjectName(u'BibleDualCheckBox')
|
||||
self.VerseDisplayLayout.addWidget(self.BibleDualCheckBox, 3, 0, 1, 1)
|
||||
self.VerseDisplayLayout.addWidget(self.BibleThemeWidget, 4, 0, 1, 1)
|
||||
self.ChangeNoteLabel = QtGui.QLabel(self.VerseDisplayGroupBox)
|
||||
self.ChangeNoteLabel.setObjectName(u'ChangeNoteLabel')
|
||||
@ -141,9 +141,9 @@ class BiblesTab(SettingsTab):
|
||||
QtCore.QObject.connect(self.LayoutStyleComboBox,
|
||||
QtCore.SIGNAL(u'activated(int)'),
|
||||
self.onLayoutStyleComboBoxChanged)
|
||||
QtCore.QObject.connect(self.BibleDuelCheckBox,
|
||||
QtCore.QObject.connect(self.BibleDualCheckBox,
|
||||
QtCore.SIGNAL(u'stateChanged(int)'),
|
||||
self.onBibleDuelCheckBox)
|
||||
self.onBibleDualCheckBox)
|
||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||
QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
|
||||
|
||||
@ -174,8 +174,8 @@ class BiblesTab(SettingsTab):
|
||||
3, translate(u'SettingsForm', u'[ and ]'))
|
||||
self.ChangeNoteLabel.setText(translate(u'SettingsForm',
|
||||
u'Note:\nChanges don\'t affect verses already in the service'))
|
||||
self.BibleDuelCheckBox.setText(
|
||||
translate(u'SettingsForm', u'Display Duel Bible Verses'))
|
||||
self.BibleDualCheckBox.setText(
|
||||
translate(u'SettingsForm', u'Display Dual Bible Verses'))
|
||||
|
||||
def onBibleThemeComboBoxChanged(self):
|
||||
self.bible_theme = self.BibleThemeComboBox.currentText()
|
||||
@ -192,7 +192,7 @@ class BiblesTab(SettingsTab):
|
||||
if check_state == QtCore.Qt.Checked:
|
||||
self.show_new_chapters = True
|
||||
|
||||
def onBibleDuelCheckBox(self, check_state):
|
||||
def onBibleDualCheckBox(self, check_state):
|
||||
self.duel_bibles = False
|
||||
# we have a set value convert to True/False
|
||||
if check_state == QtCore.Qt.Checked:
|
||||
@ -207,11 +207,11 @@ class BiblesTab(SettingsTab):
|
||||
self.config.get_config(u'verse layout style', 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.config.get_config(u'dual bibles', u'True'))
|
||||
self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
|
||||
self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
|
||||
self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
|
||||
self.BibleDuelCheckBox.setChecked(self.duel_bibles)
|
||||
self.BibleDualCheckBox.setChecked(self.duel_bibles)
|
||||
|
||||
def save(self):
|
||||
self.config.set_config(
|
||||
@ -220,7 +220,7 @@ class BiblesTab(SettingsTab):
|
||||
u'display brackets', unicode(self.display_style))
|
||||
self.config.set_config(
|
||||
u'verse layout style', unicode(self.layout_style))
|
||||
self.config.set_config(u'duel bibles', unicode(self.duel_bibles))
|
||||
self.config.set_config(u'dual bibles', unicode(self.duel_bibles))
|
||||
self.config.set_config(u'bible theme', unicode(self.bible_theme))
|
||||
|
||||
def updateThemeList(self, theme_list):
|
||||
|
@ -208,7 +208,7 @@ class BibleMediaItem(MediaManagerItem):
|
||||
|
||||
def configUpdated(self):
|
||||
if str_to_bool(
|
||||
self.parent.config.get_config(u'duel bibles', u'False')):
|
||||
self.parent.config.get_config(u'dual bibles', u'False')):
|
||||
self.AdvancedSecondBibleComboBox.setVisible(True)
|
||||
self.QuickSecondBibleComboBox.setVisible(True)
|
||||
else:
|
||||
|
@ -51,19 +51,19 @@ class PresentationPlugin(Plugin):
|
||||
Create the settings Tab
|
||||
"""
|
||||
return PresentationTab(self.controllers)
|
||||
#
|
||||
# def can_be_disabled(self):
|
||||
# return True
|
||||
#
|
||||
# def initialise(self):
|
||||
# log.info(u'Presentations Initialising')
|
||||
# Plugin.initialise(self)
|
||||
# self.insert_toolbox_item()
|
||||
#
|
||||
# def finalise(self):
|
||||
# log.info(u'Plugin Finalise')
|
||||
# Plugin.finalise(self)
|
||||
# self.remove_toolbox_item()
|
||||
|
||||
def can_be_disabled(self):
|
||||
return True
|
||||
|
||||
def initialise(self):
|
||||
log.info(u'Presentations Initialising')
|
||||
Plugin.initialise(self)
|
||||
self.insert_toolbox_item()
|
||||
|
||||
def finalise(self):
|
||||
log.info(u'Plugin Finalise')
|
||||
Plugin.finalise(self)
|
||||
self.remove_toolbox_item()
|
||||
|
||||
def get_media_manager_item(self):
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user