raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
853 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

710 Commits

Author SHA1 Message Date
Raoul Snyman cf5b415640 Added the start of a song maintenance dialog. 2009-07-22 10:20:42 +02:00
Tim Bentley 8e0901ef67 Fix bug where empty lists fail to display dialogs 2009-07-22 07:14:34 +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 2885a08ed2 Fix combo box errors 2009-07-19 08:58:37 +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 4552fb543a Add song conversion script 
Remove conversion code as it did not work!
More Song for tidy ups
 2009-07-19 07:31:08 +01:00
Tim Bentley 6a495d451e Finish fixing the songedit form so it now saves. 2009-07-18 08:46:17 +01:00
Tim Bentley eb47246f18 Fix up song migration code so we only have 1 author 
Fix up Songedit dialog to refesh lists on entry 
Fix up meta data bug
 2009-07-18 08:30:26 +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 05a1c5a328 Clean up phase 1 one of render sort out 
fix bug in render frames (who forgot the footer)
 2009-07-15 18:33:31 +01:00
Tim Bentley 511088b73b Start to fix pre processor for the renderer 2009-07-15 17:23:30 +01:00
Raoul Snyman 37384f570c - Created a consolidated "models.py" file. 
- Updated BibleDBImpl with the changes.
 2009-07-14 21:44:15 +02:00
Tim Bentley 13be06d633 Fix bugs with spinboxes spinning madly 2009-07-14 20:41:44 +01:00
Tim Bentley 6fdd5d028f Fix none for new authors 
Fix focus bugs in Song child windows
 2009-07-14 19:38:33 +01:00
Raoul Snyman 6b7537c588 Merged changes from trunk, fixed a conflict. 2009-07-13 22:11:36 +02:00
Raoul Snyman dc10f0e2a4 Various fixes: 
- Started the conversion of SQL to SQLAlchemy
- Found a bug in the generating of Bible slides
- Some code cleanups
 2009-07-13 22:08:43 +02:00
Tim Bentley 66b6836406 More bug fixes 
Bibles have correct footers
Songs now save all data and have correct focus
 2009-07-13 18:02:38 +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
Raoul Snyman bc368d3a91 Some minor fixes. 2009-07-12 21:27:48 +02:00
Tim Bentley 6c30e67723 Fix html ripping bug for bibles 2009-07-12 16:11:57 +01:00
Tim Bentley f576e9d83d Look a songs Focus issues 
Fix Bibles footers
 2009-07-12 15:56:06 +01:00
Tim Bentley ccb85f8f4b Docstring cleanups 
Finish adding base preview pluing
 2009-07-11 06:18:34 +01:00
Tim Bentley 8079eaf982 From Raoul 2009-07-10 17:24:30 +01:00
Raoul Snyman 5cb51e11fc Added initial generated API documentation. 2009-07-10 17:45:17 +02:00
Tim Bentley 7e6ad29306 Comment changes 2009-07-10 16:41:24 +01:00
Tim Bentley 2aaf72bb20 Unicode work 2009-07-10 16:41:08 +01:00
Raoul Snyman aa01a94b2c Merging from docstrings branch. 
bzr-revno: 488
 2009-07-10 17:13:14 +02:00
Raoul Snyman b3af02308b More docstrings cleanups. 2009-07-10 15:16:15 +02:00
Tim Bentley 93655bc92e Stop Presentation Tab failing 
CSV Bibles get Unicode
 2009-07-09 17:51:25 +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
Raoul Snyman 4159ecee34 Merged docstrings changes. 
bzr-revno: 487
 2009-07-08 19:10:11 +02:00
Raoul Snyman 150adaac23 Put the settings tab back in after accidentally removing it... silly me! 
bzr-revno: 486
 2009-07-08 18:59:53 +02:00
Tim Bentley b2f9f24120 Changes from Head 2009-07-08 17:41:43 +01:00
Tim Bentley 193151c270 Cleanup 2009-07-08 17:40:42 +01:00
Raoul Snyman e66fa9b87d Started fixing up docstrings and doing some more of a code cleanup. 2009-07-08 08:55:08 +02:00
Raoul Snyman c8d5b7acb2 Merged changes to Bible plugin into trunk. 
bzr-revno: 485
 2009-07-08 07:13:58 +02:00
Raoul Snyman f12949eb0c Fixed up a few logging things, a few bits of indentation, and resolved some conflicts from the last update. 
bzr-revno: 484
 2009-07-08 07:12:16 +02:00
Raoul Snyman 66898bad84 Made some fixes to the common Bible import classes. 2009-07-07 22:18:36 +02: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 e5a33d2f30 Added Martin's changes to my tree 
Resolve confilcts
Get plugins working again and clean up duplicate code
Remove the references to listwithpreviews
 2009-07-04 06:52:30 +01:00
Tim Bentley 4e08922528 OOPs missed file 2009-07-03 21:33:41 +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
Martin Thompson 6349595297 Changes from review 2009-07-01 21:21:13 +01:00
Martin Thompson 5e8ff0214e Video items have a preview shown 2009-06-30 21:35:53 +01:00
Tim Bentley 9318cc3ec0 Add Enter on ServiceManager 2009-06-29 18:37:46 +01:00
Tim Bentley 409383add2 Sort out Image Plugin icons 2009-06-29 06:13:06 +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 a4a0b521a4 More cleanups and bug fixes. 2009-06-27 20:55:55 +01:00
Tim Bentley c78ea3c911 More cleanups with the media manager 2009-06-27 16:33:03 +01:00
Tim Bentley 23f49bfee7 Update new plugin infrastructure 2009-06-27 06:46:05 +01:00
Tim Bentley b36b78afdc Try to fix openoffice startup 2009-06-26 20:06:28 +01:00
Tim Bentley c981cb21d2 More fixes and cleanups 2009-06-26 19:54:05 +01:00
Tim Bentley b76790bc2f Fixes and cleanups following MediaManager Merge 2009-06-26 18:51:43 +01:00
Tim Bentley 46967d9ef9 Latest changes from head 2009-06-26 17:40:49 +01:00
Tim Bentley 2879a52416 Start of plugable SlideControllers 2009-06-26 17:39:16 +01:00
Raoul Snyman 9606f6a3bb Tidied up an assert and a few other lines of non-standard syntax. 2009-06-26 18:17:55 +02:00
Martin Thompson 45d9f436ab Media item for media functions basically. No previews, and no live/preview control 2009-06-25 22:09:52 +01:00
Martin Thompson 2b13e84c73 Latest trunk merged 2009-06-25 21:12:13 +01:00
Tim Bentley 8040f10204 From Head 2009-06-25 21:06:42 +01:00
Tim Bentley 66c665d352 More Fixes 2009-06-25 21:06:02 +01:00
Martin Thompson 3f92e07d07 Merged media manager refactoring 
bzr-revno: 477
 2009-06-25 21:03:41 +01:00
Martin Thompson 322d19265a Tweaked a couple of = signs 2009-06-25 21:01:02 +01:00
Tim Bentley 92b1b82a58 Clean up cnvdb 
Start on Presentation Plugin code for Impress
 2009-06-25 20:42:22 +01:00
Martin Thompson 16716372f0 Merged changes from trunk 
Created a BaseListWithDnD to allow plugins to inherit their Drag and
drop handler without too much copy and paste Also moved the basic DnD
handler to the Plugin base class, again to reduce copy/paste.  The
Image plugin uses this functionality, others are TBD
 2009-06-24 21:15:24 +01:00
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