Commit Graph

367 Commits

Author SHA1 Message Date
Maikel Stuivenberg
3d4f221c19 Added: Button on PreviewController to go live 2009-09-14 14:16:04 +02:00
Tim Bentley
f4599bf947 Fixed reset presentation bug 2009-09-13 20:31:31 +01:00
Tim Bentley
8b9e9665f8 head 2009-09-13 20:26:01 +01:00
Raoul Snyman
3090aa489b Merge from trunk 2009-09-13 20:45:56 +02:00
Tim Bentley
889a10c4af head 2009-09-13 19:42:45 +01:00
Raoul Snyman
9684e696ca Bring this branch up to date with trunk 2009-09-13 19:55:52 +02:00
Jon Tibble
df7016c22d dos2unix run on trunk r535 2009-09-13 16:14:45 +01:00
Tim Bentley
a925033a73 head 2009-09-13 15:54:17 +01:00
Tim Bentley
e30d7df8ac head 2009-09-13 15:45:50 +01:00
Jon Tibble
54057730f7 Complete Theme breakage fixing 2009-09-13 15:12:38 +01:00
Jon Tibble
417d8c3725 Fix theme break 2009-09-13 14:24:58 +01:00
Tim Bentley
1ef543253c Fix up Presentations so Impress works! 2009-09-13 08:39:48 +01:00
Raoul Snyman
a4a31a9c76 [ticket #14] Startup output display/splash should be changeable - implemented. 2009-09-12 23:31:35 +02:00
Tim Bentley
baf967bf2a head 2009-09-12 19:27:17 +01:00
Jon Tibble
01efadc058 Merged in lp:~meths/openlp/trivialfixes
bzr-revno: 533
2009-09-12 19:31:03 +02:00
Raoul Snyman
43dc7e6b90 Merged in lp:~raoul-snyman/openlp/docstrings
bzr-revno: 532
2009-09-12 19:24:16 +02:00
Jon Tibble
5e1c2d5205 Fix similar bugs with incorrect SIGNALs on QLineEdit 2009-09-11 22:50:23 +01:00
Tim Bentley
43b374a994 Impress issues 2009-09-11 20:51:06 +01:00
Tim Bentley
07452df24a fixes to custom and save state of screen 2009-09-11 20:29:57 +01:00
Jon Tibble
abdbed78b6 Fix unneeded \ line breaks 2009-09-10 21:18:15 +01:00
Jon Tibble
a6f6ad498b Correct path building and sort line break issues 2009-09-10 21:09:03 +01:00
Jon Tibble
b865c8ab7f Add usability information for ServiceManager ThemeComboBox 2009-09-10 18:03:17 +01:00
Raoul Snyman
fb9914fb08 Changed the license info from docstrings to normal comments. 2009-09-08 21:58:05 +02:00
Tim Bentley
9ec28564ee Head again 2009-09-07 20:00:41 +01:00
Jon Tibble
44e3050577 Latest merge from lp:~meths/openlp/trivialfixes
bzr-revno: 525
2009-09-07 20:49:27 +02:00
Jon Tibble
5e644ee1ae Save UI: Switch to saving on change using SettingsManager 2009-09-07 17:46:20 +01:00
Jon Tibble
78b553ac23 Refactor theme loading 2009-09-07 14:05:53 +01:00
Tim Bentley
feca90483a Cleanups from Last merge and documentation 2009-09-07 06:13:39 +01:00
Jon Tibble
a037c3ee2b Fix theme loading mess 2009-09-07 03:17:36 +01:00
Jon Tibble
e9a8fa7084 Save UI: Main UI item visibility persists across sessions 2009-09-07 00:11:08 +01:00
Tim Bentley
4a5767a5cf Move fixups for Presentations 2009-09-06 20:23:57 +01:00
Jon Tibble
313f54bd0d Save UI: Initial setup and more cleanup 2009-09-06 16:26:02 +01:00
Jon Tibble
169dcff9f6 Fix incorrect ( \ newline characters, fix == spacing and other code style fixes noticed 2009-09-06 14:57:32 +01:00
Tim Bentley
7e398174cf Presentation plugin - getting there 2009-09-05 20:58:02 +01:00
Tim Bentley
087ee85d86 Head 2009-09-05 14:46:06 +01:00
Tim Bentley
3784838a36 Presentations - service item handling 2009-09-05 14:30:09 +01:00
Tim Bentley
f4a8d8b52a Correction of Cleanup 2009-09-05 10:02:41 +01:00
Tim Bentley
b94f091fb2 Cleanups and fixes 2009-09-05 07:29:23 +01:00
Jon Tibble
a8cf61c199 Fix loading of formatted XML theme files broken in previous commit 2009-09-05 02:22:05 +01:00
Jon Tibble
cda62a2617 Save themes in formatted XML and clean touched files 2009-09-04 23:27:53 +01:00
Tim Bentley
06ab5df285 Fix problems with last merger 2009-09-03 18:46:46 +01:00
Jon Tibble
796ad1f4cf Fix compilation errors in openlp dir 2009-09-03 16:19:30 +01:00
Tim Bentley
555b9b92a5 Renderer - speed up adding to slide controller 2009-09-03 05:41:30 +01:00
Jon Tibble
cd3fe8b38f Whitespace, linewrap and spelling fixes 2009-09-02 02:44:09 +01:00
Jon Tibble
d1139653c5 Merge for John
bzr-revno: 517
2009-09-01 20:50:32 +01:00
Jon Tibble
94dbcc1a28 Fix index naming in screen fix 2009-09-01 20:39:49 +01:00
Jon Tibble
15f2976cd8 Fix display monitor test logic 2009-09-01 20:15:55 +01:00
Tim Bentley
94a3513bb1 Saving OOS changes and other cleanups 2009-08-31 19:27:36 +01:00
Tim Bentley
4c2b9fe426 Presentation changes - Items to service Manager 2009-08-31 15:04:00 +01:00
Tim Bentley
658216535c Finish theme UI to hide options for transparent 2009-08-31 08:05:59 +01:00
Tim Bentley
0f1ac7cfb2 Sort out SlideController
bzr-revno: 515
2009-08-29 19:18:24 +01:00
Tim Bentley
58b563d976 Head 2009-08-29 11:43:44 +01:00
Tim Bentley
9931eaa881 Slide Controller fix preview size 2009-08-29 09:17:40 +01:00
Tim Bentley
eca69df868 Slide Controller rewrite complete 2009-08-29 08:17:56 +01:00
Tim Bentley
66a543125b Slide Controller fix keyboard and Image timer loop 2009-08-29 07:12:01 +01:00
Maikel Stuivenberg
ec68413cec fixed the theme code 2009-08-28 20:34:33 +02:00
Tim Bentley
af82682348 Images can only loop if more than 1 2009-08-28 19:27:32 +01:00
Tim Bentley
0c9fcd0571 Fix toolbar code to hide / add items 2009-08-28 18:40:07 +01:00
Maikel Stuivenberg
0c53783acd Theme manager will ask for save if theme already exists 2009-08-27 18:21:00 +02:00
Tim Bentley
ed385ec31d SlideController cleanup - merge Main and Image 2009-08-27 06:17:20 +01:00
Tim Bentley
63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +01:00
Tim Bentley
49a424abd1 EventManager Removal part 3 - Theme handling 2009-08-25 21:04:58 +01:00
Tim Bentley
9b826aab56 EventManager Removal part 2 2009-08-25 06:18:09 +01:00
Tim Bentley
7226d4a232 EventManager Removal part 1 2009-08-24 21:05:46 +01:00
Tim Bentley
41782ae8a7 SlideController clean up part 3 2009-08-24 06:10:04 +01:00
Tim Bentley
7ec0a53d77 SlideController clean up part 2 2009-08-24 05:30:04 +01:00
Tim Bentley
57f04820f0 SlideController clean up part 1 2009-08-23 21:15:05 +01:00
Tim Bentley
297c4ab4c3 Presentation plugin again 2009-08-15 20:10:59 +01:00
Tim Bentley
48bca4155d Plugin Clean up to remove extra code and remove need for Theme_Manager 2009-08-15 12:02:24 +01:00
Tim Bentley
b774cc10be Clean up Event Handling and remove call the ThemeManager from plugins 2009-08-15 08:33:01 +01:00
Tim Bentley
2c29be0712 Fix Plugin list screen 2009-08-15 07:57:01 +01:00
Tim Bentley
d87f58747c Finish (for now) Impress start and Stop from Config 2009-08-14 20:12:14 +01:00
Tim Bentley
fb63c3fc3f Plugin Form Complete 2009-08-14 17:26:22 +01:00
Tim Bentley
10ba1db5f3 Fix bug on song saving
Add new screen for Plugin status
Add new presentation plugin code
2009-08-13 21:02:38 +01:00
Tim Bentley
46cf6c763c Clean up event structure and add calling names
Clean up Remote client to remove qt dependancy
2009-08-12 05:57:24 +01:00
Tim Bentley
161973eef6 Clean up exit code so plugins can be called
Clean up Alerts Tab so can be called from UI and Remote via events
Start to get events to be called sequentially not nested
Fix up merge issues
2009-08-10 21:10:20 +01:00
Raoul Snyman
29389bde13 Merge from trunk; A few bugfixes. 2009-08-09 19:58:37 +02:00
Raoul Snyman
82101b8c65 Fixed a few bits and bobs 2009-08-09 14:05:54 +02:00
Tim Bentley
18f1434903 New bible Import Screen
Transparent Theme backgrounds
Global Theme Handling improvements

-------This line and the following will be ignored --------------

modified:
  openlp/core/lib/renderer.py
  openlp/core/lib/themexmlhandler.py
  openlp/core/ui/amendthemeform.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/thememanager.py
  openlp/core/ui/themestab.py
  openlp/plugins/bibles/forms/bibleimportdialog.py
  resources/forms/bibleimportdialog.ui
pending merges:
  Tim Bentley 2009-08-07 finish Theme handling corrections 
    Tim Bentley 2009-08-07 Default handling allows editing and blocks deletes
    Tim Bentley 2009-08-07 New bible import form
    Tim Bentley 2009-08-06 [merge] Head
    Tim Bentley 2009-08-06 Standardize row hight in renderer

bzr-revno: 503
2009-08-07 20:17:32 +01:00
Tim Bentley
26a1658724 finish Theme handling corrections
Set Global Theme back in settings tab
2009-08-07 20:05:00 +01:00
Tim Bentley
23b13ede2d Default handling allows editing and blocks deletes 2009-08-07 18:30:12 +01:00
Tim Bentley
06ff5ec618 New bible import form
Start of default theme handling
Add Transparent backgrounds
2009-08-07 18:19:32 +01:00
Raoul Snyman
bf09df4f0b Made some minor modifications to the edit song dialog, one or two other bug fixes. 2009-08-06 23:30:14 +02:00
Tim Bentley
b38553bffe Head 2009-08-06 18:47:38 +01:00
Tim Bentley
9b5f844afa Standardize row hight in renderer
Various theme fixes and cleanups
2009-08-06 18:43:53 +01:00
Raoul Snyman
2fb7ff511e Make the "Song Maintenance" button on the SongEdit form to work; Include a merge from trunk. 2009-08-06 16:51:38 +02:00
Raoul Snyman
4e1656961b Merged from trunk. 2009-08-06 15:17:36 +02:00
Tim Bentley
5ccf0581de Change xml handling to work with Normal/Bold and True 2009-08-03 20:49:21 +01:00
Tim Bentley
13f016cf5f Minor bug fixes 2009-08-02 17:13:59 +01:00
Tim Bentley
470f1d19df Add attributes to themes
Save data
Update data
2009-08-01 20:25:53 +01:00
Tim Bentley
279c34a67e Add theme bold/Italics to renderer 2009-08-01 19:03:07 +01:00
Tim Bentley
e788db767a fix renderer to make shadows small for footers
Add Keyboard events to servicemanager
2009-07-21 21:04:27 +01:00
Tim Bentley
9da5a3223f Fix song conversions
Fix focus for Song dialog
Preserve state when moving serviceitems
2009-07-21 19:10:14 +01:00
Tim Bentley
6861877c3d Clean up Alerts code to use correct timmers
code now allows slides and songs to change with alert still active
2009-07-19 08:40:31 +01:00
Tim Bentley
b1fd518ff6 Text clean ups
Move Author / Topic / Book edit form Song Edit
Add above to Toolbar
Add Icons
2009-07-18 06:43:50 +01:00
Raoul Snyman
40a9c5a32c Merged in the changes from the biblefixes branch.
bzr-revno: 494
2009-07-15 21:18:08 +02:00
Tim Bentley
13be06d633 Fix bugs with spinboxes spinning madly 2009-07-14 20:41:44 +01:00
Raoul Snyman
7a0f9d3e06 Added some fixes to the operation and layout of the slide controllers. 2009-07-12 22:38:34 +02:00
Tim Bentley
ccb85f8f4b Docstring cleanups
Finish adding base preview pluing
2009-07-11 06:18:34 +01:00
Tim Bentley
36113b0d90 cleanups of files not used
fixes to bibles to handle unicode better
2009-07-09 06:15:26 +01:00
Tim Bentley
db2efd386d Start to add ServiceManager 2009-07-08 18:18:48 +01:00
Tim Bentley
a06b8f0b07 Add saving check to exit so OOS can be saved 2009-07-07 17:35:01 +01:00
Tim Bentley
209f92439c Remove Not used files and References
Fixes from Last Merge
ThemeManager Cleanup MVC.
2009-07-06 17:34:13 +01:00
Tim Bentley
1110713529 Fix bug in bibles with invalid method name
Add Image Tab to get loop delay
Fix loss of Bible Icons
Add Loop delay to ImageController
Get Controllers to swap correctly
2009-07-03 21:32:33 +01:00
Tim Bentley
f586d9bf5e Update images and rename some.
More changes to slidecontroller and friends
2009-07-03 20:08:21 +01:00
Tim Bentley
3c71e91498 Fix up rendering a bit
Re-write the slide controller so it looks better (big clean up)
Fix themes where backgrounds are png files so they do not become phantom themes
start to sort out conversions
Hide openoffice at startup
2009-07-02 20:04:50 +01:00
Tim Bentley
9318cc3ec0 Add Enter on ServiceManager 2009-06-29 18:37:46 +01:00
Tim Bentley
560584d8f6 Added ImageToolBar to show what I am thinking
Cleanup mainwindow from mark 1 attempt.
Fix bug in Thememanager so themes are not deleted
2009-06-29 06:07:32 +01:00
Tim Bentley
7927080838 More changes to get plugable slideControllers to work 2009-06-28 07:54:12 +01:00
Tim Bentley
2879a52416 Start of plugable SlideControllers 2009-06-26 17:39:16 +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
Tim Bentley
0b0013331a Commit Fixes to Conversion Utilities
Changes to Presentation Plugin
2009-06-23 17:25:40 +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
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
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
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
c7b650be01 More performance changes 2009-06-10 17:20:57 +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
ed73a78e95 Add double clicks to songs and customSlide
More code cleanups
2009-06-07 20:34:24 +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
5b58f7137f Fix Database defaults
Add Topic Dialog and add functionality
Add Topic code to Song window
2009-06-04 20:00:41 +01:00
Tim Bentley
b365090544 Song fixes
Bug fixes to event receiver and presentations
2009-06-04 17:14:10 +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
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
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