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

r1522

This commit is contained in:
Andreas Preikschat 2011-05-08 07:50:50 +02:00
parent de54c419ce 6cb329dbc4
commit f460cc54ab
10 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/printservicedialog.py
View File

@ -152,7 +152,7 @@ class Ui_PrintServiceDialog(object):
self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm', self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
'Include slide text if available')) 'Include slide text if available'))
self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm', self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm',
'Add page break before each text item.')) 'Add page break before each text item'))
self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm', self.notesCheckBox.setText(translate('OpenLP.PrintServiceForm',
'Include service item notes')) 'Include service item notes'))
self.metaDataCheckBox.setText(translate('OpenLP.PrintServiceForm', self.metaDataCheckBox.setText(translate('OpenLP.PrintServiceForm',
@ -164,4 +164,5 @@ class Ui_PrintServiceDialog(object):
self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred]) self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred])
self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.SeventyFive]) self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.SeventyFive])
self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Fifty]) self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Fifty])
self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.TwentyFive]) self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.TwentyFive])

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

@ -115,11 +115,11 @@ class ServiceManager(QtGui.QWidget):
UiStrings().CreateService, self.onNewServiceClicked) UiStrings().CreateService, self.onNewServiceClicked)
self.toolbar.addToolbarButton( self.toolbar.addToolbarButton(
UiStrings().OpenService, u':/general/general_open.png', UiStrings().OpenService, u':/general/general_open.png',
translate('OpenLP.ServiceManager', 'Load an existing service'), translate('OpenLP.ServiceManager', 'Load an existing service.'),
self.onLoadServiceClicked) self.onLoadServiceClicked)
self.toolbar.addToolbarButton( self.toolbar.addToolbarButton(
UiStrings().SaveService, u':/general/general_save.png', UiStrings().SaveService, u':/general/general_save.png',
translate('OpenLP.ServiceManager', 'Save this service'), translate('OpenLP.ServiceManager', 'Save this service.'),
self.saveFile) self.saveFile)
self.toolbar.addSeparator() self.toolbar.addSeparator()
self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings().Theme, self) self.themeLabel = QtGui.QLabel(u'%s:' % UiStrings().Theme, self)
@ -128,7 +128,7 @@ class ServiceManager(QtGui.QWidget):
self.toolbar.addToolbarWidget(u'ThemeLabel', self.themeLabel) self.toolbar.addToolbarWidget(u'ThemeLabel', self.themeLabel)
self.themeComboBox = QtGui.QComboBox(self.toolbar) self.themeComboBox = QtGui.QComboBox(self.toolbar)
self.themeComboBox.setToolTip(translate('OpenLP.ServiceManager', self.themeComboBox.setToolTip(translate('OpenLP.ServiceManager',
'Select a theme for the service')) 'Select a theme for the service.'))
self.themeComboBox.setSizeAdjustPolicy( self.themeComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToMinimumContentsLength) QtGui.QComboBox.AdjustToMinimumContentsLength)
self.themeComboBox.setSizePolicy( self.themeComboBox.setSizePolicy(

18
openlp/plugins/bibles/bibleplugin.py
View File

@ -137,13 +137,15 @@ class BiblePlugin(Plugin):
# Middle Header Bar # Middle Header Bar
tooltips = { tooltips = {
u'load': u'', u'load': u'',
u'import': translate('BiblesPlugin', 'Import a Bible'), u'import': translate('BiblesPlugin', 'Import a Bible.'),
u'new': translate('BiblesPlugin', 'Add a new Bible'), u'new': translate('BiblesPlugin', 'Add a new Bible.'),
u'edit': translate('BiblesPlugin', 'Edit the selected Bible'), u'edit': translate('BiblesPlugin', 'Edit the selected Bible.'),
u'delete': translate('BiblesPlugin', 'Delete the selected Bible'), u'delete': translate('BiblesPlugin', 'Delete the selected Bible.'),
u'preview': translate('BiblesPlugin', 'Preview the selected Bible'), u'preview': translate('BiblesPlugin',
u'live': translate('BiblesPlugin', 'Send the selected Bible live'), 'Preview the selected Bible.'),
u'live': translate('BiblesPlugin', 'Send the selected Bible live.'),
u'service': translate('BiblesPlugin', u'service': translate('BiblesPlugin',
'Add the selected Bible to the service') 'Add the selected Bible to the service.')
} }
self.setPluginUiTextStrings(tooltips) self.setPluginUiTextStrings(tooltips)

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

@ -106,17 +106,18 @@ class CustomPlugin(Plugin):
} }
# Middle Header Bar # Middle Header Bar
tooltips = { tooltips = {
u'load': translate('CustomsPlugin', 'Load a new Custom'), u'load': translate('CustomsPlugin', 'Load a new Custom.'),
u'import': translate('CustomsPlugin', 'Import a Custom'), u'import': translate('CustomsPlugin', 'Import a Custom.'),
u'new': translate('CustomsPlugin', 'Add a new Custom'), u'new': translate('CustomsPlugin', 'Add a new Custom.'),
u'edit': translate('CustomsPlugin', 'Edit the selected Custom'), u'edit': translate('CustomsPlugin', 'Edit the selected Custom.'),
u'delete': translate('CustomsPlugin', 'Delete the selected Custom'), u'delete': translate('CustomsPlugin',
'Delete the selected Custom.'),
u'preview': translate('CustomsPlugin', u'preview': translate('CustomsPlugin',
'Preview the selected Custom'), 'Preview the selected Custom.'),
u'live': translate('CustomsPlugin', u'live': translate('CustomsPlugin',
'Send the selected Custom live'), 'Send the selected Custom live.'),
u'service': translate('CustomsPlugin', u'service': translate('CustomsPlugin',
'Add the selected Custom to the service') 'Add the selected Custom to the service.')
} }
self.setPluginUiTextStrings(tooltips) self.setPluginUiTextStrings(tooltips)

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

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

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

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

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

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

6
openlp/plugins/remotes/html/openlp.js
View File

@ -112,6 +112,7 @@ window.OpenLP = {
$.getJSON( $.getJSON(
"/api/poll", "/api/poll",
function (data, status) { function (data, status) {
var prevItem = OpenLP.currentItem;
OpenLP.currentSlide = data.results.slide; OpenLP.currentSlide = data.results.slide;
OpenLP.currentItem = data.results.item; OpenLP.currentItem = data.results.item;
if ($("#service-manager").is(":visible")) { if ($("#service-manager").is(":visible")) {
@ -129,6 +130,10 @@ window.OpenLP = {
$("#service-manager div[data-role=content] ul[data-role=listview]").listview("refresh"); $("#service-manager div[data-role=content] ul[data-role=listview]").listview("refresh");
} }
if ($("#slide-controller").is(":visible")) { if ($("#slide-controller").is(":visible")) {
if (prevItem != OpenLP.currentItem) {
OpenLP.loadController();
return;
}
var idx = 0; var idx = 0;
$("#slide-controller div[data-role=content] ul[data-role=listview] li").attr("data-theme", "c").removeClass("ui-btn-up-e").addClass("ui-btn-up-c"); $("#slide-controller div[data-role=content] ul[data-role=listview] li").attr("data-theme", "c").removeClass("ui-btn-up-e").addClass("ui-btn-up-c");
$("#slide-controller div[data-role=content] ul[data-role=listview] li a").each(function () { $("#slide-controller div[data-role=content] ul[data-role=listview] li a").each(function () {
@ -200,5 +205,6 @@ $("#controller-unblank").live("click", OpenLP.unblankDisplay);
// Alerts // Alerts
$("#alert-submit").live("click", OpenLP.showAlert); $("#alert-submit").live("click", OpenLP.showAlert);
// Poll the server twice a second to get any updates. // Poll the server twice a second to get any updates.
$.ajaxSetup({ cache: false });
setInterval("OpenLP.pollServer();", 500); setInterval("OpenLP.pollServer();", 500);
OpenLP.pollServer(); OpenLP.pollServer();

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

@ -141,7 +141,7 @@ class SongMediaItem(MediaManagerItem):
self.searchTextButton.setText(UiStrings().Search) self.searchTextButton.setText(UiStrings().Search)
self.maintenanceAction.setText(SongStrings.SongMaintenance) self.maintenanceAction.setText(SongStrings.SongMaintenance)
self.maintenanceAction.setToolTip(translate('SongsPlugin.MediaItem', self.maintenanceAction.setToolTip(translate('SongsPlugin.MediaItem',
'Maintain the lists of authors, topics and books')) 'Maintain the lists of authors, topics and books.'))
def initialise(self): def initialise(self):
self.searchTextEdit.setSearchTypes([ self.searchTextEdit.setSearchTypes([

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

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