openlp-core team mailing list archive

[Meinert Jordan <meinertjordan@xxxxxxxxxx>]

Meinert Jordan has proposed merging lp:~m2j/openlp/smallfix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~m2j/openlp/smallfix/+merge/86270

Bug #899312

Tracking the seekSlider on valueChanged() interferes with the WebKit backend.
-- 
https://code.launchpad.net/~m2j/openlp/smallfix/+merge/86270
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/smallfix into lp:openlp.

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2011-12-06 21:42:34 +0000
+++ openlp/core/ui/media/mediacontroller.py	2011-12-19 17:05:28 +0000
@@ -219,6 +219,7 @@
         # Build the seekSlider.
         controller.seekSlider = QtGui.QSlider(QtCore.Qt.Horizontal)
         controller.seekSlider.setMaximum(1000)
+        controller.seekSlider.setTracking(False)
         controller.seekSlider.setToolTip(translate(
             'OpenLP.SlideController', 'Video position.'))
         controller.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
@@ -231,6 +232,7 @@
         controller.volumeSlider.setTickPosition(QtGui.QSlider.TicksAbove)
         controller.volumeSlider.setMinimum(0)
         controller.volumeSlider.setMaximum(100)
+        controller.volumeSlider.setTracking(True)
         controller.volumeSlider.setToolTip(translate(
             'OpenLP.SlideController', 'Audio Volume.'))
         controller.volumeSlider.setValue(controller.media_info.volume)
@@ -242,9 +244,9 @@
         controller.mediabar.setVisible(False)
         # Signals
         QtCore.QObject.connect(controller.seekSlider,
-            QtCore.SIGNAL(u'sliderMoved(int)'), controller.sendToPlugins)
+            QtCore.SIGNAL(u'valueChanged(int)'), controller.sendToPlugins)
         QtCore.QObject.connect(controller.volumeSlider,
-            QtCore.SIGNAL(u'sliderMoved(int)'), controller.sendToPlugins)
+            QtCore.SIGNAL(u'valueChanged(int)'), controller.sendToPlugins)
 
     def setup_special_controls(self, controller, control_panel):
         """