From 52cce54414563f942020e83b97957ba0b474c588 Mon Sep 17 00:00:00 2001 From: rimach Date: Wed, 9 Mar 2011 22:14:43 +0100 Subject: [PATCH 1/2] bugfixing --- openlp/core/ui/servicemanager.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 623c2d641..f60771786 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -49,6 +49,19 @@ class ServiceManagerList(QtGui.QTreeWidget): QtGui.QTreeWidget.__init__(self, parent) self.mainwindow = mainwindow + def keyPressEvent(self, event): + if isinstance(event, QtGui.QKeyEvent): + #here accept the event and do something + if event.key() == QtCore.Qt.Key_Up: + self.mainwindow.onMoveSelectionUp() + event.accept() + elif event.key() == QtCore.Qt.Key_Down: + self.mainwindow.onMoveSelectionDown() + event.accept() + event.ignore() + else: + event.ignore() + def mouseMoveEvent(self, event): """ Drag and drop event does not care what data is selected @@ -171,20 +184,6 @@ class ServiceManager(QtGui.QWidget): translate('OpenLP.ServiceManager', 'Move item to the end of the service.'), self.onServiceEnd, shortcut=QtCore.Qt.Key_End) - self.serviceManagerList.down = self.orderToolbar.addToolbarButton( - translate('OpenLP.ServiceManager', 'Move &down'), - None, - translate('OpenLP.ServiceManager', - 'Moves the selection down the window.'), - self.onMoveSelectionDown, shortcut=QtCore.Qt.Key_Down) - self.serviceManagerList.down.setVisible(False) - self.serviceManagerList.up = self.orderToolbar.addToolbarButton( - translate('OpenLP.ServiceManager', 'Move up'), - None, - translate('OpenLP.ServiceManager', - 'Moves the selection up the window.'), - self.onMoveSelectionUp, shortcut=QtCore.Qt.Key_Up) - self.serviceManagerList.up.setVisible(False) self.orderToolbar.addSeparator() self.serviceManagerList.delete = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', '&Delete From Service'), @@ -293,8 +292,6 @@ class ServiceManager(QtGui.QWidget): self.serviceManagerList.makeLive, self.serviceManagerList.moveTop, self.serviceManagerList.moveBottom, - self.serviceManagerList.up, - self.serviceManagerList.down ]) self.configUpdated() @@ -305,8 +302,6 @@ class ServiceManager(QtGui.QWidget): actionList.add_action(self.serviceManagerList.moveTop, u'Service') actionList.add_action(self.serviceManagerList.moveBottom, u'Service') actionList.add_action(self.serviceManagerList.makeLive, u'Service') - actionList.add_action(self.serviceManagerList.up, u'Service') - actionList.add_action(self.serviceManagerList.down, u'Service') def setModified(self, modified=True): """ From 65ce3c84d2652439285861a909d791ffba28f627 Mon Sep 17 00:00:00 2001 From: rimach Date: Thu, 24 Nov 2011 22:25:38 +0100 Subject: [PATCH 2/2] fix video play problem with newer webkit version and webkit player --- openlp/core/lib/htmlbuilder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 5dfe00d36..4a0e7275f 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -121,8 +121,8 @@ sup { } switch(state){ case 'init': - vid.src = path; - vid2.src = path; + vid.src = 'file:///' + path; + vid2.src = 'file:///' + path; if(loop == null) loop = false; vid.looping = loop; vid2.looping = loop;