openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Head

This commit is contained in:
Tim Bentley 2011-06-12 16:32:44 +01:00
parent 26419d8f18 8c12b7d912
commit 3bafa2a8e3
9 changed files with 67 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/htmlbuilder.py
View File

@ -257,11 +257,12 @@ sup {
}
function show_text(newtext){
var match = /-webkit-text-fill-color:[^;\"]+/gi;
if(timer != null)
clearTimeout(timer);
text_fade('lyricsmain', newtext);
text_fade('lyricsoutline', newtext);
text_fade('lyricsshadow', newtext);
text_fade('lyricsshadow', newtext.replace(match, ""));
if(text_opacity()==1) return;
timer = setTimeout(function(){
show_text(newtext);

16
openlp/core/ui/mainwindow.py
View File

@ -483,7 +483,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
self.pluginManager = PluginManager(pluginpath)
self.pluginHelpers = {}
self.image_manager = ImageManager()
self.imageManager = ImageManager()
# Set up the interface
self.setupUi(self)
# Load settings after setupUi so default UI sizes are overwritten
@ -552,7 +552,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# warning cyclic dependency
# renderer needs to call ThemeManager and
# ThemeManager needs to call Renderer
self.renderer = Renderer(self.image_manager, self.themeManagerContents)
self.renderer = Renderer(self.imageManager, self.themeManagerContents)
# Define the media Dock Manager
self.mediaDockManager = MediaDockManager(self.mediaToolBox)
log.info(u'Load Plugins')
@ -598,6 +598,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Once all components are initialised load the Themes
log.info(u'Load Themes')
self.themeManagerContents.loadThemes(True)
# Hide/show the theme combobox on the service manager
Receiver.send_message(u'theme_update_global')
# Reset the cursor
Receiver.send_message(u'cursor_normal')
def setAutoLanguage(self, value):
@ -652,13 +655,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.modeLiveItem.setChecked(True)
def appStartup(self):
# Give all the plugins a chance to perform some tasks at startup
"""
Give all the plugins a chance to perform some tasks at startup
"""
Receiver.send_message(u'openlp_process_events')
for plugin in self.pluginManager.plugins:
if plugin.isActive():
Receiver.send_message(u'openlp_process_events')
plugin.appStartup()
Receiver.send_message(u'openlp_process_events')
Receiver.send_message(u'openlp_process_events')
def firstTime(self):
# Import themes if first time
@ -809,7 +813,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
log.debug(u'screenChanged')
Receiver.send_message(u'cursor_busy')
self.image_manager.update_display()
self.imageManager.update_display()
self.renderer.update_display()
self.previewController.screenSizeChanged()
self.liveController.screenSizeChanged()

2
openlp/core/ui/pluginform.py
View File

@ -114,7 +114,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
self._clearDetails()
return
plugin_name_singular = \
self.pluginListWidget.currentItem().text().split(u' ')[0]
self.pluginListWidget.currentItem().text().split(u'(')[0][:-1]
self.activePlugin = None
for plugin in self.parent().pluginManager.plugins:
if plugin.nameStrings[u'singular'] == plugin_name_singular:

8
openlp/core/ui/slidecontroller.py
View File

@ -63,7 +63,7 @@ class SlideController(QtGui.QWidget):
self.screens = ScreenList.get_instance()
self.ratio = float(self.screens.current[u'size'].width()) / \
float(self.screens.current[u'size'].height())
self.image_manager = self.parent().image_manager
self.imageManager = self.parent().imageManager
self.loopList = [
u'Play Slides Menu',
u'Loop Separator',
@ -425,7 +425,7 @@ class SlideController(QtGui.QWidget):
# rebuild display as screen size changed
if self.display:
self.display.close()
self.display = MainDisplay(self, self.image_manager, self.isLive)
self.display = MainDisplay(self, self.imageManager, self.isLive)
self.display.alertTab = self.alertTab
self.display.setup()
if self.isLive:
@ -632,8 +632,8 @@ class SlideController(QtGui.QWidget):
# If current slide set background to image
if framenumber == slideno:
self.serviceItem.bg_image_bytes = \
self.image_manager.get_image_bytes(frame[u'title'])
image = self.image_manager.get_image(frame[u'title'])
self.imageManager.get_image_bytes(frame[u'title'])
image = self.imageManager.get_image(frame[u'title'])
label.setPixmap(QtGui.QPixmap.fromImage(image))
self.previewListWidget.setCellWidget(framenumber, 0, label)
slideHeight = width * self.parent().renderer.screen_ratio

46
openlp/plugins/custom/customplugin.py
View File

@ -46,7 +46,7 @@ class CustomPlugin(Plugin):
log.info(u'Custom Plugin loaded')
def __init__(self, plugin_helpers):
Plugin.__init__(self, u'Custom', plugin_helpers,
Plugin.__init__(self, u'Custom Slide', plugin_helpers,
CustomMediaItem, CustomTab)
self.weight = -5
self.manager = Manager(u'custom', init_schema)
@ -54,11 +54,11 @@ class CustomPlugin(Plugin):
self.icon = build_icon(self.icon_path)
def about(self):
about_text = translate('CustomPlugin', '<strong>Custom Plugin</strong>'
'<br />The custom plugin provides the ability to set up custom '
'text slides that can be displayed on the screen the same way '
'songs are. This plugin provides greater freedom over the songs '
'plugin.')
about_text = translate('CustomPlugin', '<strong>Custom Slide Plugin'
'</strong><br />The custom slide plugin provides the ability to '
'set up custom text slides that can be displayed on the screen '
'the same way songs are. This plugin provides greater freedom '
'over the songs plugin.')
return about_text
def usesTheme(self, theme):
@ -95,27 +95,31 @@ class CustomPlugin(Plugin):
"""
## Name PluginList ##
self.textStrings[StringContent.Name] = {
u'singular': translate('CustomsPlugin', 'Custom', 'name singular'),
u'plural': translate('CustomsPlugin', 'Customs', 'name plural')
u'singular': translate('CustomPlugin', 'Custom Slide',
'name singular'),
u'plural': translate('CustomPlugin', 'Custom Slides',
'name plural')
}
## Name for MediaDockManager, SettingsManager ##
self.textStrings[StringContent.VisibleName] = {
u'title': translate('CustomsPlugin', 'Custom', 'container title')
u'title': translate('CustomPlugin', 'Custom Slides',
'container title')
}
# Middle Header Bar
tooltips = {
u'load': translate('CustomsPlugin', 'Load a new Custom.'),
u'import': translate('CustomsPlugin', 'Import a Custom.'),
u'new': translate('CustomsPlugin', 'Add a new Custom.'),
u'edit': translate('CustomsPlugin', 'Edit the selected Custom.'),
u'delete': translate('CustomsPlugin',
'Delete the selected Custom.'),
u'preview': translate('CustomsPlugin',
'Preview the selected Custom.'),
u'live': translate('CustomsPlugin',
'Send the selected Custom live.'),
u'service': translate('CustomsPlugin',
'Add the selected Custom to the service.')
u'load': translate('CustomPlugin', 'Load a new custom slide.'),
u'import': translate('CustomPlugin', 'Import a custom slide.'),
u'new': translate('CustomPlugin', 'Add a new custom slide.'),
u'edit': translate('CustomPlugin',
'Edit the selected custom slide.'),
u'delete': translate('CustomPlugin',
'Delete the selected custom slide.'),
u'preview': translate('CustomPlugin',
'Preview the selected custom slide.'),
u'live': translate('CustomPlugin',
'Send the selected custom slide live.'),
u'service': translate('CustomPlugin',
'Add the selected custom slide to the service.')
}
self.setPluginUiTextStrings(tooltips)

14
openlp/plugins/images/imageplugin.py
View File

@ -70,14 +70,14 @@ class ImagePlugin(Plugin):
}
# Middle Header Bar
tooltips = {
u'load': translate('ImagePlugin', 'Load a new Image.'),
u'load': translate('ImagePlugin', 'Load a new image.'),
u'import': u'',
u'new': translate('ImagePlugin', 'Add a new Image.'),
u'edit': translate('ImagePlugin', 'Edit the selected Image.'),
u'delete': translate('ImagePlugin', 'Delete the selected Image.'),
u'preview': translate('ImagePlugin', 'Preview the selected Image.'),
u'live': translate('ImagePlugin', 'Send the selected Image live.'),
u'new': translate('ImagePlugin', 'Add a new image.'),
u'edit': translate('ImagePlugin', 'Edit the selected image.'),
u'delete': translate('ImagePlugin', 'Delete the selected image.'),
u'preview': translate('ImagePlugin', 'Preview the selected image.'),
u'live': translate('ImagePlugin', 'Send the selected image live.'),
u'service': translate('ImagePlugin',
'Add the selected Image to the service.')
'Add the selected image to the service.')
}
self.setPluginUiTextStrings(tooltips)

14
openlp/plugins/media/mediaplugin.py
View File

@ -112,14 +112,14 @@ class MediaPlugin(Plugin):
}
# Middle Header Bar
tooltips = {
u'load': translate('MediaPlugin', 'Load a new Media.'),
u'load': translate('MediaPlugin', 'Load new media.'),
u'import': u'',
u'new': translate('MediaPlugin', 'Add a new Media.'),
u'edit': translate('MediaPlugin', 'Edit the selected Media.'),
u'delete': translate('MediaPlugin', 'Delete the selected Media.'),
u'preview': translate('MediaPlugin', 'Preview the selected Media.'),
u'live': translate('MediaPlugin', 'Send the selected Media live.'),
u'new': translate('MediaPlugin', 'Add new media.'),
u'edit': translate('MediaPlugin', 'Edit the selected media.'),
u'delete': translate('MediaPlugin', 'Delete the selected media.'),
u'preview': translate('MediaPlugin', 'Preview the selected media.'),
u'live': translate('MediaPlugin', 'Send the selected media live.'),
u'service': translate('MediaPlugin',
'Add the selected Media to the service.')
'Add the selected media to the service.')
}
self.setPluginUiTextStrings(tooltips)

10
openlp/plugins/presentations/presentationplugin.py
View File

@ -169,17 +169,17 @@ class PresentationPlugin(Plugin):
# Middle Header Bar
tooltips = {
u'load': translate('PresentationPlugin',
'Load a new Presentation.'),
'Load a new presentation.'),
u'import': u'',
u'new': u'',
u'edit': u'',
u'delete': translate('PresentationPlugin',
'Delete the selected Presentation.'),
'Delete the selected presentation.'),
u'preview': translate('PresentationPlugin',
'Preview the selected Presentation.'),
'Preview the selected presentation.'),
u'live': translate('PresentationPlugin',
'Send the selected Presentation live.'),
'Send the selected presentation live.'),
u'service': translate('PresentationPlugin',
'Add the selected Presentation to the service.')
'Add the selected presentation to the service.')
}
self.setPluginUiTextStrings(tooltips)

12
openlp/plugins/songs/songsplugin.py
View File

@ -215,13 +215,13 @@ class SongsPlugin(Plugin):
tooltips = {
u'load': u'',
u'import': u'',
u'new': translate('SongsPlugin', 'Add a new Song.'),
u'edit': translate('SongsPlugin', 'Edit the selected Song.'),
u'delete': translate('SongsPlugin', 'Delete the selected Song.'),
u'preview': translate('SongsPlugin', 'Preview the selected Song.'),
u'live': translate('SongsPlugin', 'Send the selected Song live.'),
u'new': translate('SongsPlugin', 'Add a new song.'),
u'edit': translate('SongsPlugin', 'Edit the selected song.'),
u'delete': translate('SongsPlugin', 'Delete the selected song.'),
u'preview': translate('SongsPlugin', 'Preview the selected song.'),
u'live': translate('SongsPlugin', 'Send the selected song live.'),
u'service': translate('SongsPlugin',
'Add the selected Song to the service.')
'Add the selected song to the service.')
}
self.setPluginUiTextStrings(tooltips)