Merge lp:~raoul-snyman/openlp/slidecontroller into lp:openlp

[Raoul Snyman]

[Raoul Snyman (raoul-snyman)]

Just changed the key press events to a more intuitive set:

1. Up goes to the previous slide
2. Down goes to the next slide
3. Page Up goes to the first slide
4. Page Down goes to the next slide

[Raoul Snyman (raoul-snyman)]

I mean, Page Down goes to the *last* slide

[Martin Thompson (mjthompson)]

On Sun, Jun 21, 2009 at 07:50:16PM -0000 or thereabouts, Raoul Snyman wrote:
> Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/slidecontroller into lp:openlp.
>
> Requested reviews:
> openlp.org Core (openlp-core)
>
> Just changed the key press events to a more intuitive set:
>
> 1. Up goes to the previous slide
> 2. Down goes to the next slide
> 3. Page Up goes to the first slide
> 4. Page Down goes to the next slide

Shouldn't Home and End go to the first/last slides? Page up/down should move by a "screenfull of slides" (if we can establish that?)

Martin

--
<email address hidden>
  Don't act paranoid - it only attracts Their attention.

[Tim Bentley (trb143)]

Approved.
Page Up / Down could be done but the maths would be complex.

Slides per window would be needed.
Also were in the window was the slide. The view can scroll

review: Approve

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-06-21 16:26:33 +0000
+++ openlp/core/ui/slidecontroller.py	2009-06-21 19:41:01 +0000
@@ -104,11 +104,17 @@
     def keyPressEvent(self, event):
         if type(event) == QtGui.QKeyEvent:
             #here accept the event and do something
-            if event.key() == QtCore.Qt.Key_PageUp:
+            if event.key() == QtCore.Qt.Key_Up:
                 self.parent.onSlideSelectedPrevious()
                 event.accept()
+            elif event.key() == QtCore.Qt.Key_Down:
+                self.parent.onSlideSelectedNext()
+                event.accept()
+            elif event.key() == QtCore.Qt.Key_PageUp:
+                self.parent.onSlideSelectedFirst()
+                event.accept()
             elif event.key() == QtCore.Qt.Key_PageDown:
-                self.parent.onSlideSelectedNext()
+                self.parent.onSlideSelectedLast()
                 event.accept()
             event.ignore()
         else: