OpenLP

Merge lp:~trb143/openlp/fixes into lp:openlp

  1. fixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Superseded
Proposed branch: lp:~trb143/openlp/fixes
Merge into: lp:openlp
Diff against target: 133 lines
4 files modified
openlp-1to2-converter.py (+7/-1)
openlp/core/lib/eventreceiver.py (+7/-0)
openlp/core/ui/slidecontroller.py (+15/-4)
openlp/plugins/songs/lib/mediaitem.py (+1/-2)
To merge this branch: bzr merge lp:~trb143/openlp/fixes
Reviewer Review Type Date Requested Status
OpenLP Core Pending
Review via email: mp+13899@code.launchpad.net

This proposal has been superseded by a proposal from 2009-10-25.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Maintain position on slidecontroller when editing and redisplaying songs

lp:~trb143/openlp/fixes updated
633. By Tim Bentley

More Song editing fixes

634. By Tim Bentley

Finally fix redisplaying of correct slide

635. By Tim Bentley

Audit report work

636. By Tim Bentley

Headr626

637. By Tim Bentley

Service Items can now have their theme changes at run time.

638. By Tim Bentley

"Save and Preview" added to Song editor

639. By Tim Bentley

Yet more audit work

640. By Tim Bentley

Headr629

641. By Tim Bentley

Add Song verses to menu bar

642. By Tim Bentley

Add Song Tab option to remove them

643. By Tim Bentley

Split if line contains 3 --- can allow for spaces at end of line

644. By Tim Bentley

Fix Line split code. Stop SlideController being editied

645. By Tim Bentley

Biblegateway addition

646. By Tim Bentley

Move Audit to SongUsage

647. By Tim Bentley

More BibleGateway work

648. By Tim Bentley

More BibleGateway work - no prints

649. By Tim Bentley

Fix typos

650. By Tim Bentley

Add BibleGateway List and access it

651. By Tim Bentley

BibleGateway - Download files and add to selections

652. By Tim Bentley

Style fixes

653. By Tim Bentley

Strange spacing appeared from nowhere

654. By Tim Bentley

Songs now have remote edit working

655. By Tim Bentley

More remote edit changes

656. By Tim Bentley

headr632

657. By Tim Bentley

Works for now

658. By Tim Bentley

Headr633 and merge resolution

659. By Tim Bentley

Headr635

660. By Tim Bentley

Minor fixes

661. By Tim Bentley

Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit

662. By Tim Bentley

Add Save service on New code, and configuration to turn it off.

663. By Tim Bentley

Fix theme editing where previous image is cached on change of image

664. By Tim Bentley

Move version check

665. By Tim Bentley

Headr639

666. By Tim Bentley

Fix names before Raoul sees them

667. By Tim Bentley

Finish remote editing of ServiceManager by updating live

668. By Tim Bentley

Sort out number of buttons on SlideController to match song and make more KITT like

669. By Tim Bentley

Fix error handling for double exception call. Added debugging for Song XML class

670. By Tim Bentley

Fix up handling of service items in the slide controllers and stop editing issues

671. By Tim Bentley

Custom plugin fixes

672. By Tim Bentley

Headr642

673. By Tim Bentley

Clean up version notifications and checking

674. By Tim Bentley

Remove unused file

675. By Tim Bentley

Headr644

676. By Tim Bentley

Headr646

677. By Tim Bentley

Fixes from last few merges

678. By Tim Bentley

Headr468 and fix

679. By Tim Bentley

Headr650

680. By Tim Bentley

Cleanup Remote Editing again

681. By Tim Bentley

Headr651

682. By Tim Bentley

Fix phantom expansion in Service Manager

683. By Tim Bentley

Fix song editing

684. By Tim Bentley

Song editing utf8 fixes part 1

685. By Tim Bentley

Headr655

686. By Tim Bentley

Song editing utf8 fixes part 2

687. By Tim Bentley

Headr656

688. By Tim Bentley

More remote editing cleanups

689. By Tim Bentley

Headr657

690. By Tim Bentley

Remote Edit for Custom

691. By Tim Bentley

Headr658

692. By Tim Bentley

Fix error in previous merge for ThemeManager
Get Custom Working with remote editing

693. By Tim Bentley

Headr660

694. By Tim Bentley

