Martin Thompson
726c8826b2
Merged from trunk
2009-06-24 20:46:06 +01:00
Martin Thompson
058322620d
First video play works
2009-06-24 20:44:52 +01:00
Martin Thompson
830da7a1bf
Added some more comments
2009-06-24 20:36:33 +01:00
Tim Bentley
69df159f17
Change Topics Form handling to allow save button to be enabled.
2009-06-24 07:15:04 +01:00
Tim Bentley
ec81608fe0
Add options back in again
2009-06-24 07:11:04 +01:00
Tim Bentley
c77cbb0aa1
Clean up migration database tables
2009-06-24 07:10:13 +01:00
Tim Bentley
d1b9b5b218
Fix bugs from unicode migration in theme
...
Correct errors in Theme handling
More code style fixes on route
2009-06-24 06:17:41 +01:00
Martin Thompson
b700d143a5
Seems to be working as before
2009-06-23 21:59:38 +01:00
Martin Thompson
d2a0b296ee
Refactored media manager
2009-06-23 21:53:06 +01:00
Tim Bentley
0b0013331a
Commit Fixes to Conversion Utilities
...
Changes to Presentation Plugin
2009-06-23 17:25:40 +01:00
Tim Bentley
a1b60e034e
Fix error on song saving
2009-06-23 16:48:31 +01:00
Martin Thompson
d84c99122f
Displayed video+audio+slider
...
Tweaked some unicode strings
2009-06-22 21:44:35 +01:00
Raoul Snyman
cd11ae92a7
Changed key events to up/down = up/down slides, pgup = first, pgdn = last
2009-06-21 21:41:01 +02:00
Tim Bentley
3c255076f9
Add Author Search to Song Plugin
2009-06-21 18:45:59 +01:00
Tim Bentley
c0df49e551
Page Up / Down work on Slide Controller
...
Remove print statements
2009-06-21 17:26:33 +01:00
Tim Bentley
03904d7502
Finish OOS work with Images
...
Correct errors with existing oos
Correct bugs in Bible HTTP code for unicode conversions
2009-06-20 20:11:17 +01:00
Tim Bentley
c0797693d5
Start to add Images to oos saving
...
Found lost oos code using a zip to store stuff in.
2009-06-20 12:23:34 +01:00
Tim Bentley
5303d0673b
Fix up Image plugin so it now works again!
...
Render the images correctly to reflect the screen size
Add images to slide controller
Fix ImagePlugin selction criteria
Amend the loing format.
2009-06-20 11:44:12 +01:00
Tim Bentley
714ae4647d
preserve expansion on reorder of ServiceItems
...
Fix menu items on Mainwindow where targets are developed
2009-06-20 08:08:17 +01:00
Tim Bentley
3a65ef4dca
Add Menu Items which are finished
...
Correct last merge spelling errors
2009-06-19 20:49:00 +01:00
Tim Bentley
a95b55f905
Bug fixes to handle window events with no selection
...
Comment and file cleanups
Add extra filter to file list
ServiceManager record movements and changes to OOS to allow for files to be stored
2009-06-19 19:41:38 +01:00
Tim Bentley
42d196d751
Corrections from last merge
...
Clean up Bibles plugin
Clean up Custom plugin
Fix python 2.6 error mesage.
2009-06-17 06:11:16 +01:00
Tim Bentley
e2b8af7073
Mass Unicode migration
...
Fix bugs found in retesting the app.
2009-06-16 19:21:24 +01:00
Tim Bentley
50d41d562e
Complete Song Plugin Tidy Up
...
All lists now use same MVC mechanisms
Code in the same style.
2009-06-14 16:12:40 +01:00
Tim Bentley
69a846c7c9
Update list handling for Plugin and Edit Screen
...
Add error handling displays to show whats in error
2009-06-14 14:50:56 +01:00
Tim Bentley
d96267934c
Reload list only if title changes.
2009-06-14 08:25:39 +01:00
Tim Bentley
dc40e79ee7
Add Song Theme Handling
2009-06-14 08:02:58 +01:00
Tim Bentley
fbc16a0270
Add Song Book Handling
2009-06-14 07:48:38 +01:00
Tim Bentley
6640d79eb8
Add Topic handling
2009-06-14 07:30:09 +01:00
Tim Bentley
fb815b8ca6
New Song Works
...
Speed Up media Item
Fix Song definition
2009-06-13 17:15:55 +01:00
Tim Bentley
4f7310a5a6
Add double click to allow servicemanager to live
...
Add StateMachine to Song Editor (Verses and Authors)
Allow Authors to be Added and Removed from Songs
2009-06-13 07:46:13 +01:00
Tim Bentley
e8ae29e620
Add XML Lyrics handling to Songs.
2009-06-12 18:20:40 +01:00
Tim Bentley
dfb467e830
Add Alternative tile
...
Code the search field creations
2009-06-12 06:13:54 +01:00
Tim Bentley
56680463c7
Replace str with unicode
...
refresh the list screen when we change things
2009-06-11 22:14:12 +01:00
Tim Bentley
5871e3419d
Corrent Song footer to display correct info
...
Start of saving extra song data.
2009-06-11 06:13:10 +01:00
Tim Bentley
a6d64ef20e
update title and copyright
2009-06-10 19:04:32 +01:00
Tim Bentley
a576962181
Start of Song work
...
Clean up code to standards
2009-06-10 18:12:03 +01:00
Tim Bentley
c7b650be01
More performance changes
2009-06-10 17:20:57 +01:00
Tim Bentley
84e94058a7
Buffer calls
2009-06-10 17:14:44 +01:00
Tim Bentley
7a05a944ef
Changes to improve performance.
2009-06-10 16:54:46 +01:00
Raoul Snyman
a8307e430b
Changed QPixmaps to QImages to see the difference.
2009-06-10 17:37:33 +02:00
Tim Bentley
ade5671319
Fix up Order of Service code for Text events
2009-06-08 21:36:33 +01:00
Tim Bentley
f9f67c59ea
changes to servicemanager.py
2009-06-08 20:11:55 +01:00
Tim Bentley
594ea63e22
OOS changes
2009-06-08 20:06:42 +01:00
Raoul Snyman
a5037071e1
Split ServiceManager toolbar into 2 parts, resized docks to a smaller size again thanks to narrower ServiceManager.
...
bzr-revno: 462
2009-06-08 21:03:16 +02:00
Tim Bentley
7becc9cb56
Strange problems with events firing early.
...
Fixed bugs to stop errors by chaning initilistion order and defining varables.
Changing method names following last review.
2009-06-08 06:04:06 +01:00
Tim Bentley
47884bc340
Remove logging for Renderer to speed it up
...
Clean up Renderer
Minor change to BibleMediaitem
2009-06-08 05:30:12 +01:00
Tim Bentley
2b16aacc6e
bug fixes
2009-06-07 20:34:51 +01:00
Tim Bentley
ed73a78e95
Add double clicks to songs and customSlide
...
More code cleanups
2009-06-07 20:34:24 +01:00
Tim Bentley
aabe4e82f3
Fix problem with single number for set of chapters eg John 1:1-5.
...
Add double click feature to add preview (missing from 1.x)
Move formatting cleanups on open classes.
2009-06-07 19:39:31 +01:00
Tim Bentley
1dcd0623f1
Bug fixes for errors in search
...
Code Cleanups while in the code.
2009-06-07 17:33:33 +01:00
Raoul Snyman
debd073023
Removed erroneous "show"ing of the display form.
...
bzr-revno: 460
2009-06-05 21:59:39 +02:00
Raoul Snyman
27de0cd008
Merged proposal #7122
...
bzr-revno: 459
2009-06-05 21:23:15 +02:00
Tim Bentley
2157699814
Fix up serviceitem for better interface
...
Fix extra rndering cycle from Servicemanager
Fix Image / Custom / Bibles / Songs to use new interface
2009-06-05 20:00:57 +01:00
Raoul Snyman
473bb289b6
Fixed displaying of "display" label on the display form.
...
Display form is displayed on the correct screen at startup.
Display form switches to active non-primary screen or hidden on primary screen after set in the settings dialog.
A few syntax tidy-ups.
Made the loading and saving of things to the "registry" better.
2009-06-05 20:53:50 +02:00
Tim Bentley
472ef981b6
Fix crash on delete of last record in list
2009-06-05 17:24:42 +01:00
Tim Bentley
a9bad4aac7
From Head
2009-06-05 06:13:34 +01:00
Tim Bentley
2c5e701e10
Fix Bible import bugs for duplicate bibles
...
Fix Bibles refresh errors on nw bible creation
Finish Topic / Author and Songbook code for now
2009-06-05 06:00:26 +01:00
Raoul Snyman
1c06b5aa4c
Merged config changes into trunk.
...
bzr-revno: 455
2009-06-04 22:28:21 +02:00
Tim Bentley
11a9d28bed
Fix unicode bible import error
...
More Song changes
2009-06-04 21:06:32 +01:00
Tim Bentley
5b58f7137f
Fix Database defaults
...
Add Topic Dialog and add functionality
Add Topic code to Song window
2009-06-04 20:00:41 +01:00
Raoul Snyman
08198dfc01
Removed unnecessary Registry classes
...
Removed data path from config file
Changed various paths:
- Windows: Application Data
- Unix/Linux: XDG directories, falling back to ~/.openlp
- Mac OS X: Application Support/openlp
2009-06-04 18:53:49 +02:00
Tim Bentley
05027b114c
Fix Cancel bug on BibleImport screen
...
Fix odi error on PresentationDialog
bzr-revno: 454
2009-06-04 17:17:26 +01:00
Tim Bentley
b365090544
Song fixes
...
Bug fixes to event receiver and presentations
2009-06-04 17:14:10 +01:00
Tim Bentley
29530d31ca
More changes to Songs plugin to get ManageAuthors working.
2009-06-03 18:32:53 +01:00
Tim Bentley
a473a4dffc
Start fixing the songs plugin
2009-06-03 17:14:56 +01:00
Tim Bentley
5fbc870c64
Song plugin add to service manager
...
custom and bible cleanups
2009-06-03 16:38:14 +01:00
Raoul Snyman
3561ede5b0
A number of style cleanups.
...
bzr-revno: 453
2009-06-02 21:02:12 +02:00
Tim Bentley
a2034dd132
Fixed Renderer to split lines and pages,
...
ServiceItem now handles them.
2009-06-02 17:25:36 +01:00
Tim Bentley
b891b58bad
More Renderer work
2009-06-02 05:09:43 +01:00
Raoul Snyman
624b466b57
Changed the SlideController to look MUCH nicer.
...
bzr-revno: 451
2009-06-01 21:47:05 +02:00
Tim Bentley
47ca07ae15
fixes
2009-06-01 19:52:22 +01:00
Tim Bentley
1135e340c0
fix copyright symbol error
...
bzr-revno: 450
2009-06-01 19:51:49 +01:00
Tim Bentley
971be91bad
Fix commit due to missing
2009-06-01 19:37:06 +01:00
Tim Bentley
30154f2127
Lots for fixes:
...
- General Tab now saves and retrieves
- Alert Dialogs now alerts
- Renderer - More fixes
- SlideController looks better.
- Removal of poked in Managers all accessed via Parent.
2009-06-01 18:50:37 +01:00
Tim Bentley
e019e0f5d8
remove print statements
2009-05-30 19:44:16 +01:00
Tim Bentley
d0bcc06d35
more changes and fixes
2009-05-22 20:36:16 +01:00
Tim Bentley
8acc980ce4
End of Operation Cleanup for now
...
Fix more bugs
Start to sort out Service Item
2009-05-22 19:30:25 +01:00
Tim Bentley
4c76ffdbaa
More cleanups
...
Fix Rendering bugs with images
Fix Theme choice bugs
2009-05-22 06:14:55 +01:00
Tim Bentley
190a371f56
More from Operation Cleanup
...
Fix spelling of Maintenance
2009-05-21 17:07:01 +01:00
Tim Bentley
2dfbe1dcfc
Phase2 Operation Cleanup.
2009-05-21 06:15:51 +01:00
Tim Bentley
da0acea229
Phase1 operation superfly
2009-05-20 21:17:20 +01:00
Tim Bentley
b4a08096d6
Rendering cleanup
2009-05-19 17:27:01 +01:00
Tim Bentley
3ba6733f14
Theme Preview in ThemeTab
2009-05-18 20:47:18 +01:00
Tim Bentley
47c0b69d36
Finish the Theme work to save all themes and replay them on reload
...
Add rules as to which theme to use in the RenderManager
2009-05-18 20:04:25 +01:00
Tim Bentley
d5b2a1e496
Fix Bible plugin to handle themes correctly when changed and removed.
2009-05-18 17:11:59 +01:00
Tim Bentley
37b755affe
Change Presentation Plugin to choose presentation software.
...
Trial version until superfly gets his hands on it!
2009-05-18 17:04:34 +01:00
Tim Bentley
27027eb051
Fix comments from last merge
...
Fix BiblePlugin Theme storage and usage
2009-05-18 05:41:49 +01:00
Tim Bentley
a5615fd4fe
Corrections to Renderer to handle slides not lines
...
Fixes to Bibleplugin to renderer multiple verses per slide
Pass Bible Theme to RenderManager
2009-05-17 16:24:02 +01:00
Tim Bentley
df0fd5b618
hook up themes to combo boxes
2009-05-17 09:25:15 +01:00
Tim Bentley
0ffd58346b
Rendering fixes
2009-05-17 09:13:22 +01:00
Tim Bentley
46efe3188e
Add Images to the themes
...
Fix MainDisplay to record change of frame when blanked out.
2009-05-16 20:47:30 +01:00
Tim Bentley
2969c3641d
More code cleanups
2009-05-16 17:38:03 +01:00
Tim Bentley
df51cd18d4
Close display window on exit
...
Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.
2009-05-16 11:24:03 +01:00
Tim Bentley
d59f80d819
Rename the video plugin to media
2009-05-15 06:15:53 +01:00
Tim Bentley
93a175a50e
ServiceManager now sends data to Preview and Live Controllers
...
ServiceManager now selects verses to start with.
2009-05-14 19:00:36 +01:00
Tim Bentley
0ba52fbd66
Added context menus to ServiceManager
...
Refactored Icon Construction to single method
2009-05-13 20:47:25 +01:00
Tim Bentley
8c7c71e0c0
Add Preview , Live and Service to ServiceManager
...
Remove unwanted Drag and drop stuff
Clean up remanants
2009-05-13 17:41:05 +01:00
Tim Bentley
bc1c714693
Add drag and drop eventing to Bibles and Images
...
Revamp Pluging drag and drop code to handle class clashing
Add Drag and drop code to SlideController
Start to hook up servicemanger with slide controller.
2009-05-12 22:06:35 +01:00
Tim Bentley
b2d2de6ad8
Add Preformance Monitoring for Renderer
...
Fix Pixmap problems with pixelation
Remove duplicate image plugin issue.
2009-05-11 06:09:43 +01:00
