openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #13056
[Merge] lp:~googol/openlp/i18n into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/i18n into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/i18n/+merge/84386
Hello,
- fixed a few tooltip strings
--
https://code.launchpad.net/~googol/openlp/i18n/+merge/84386
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/i18n into lp:openlp.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2011-12-02 21:33:11 +0000
+++ openlp/core/ui/media/mediacontroller.py 2011-12-03 20:39:31 +0000
@@ -206,15 +206,15 @@
controller.mediabar = OpenLPToolbar(controller)
controller.mediabar.addToolbarButton(
u'media_playback_play', u':/slides/media_playback_start.png',
- translate('OpenLP.SlideController', 'Start playing media'),
+ translate('OpenLP.SlideController', 'Start playing media.'),
controller.sendToPlugins)
controller.mediabar.addToolbarButton(
u'media_playback_pause', u':/slides/media_playback_pause.png',
- translate('OpenLP.SlideController', 'Pause playing media'),
+ translate('OpenLP.SlideController', 'Pause playing media.'),
controller.sendToPlugins)
controller.mediabar.addToolbarButton(
u'media_playback_stop', u':/slides/media_playback_stop.png',
- translate('OpenLP.SlideController', 'Stop playing media'),
+ translate('OpenLP.SlideController', 'Stop playing media.'),
controller.sendToPlugins)
# Build the seekSlider.
controller.seekSlider = QtGui.QSlider(QtCore.Qt.Horizontal)
@@ -223,7 +223,7 @@
'OpenLP.SlideController', 'Video position.'))
controller.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
controller.seekSlider.setObjectName(u'seek_slider')
- controller.mediabar.addToolbarWidget(u'Seek Slider',
+ controller.mediabar.addToolbarWidget(u'Seek Slider',
controller.seekSlider)
# Build the volumeSlider.
controller.volumeSlider = QtGui.QSlider(QtCore.Qt.Horizontal)
@@ -236,7 +236,7 @@
controller.volumeSlider.setValue(controller.media_info.volume)
controller.volumeSlider.setGeometry(QtCore.QRect(90, 160, 221, 24))
controller.volumeSlider.setObjectName(u'volume_slider')
- controller.mediabar.addToolbarWidget(u'Audio Volume',
+ controller.mediabar.addToolbarWidget(u'Audio Volume',
controller.volumeSlider)
control_panel.addWidget(controller.mediabar)
controller.mediabar.setVisible(False)
@@ -255,7 +255,7 @@
def setup_display(self, display):
"""
- After a new display is configured, all media related widget will be
+ After a new display is configured, all media related widget will be
created too
"""
# clean up possible running old media files
@@ -276,13 +276,13 @@
def set_controls_visible(self, controller, value):
# Generic controls
controller.mediabar.setVisible(value)
- # Special controls: Here media type specific Controls will be enabled
+ # Special controls: Here media type specific Controls will be enabled
# (e.g. for DVD control, ...)
# TODO
def resize(self, controller, display, player):
"""
- After Mainwindow changes or Splitter moved all related media widgets
+ After Mainwindow changes or Splitter moved all related media widgets
have to be resized
"""
player.resize(display)
@@ -389,7 +389,7 @@
def video_play(self, msg, status=True):
"""
Responds to the request to play a loaded video
-
+
``msg``
First element is the controller which should be used
"""
Follow ups