Remove "Can_be_disabled" as no longer require
Sort out status handling in plugin form.

695. By Tim Bentley

Fix blocking for Active/Inactive

696. By Tim Bentley

Head552

697. By Tim Bentley

Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media"

698. By Tim Bentley

Fix strange commit

699. By Tim Bentley

Add Icon files

700. By Tim Bentley

Add test to stop icons going over the limit

701. By Tim Bentley

Fix bugs in previous merges with icons and themes

702. By Tim Bentley

remove print for log

703. By Tim Bentley

Clean up slide sizes part 1

704. By Tim Bentley

Clean up slide sizes part 2

705. By Tim Bentley

Fix up toolbar handing to stop toolbar going off screen
Added Media Toolbar for the media items
Added it to Preview
Added and wired in a volume control

706. By Tim Bentley

Try to hide display screens for previews

707. By Tim Bentley

Fix media previews ti work and not display the extra screens

708. By Tim Bentley

Add Media Preview to slideController

709. By Tim Bentley

Reset Preview when exiting media

710. By Tim Bentley

Headr666

711. By Tim Bentley

Headr667

712. By Tim Bentley

spacing cleanups

713. By Tim Bentley

SlideController cleanups

714. By Tim Bentley

Slide Controller and Transition changes

715. By Tim Bentley

Headr668

716. By Tim Bentley

Transitions between slides

717. By Tim Bentley

Fix saving and reloading of media items

718. By Tim Bentley

Remove extra Video

719. By Tim Bentley

Remove transition code

720. By Tim Bentley

ServiceItem cleanup - rename arrays

721. By Tim Bentley

ServiceItem cleanup - hide lists

722. By Tim Bentley

ServiceItem cleanup - hide lists 2

723. By Tim Bentley

ServiceItem cleanup - remove CommandItem

724. By Tim Bentley

ServiceItem cleanup - sort out name format errors

725. By Tim Bentley

ServiceItem cleanup - fix media playing

726. By Tim Bentley

ServiceItem cleanup - remove code duplication

727. By Tim Bentley

ServiceItem cleanup - fix presentation issues

728. By Tim Bentley

Remove unneed varables
Move code into serviceItem
Fix up splitter code

729. By Tim Bentley

headr670

730. By Tim Bentley

Renderer cleanups and fixes

731. By Tim Bentley

Head671 and fixes

732. By Tim Bentley

Head672

733. By Tim Bentley

Fix up line splitter in the renderer

734. By Tim Bentley

Headr673

735. By Tim Bentley

Fix renderer again

736. By Tim Bentley

start testing screen width v Font size

737. By Tim Bentley

Start making renderer gushie proof

738. By Tim Bentley

Fix up renderer and enforce minimum width

Unmerged revisions

738. By Tim Bentley

Fix up renderer and enforce minimum width

737. By Tim Bentley

Start making renderer gushie proof

736. By Tim Bentley

start testing screen width v Font size

735. By Tim Bentley

Fix renderer again

734. By Tim Bentley

Headr673

733. By Tim Bentley

