Commit Graph

462 Commits

Author SHA1 Message Date
Raoul Snyman 4e1656961b Merged from trunk. 2009-08-06 15:17:36 +02:00
Tim Bentley cf56b14383 Fix errors in Italic handling
Add delay to get screen refresh workig
2009-08-05 18:59:37 +01:00
Raoul Snyman 8c010efe5a Changed the layout of the Song Edit form, making it slightly easier for the average PC Joe to digest. 2009-08-04 22:23:33 +02:00
Tim Bentley 2816277af1 New features and fixes.
bzr-revno: 499
2009-08-04 18:18:47 +01:00
Raoul Snyman dc352c28d3 Merged in some changes for the song maintenance form.
bzr-revno: 498
2009-08-03 21:59:19 +02:00
Raoul Snyman 708a62ad47 Switched around the order of some dialogs when deleting items in the Song Maintenance dialog. 2009-08-02 21:10:54 +02:00
Tim Bentley 13f016cf5f Minor bug fixes 2009-08-02 17:13:59 +01:00
Tim Bentley fa606e19a9 Add download notifications for HTTP bibles
Fix bug running off the end of bible chapter
2009-08-02 14:44:41 +01:00
Tim Bentley b93cfa887c Head changes 2009-08-01 19:04:13 +01:00
Raoul Snyman 2b237bb488 Made relative imports absolute.
Changed self.NameEdit.text() == u'' to not self.NameEdit.text()
2009-07-26 15:51:32 +02:00
Raoul Snyman 782304114e Merged in changes from the songmaintenance branch
bzr-revno: 497
2009-07-26 15:02:37 +02:00
Raoul Snyman 67f4669df2 Updated author validation to validate the display name as well. 2009-07-26 12:02:18 +02:00
Raoul Snyman 1915f93b6e Added the rest of the validation and tested that it all works. 2009-07-26 10:36:57 +02:00
Raoul Snyman 7eac26d98a Added validation to the Author dialog. 2009-07-26 00:07:59 +02:00
Raoul Snyman 6cb9222aba Last few touches to the song maintenance. 2009-07-25 00:13:40 +02:00
Raoul Snyman d4d6a88c6f Lots of yummy updates to the song maintenance form. 2009-07-24 22:40:34 +02:00
Raoul Snyman af9b8edd6f The new song maintenance dialog... getting there. 2009-07-23 22:20:49 +02:00
Tim Bentley 66eed38671 Change Bible layout options to add verse per slide 2009-07-23 06:17:26 +01:00
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 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 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
Raoul Snyman 37384f570c - Created a consolidated "models.py" file.
- Updated BibleDBImpl with the changes.
2009-07-14 21:44:15 +02: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 2aaf72bb20 Unicode work 2009-07-10 16:41:08 +01: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
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
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 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 2879a52416 Start of plugable SlideControllers 2009-06-26 17:39:16 +01: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 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
Tim Bentley 69df159f17 Change Topics Form handling to allow save button to be enabled. 2009-06-24 07:15:04 +01:00
Tim Bentley c77cbb0aa1 Clean up migration database tables 2009-06-24 07:10:13 +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
Tim Bentley 3c255076f9 Add Author Search to Song Plugin 2009-06-21 18:45:59 +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 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 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
Raoul Snyman a8307e430b Changed QPixmaps to QImages to see the difference. 2009-06-10 17:37:33 +02:00