Fix up line splitter in the renderer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp-1to2-converter.py' (properties changed: -x to +x)
2--- openlp-1to2-converter.py 2009-10-24 07:14:11 +0000
3+++ openlp-1to2-converter.py 2009-10-25 08:11:10 +0000
4@@ -25,7 +25,13 @@
5
6 import sys
7 import os
8-import sqlite
9+try:
10+ import sqlite
11+except:
12+ try:
13+ import pysqlite2
14+ except:
15+ print 'No Sqlite2 package available'
16 import sqlite3
17 import re
18 from optparse import OptionParser
19
20=== modified file 'openlp/core/lib/eventreceiver.py'
21--- openlp/core/lib/eventreceiver.py 2009-10-17 05:47:17 +0000
22+++ openlp/core/lib/eventreceiver.py 2009-10-25 08:11:10 +0000
23@@ -86,6 +86,13 @@
24
25 ``config_updated``
26 Informs components the config has changed
27+
28+ ``edit_song``
29+ Requests the current song on the preview display be loaded for edit
30+
31+ ``preview_song``
32+ Tells the song plugin the edit has finished and the song can be previewed
33+ Only available if the edit was triggered by the Preview button.
34 """
35 global log
36 log = logging.getLogger(u'EventReceiver')
37
38=== modified file 'openlp/core/ui/slidecontroller.py'
39--- openlp/core/ui/slidecontroller.py 2009-10-24 16:40:36 +0000
40+++ openlp/core/ui/slidecontroller.py 2009-10-25 08:11:10 +0000
41@@ -97,6 +97,8 @@
42 ]
43 self.timer_id = 0
44 self.commandItem = None
45+ self.songEdit = False
46+ self.row = 0
47 self.Panel = QtGui.QWidget(parent.ControlSplitter)
48 # Layout for holding panel
49 self.PanelLayout = QtGui.QVBoxLayout(self.Panel)
50@@ -180,6 +182,7 @@
51 self.Toolbar.addToolbarWidget(
52 u'Image SpinBox', self.DelaySpinBox)
53 self.DelaySpinBox.setSuffix(self.trUtf8(u's'))
54+ self.DelaySpinBox.setToolTip(self.trUtf8(u'Delay between slides in seconds'))
55
56 self.ControllerLayout.addWidget(self.Toolbar)
57 # Screen preview area
58@@ -289,7 +292,12 @@
59 Receiver().send_message(u'%s_start' % item.name.lower(), \
60 [item.shortname, item.service_item_path,
61 item.service_frames[0][u'title']])
62- self.displayServiceManagerItems(item, 0)
63+ slideno = 0
64+ if self.songEdit:
65+ slideno = self.row
66+ self.songEdit = False
67+ self.displayServiceManagerItems(item, slideno)
68+
69
70 def addServiceManagerItem(self, item, slideno):
71 """
72@@ -297,7 +305,7 @@
73 request the correct the toolbar of the plugin
74 Called by ServiceManager
75 """
76- log.debug(u'addServiceItem')
77+ log.debug(u'addServiceManagerItem')
78 #If old item was a command tell it to stop
79 if self.commandItem is not None and \
80 self.commandItem.service_item_type == ServiceType.Command:
81@@ -387,12 +395,13 @@
82 if this is the Live Controller also display on the screen
83 """
84 row = self.PreviewListWidget.currentRow()
85+ self.row = 0
86 if row > -1 and row < self.PreviewListWidget.rowCount():
87 if self.commandItem.service_item_type == ServiceType.Command:
88 Receiver().send_message(u'%s_slide'% self.commandItem.name.lower(), [row])
89- QtCore.QTimer.singleShot(0.5, self.grabMainDisplay)
90+ if isLive:
91+ QtCore.QTimer.singleShot(0.5, self.grabMainDisplay)
92 else:
93- #label = self.PreviewListWidget.cellWidget(row, 0)
94 frame = self.serviceitem.frames[row][u'image']
95 before = time.time()
96 if frame is None:
97@@ -401,6 +410,7 @@
98 log.info(u'Slide Rendering took %4s' % (time.time() - before))
99 if self.isLive:
100 self.parent.mainDisplay.frameView(frame)
101+ self.row = row
102
103 def grabMainDisplay(self):
104 winid = QtGui.QApplication.desktop().winId()
105@@ -474,6 +484,7 @@
106 self.onSlideSelectedNext()
107
108 def onEditSong(self):
109+ self.songEdit = True
110 Receiver().send_message(u'edit_song')
111
112 def onGoLive(self):
113
114=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
115--- openlp/plugins/songs/lib/mediaitem.py 2009-10-24 16:40:36 +0000
116+++ openlp/plugins/songs/lib/mediaitem.py 2009-10-25 08:11:10 +0000
117@@ -125,7 +125,7 @@
118 QtCore.QObject.connect(Receiver.get_receiver(),
119 QtCore.SIGNAL(u'edit_song'), self.onEventEditSong)
120 QtCore.QObject.connect(Receiver.get_receiver(),
121- QtCore.SIGNAL(u'proview_song'), self.onPreviewClick)
122+ QtCore.SIGNAL(u'preview_song'), self.onPreviewClick)
123
124 def configUpdated(self):
125 self.searchAsYouType = str_to_bool(
126@@ -181,7 +181,6 @@
127 if song.id == self.fromPreview:
128 self.fromPreview = 0
129 self.ListView.setCurrentItem(song_name)
130- self.onPreviewClick()
131
132 def displayResultsAuthor(self, searchresults):
133 log.debug(u'display results Author')