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

462 Commits

Author SHA1 Message Date
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
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 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 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
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
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
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 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 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 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 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 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
Tim Bentley a7d1ba85ed Add drag and drop to customplugin and expand it on servicemanager.py 
Replace MVC in servicemanager.py
Add Event processing to trigger plugin to pust item to service manager
 2009-05-09 08:01:33 +01:00
Tim Bentley 13766fc7c7 Fixes to formatting and rendering 
Add Blank screen functionality
 2009-05-04 14:48:12 +01:00
Tim Bentley ce3d1cffc6 Add Buttonsbar to slidecontroller and add actions 
Add Buttons to ServiceManager
Add Slide up/Down to slidecontroller.py
Fix missing data on selection in bibles and custom plugins
 2009-05-04 09:15:48 +01:00
Tim Bentley 183a7e54c7 Add servicemanager access from Plugins 
Add bibles to preview , live and servicemanager.py
Add icons to servicemanager lists
Fix thememanager to work with missing theme
 2009-05-02 19:56:27 +01:00
Tim Bentley 0d27d61b7f At last first attemp at serviceitem 2009-05-02 12:16:08 +01:00
Tim Bentley ca0893caba Undo changes so diffs can be applied. 2009-05-02 12:12:32 +01:00
Tim Bentley b201aa30d5 First attempt at serviceitem code 2009-05-02 12:00:35 +01:00
Raoul Snyman 55cd0b90cd Replaced the old logos and graphics with the new ones, did some coding-standards-cleanup, and fixed a bug in the OpenLPToolbar code where it discarded Unicode strings. 2009-05-02 00:26:43 +02:00
Tim Bentley 0196f15549 Stop Custom Slide having no slides 
Changes to renderer and Rendermanager
 2009-05-01 06:02:53 +01:00
Tim Bentley 4fc7b974fa Fix Rendering to allow dynamic placement of Main and Footers 
Fix bugs in CustomPlugin
 2009-04-30 22:02:28 +01:00
Tim Bentley e9279b4b12 update Custom plugin to work with Renderer 2009-04-29 20:21:18 +01:00
Tim Bentley ba6e581223 Start to clean up rendermanger 
fix bugs in rendereing 
fix thememanager to allow new themes to be created
 2009-04-29 20:07:13 +01:00
Tim Bentley 2457da9d88 Add version number to splash screem 
Add ability to preview to preview controller
Add render manager to control rendering
Fix bugs in renderer
Add inital rendering to custom and bible plugins
 2009-04-25 07:11:15 +01:00
Tim Bentley aeb79120f4 Fix name bug 2009-04-25 07:09:47 +01:00
Tim Bentley a662404122 Fix XML schema for naming 
Fix ThemeManager and Renderer to cover changes
Move code for Boolean Config issues
Various code style fixes
 2009-04-15 05:58:51 +01:00
Tim Bentley d025d1ebf6 Add New Theme Event Handlers to plugins 2009-04-10 07:06:41 +01:00
Tim Bentley 0dfe60ef9f Fix Problems from last merge review 
Get Custom Plugin theme combo working following event post from ThemeManager
 2009-04-07 20:03:36 +01:00
Tim Bentley 0e7dfb9fc4 Combine patch from previous tree which I messed up. Here is a summary of the changes. 
444. By Tim Bentley 23 hours ago

    Add new event for Theme Loading
443. By Tim Bentley 23 hours ago

    Add Eventing after Themes loaded to tell plugins the themes have changed
442. By Tim Bentley on 2009-04-04

    Store Theme name in list for correct display
441. By Tim Bentley on 2009-04-04

    Add ThemeManagerDialog
    More Rendering improvements
440. By Tim Bentley on 2009-04-04

    Add Themes to Bible Tab and default values
439. By Tim Bentley on 2009-04-04

    Add rendering for Circles and amend XML schema accordingly
438. By Tim Bentley on 2009-04-04

    Renderer now supports linear gradients correctly
    Update XML to include direction
    Add Booleans instead of 0/1 to XML schema
437. By Tim Bentley on 2009-04-03

    More ThemeManager changes
    Fix Rendering and theme handling
    Generate PNG theme on conversion
436. By Tim Bentley on 2009-04-01

    Fix up Theme XML code to work with strings and files.
    Fix Render.py to work with new XML schema
435. By Tim Bentley on 2009-04-01

    Import version 2 xml and build object.
 2009-04-06 19:45:45 +01:00
Tim Bentley 381afda908 Fixed duplicate Image plugin loading 
Fixed error in Custom Plugin stopping it load
 2009-03-25 20:30:48 +00:00
Tim Bentley e2715e0358 More corrections following revert 2009-03-24 06:07:03 +00:00
Tim Bentley 6a0eaa2cfe Clean up Plugin Interface to be more Generic 
Clean up Mainwindow for adding plugins
Add ThemeManager to Main window and pass to plugins 
Add event Manager code to plugins and define some listners
Update AlertDialog to send message and allow text to be entered
 2009-03-22 07:13:34 +00:00
Tim Bentley 1a8ab17bbb Update Presentation Plugin to match rest of the plugins 
Fix style errors as discovered

bzr-revno: 425
 2009-03-19 17:31:33 +00:00
Tim Bentley ca32157e9c Removal of Plugin utils continues 
bzr-revno: 424
 2009-03-18 17:19:30 +00:00
Tim Bentley d13b2efc22 Start Custom Service Item 
Fix Image config problems

bzr-revno: 423
 2009-03-17 05:05:04 +00:00
Tim Bentley 4bbce39f35 Fix up Bible Plugin to new standards. 
bzr-revno: 422
 2009-03-16 17:33:51 +00:00
Tim Bentley e99239ef12 Big cleanup. 
Custom and Video Plugins up to latest standard (MVC)
Config now working with new handles Video and Images.
Moved strings from "" to u'' where found.

bzr-revno: 421
 2009-03-15 19:31:33 +00:00
Tim Bentley 0d33ba5668 Add delete option to Custom plugin 
bzr-revno: 420
 2009-03-15 06:35:07 +00:00
Tim Bentley 55bd3cc772 Fix errors in redisplay of data 
Remove cut and paste rubbish

bzr-revno: 419
 2009-03-14 08:11:25 +00:00
Tim Bentley f1163003e6 Fix screen refresh returning from Edit dialog. 
bzr-revno: 418
 2009-03-14 07:09:10 +00:00
Tim Bentley 016380bc41 Clean up UI and add translation code. 
bzr-revno: 417
 2009-03-14 07:08:40 +00:00
Tim Bentley 268f6361b5 Fix up quote problems in SongXMLHandler 
Add MVC to Custom
Add Update to Custom
Remove xml1.py as has served it's purpose

bzr-revno: 416
 2009-03-14 07:08:15 +00:00
Raoul Snyman eaa1aa81fd Fixed Tim Bentley's problem with the loading sequence of modules. 
Changed some names and quotes in xml1.py.

bzr-revno: 415
 2009-03-13 17:49:51 +00:00
Tim Bentley b525734702 Fix Unicode error on database write 
Try to add TextItemData again

bzr-revno: 414
 2009-03-13 16:00:14 +00:00
Tim Bentley 6224795661 Add Classes for songxml, video tidy up and custom plugins 
bzr-revno: 413
 2009-03-13 06:13:11 +00:00
Tim Bentley 71a3ac4c78 Start to add data to database 
bzr-revno: 412
 2009-03-13 06:12:22 +00:00
Tim Bentley 21bfa234e8 Add SongXMLHander Class 
Tidy up OSIS Bible importer
Start to move Video Plugin to mediaitem and remove PluginUtils

bzr-revno: 408
 2009-03-12 19:52:37 +00:00
Tim Bentley cf2067fb61 Fix Custom plugin to add it self to config if not present. 
Correct spacing error in code.

bzr-revno: 407
 2009-03-11 06:39:11 +00:00
Tim Bentley 5c3136fdbe Fix manager to stop accessing config 
bzr-revno: 406
 2009-03-11 06:28:48 +00:00
Tim Bentley 8b635e6cb5 Open up database 
bzr-revno: 404
 2009-03-11 06:27:16 +00:00
Raoul Snyman 051b314da8 Fixed the displayResults method of SongMediaItem to display 1 song + all authors, rather than an instance of a song for each author of that song. 
Fixed up the topics management dialog a bit.
Corrected the spacing on the eventreceiver.py file.
Corrected the calling of the receiver to use the static methods without creating an instance of the Receiver class each time.

bzr-revno: 403
 2009-03-10 16:46:25 +00:00
Raoul Snyman 86bde695ea Some tweaks to the songs plugin. 
bzr-revno: 402
 2009-03-09 18:47:37 +00:00
Raoul Snyman 735527d558 Moved code out into SongMediaItem 
bzr-revno: 401
 2009-03-09 12:49:55 +00:00
Scott Guerrieri 34ace15939 Fixed a down arrow functionality issue on the editcustomform.py 
bzr-revno: 400
 2009-03-09 02:16:38 +00:00
Raoul Snyman 6306be9eda Added the long lost media item! 
bzr-revno: 399
 2009-03-08 20:02:50 +00:00
Raoul Snyman f844f696a1 Moved image media manager item out into it's own class. 
bzr-revno: 398
 2009-03-08 12:41:07 +00:00
Tim Bentley 904212c587 Add slide swapping to dialog 
Fixed Context menu

bzr-revno: 397
 2009-03-08 06:36:05 +00:00
Raoul Snyman 036dfef2eb Added the verse editing form and modified the song editing form to accommodate verses. 
bzr-revno: 396
 2009-03-07 21:38:59 +00:00
Tim Bentley bd7577a0f1 Fix field names and more state changes 
bzr-revno: 395
 2009-03-07 20:36:12 +00:00
Tim Bentley 710b60bc19 Fix Updates to window 
bzr-revno: 394
 2009-03-07 17:45:11 +00:00
Tim Bentley 233e0c25de Update state machine for buttons. 
bzr-revno: 393
 2009-03-07 17:13:36 +00:00
Tim Bentley b5550abda9 Add new features and edit validation 
Text can be added , cleared and edited.

bzr-revno: 392
 2009-03-07 17:13:19 +00:00
Tim Bentley 749590386d Correct classpath errors with images 
bzr-revno: 391
 2009-03-07 09:21:27 +00:00
Tim Bentley 6304f73b8e Finish adding custom plugin bits 
bzr-revno: 390
 2009-03-07 09:20:56 +00:00
Tim Bentley 7badfb650f Initial Release of Custom plugin. 
All bits present but does not work!

bzr-revno: 389
 2009-03-07 09:20:26 +00:00
Tim Bentley b32703e845 More bible fixes after move 
Method name standardisation
OSIS bible import clean up
OSIS bible import parser improvements.

bzr-revno: 388
 2009-03-07 06:59:08 +00:00
Tim Bentley d559adcbe6 Update copyright 
bzr-revno: 387
 2009-03-07 06:58:39 +00:00
Raoul Snyman 0e28795da2 Moved some files in the image plugin. 
bzr-revno: 386
 2009-03-06 23:41:22 +00:00
Raoul Snyman 6c78f9b0fe Moved some files into the relevant module. 
bzr-revno: 385
 2009-03-06 19:02:18 +00:00
Raoul Snyman f56c36787c Added the lib module in the images plugin. 
bzr-revno: 384
 2009-03-06 18:58:37 +00:00
Tim Bentley 81a7a142e4 Fix new chapter code in presentation logic 
bzr-revno: 383
 2009-03-06 18:00:52 +00:00
Tim Bentley 4ad8b74167 Fix up Bible bugs following addition of Tabs and Move code split 
bzr-revno: 382
 2009-03-06 07:18:30 +00:00
Tim Bentley 980ed505e2 Tidy up Video and Bible tab code. 
bzr-revno: 381
 2009-03-06 06:05:01 +00:00
Tim Bentley 6af1637550 Config for bibles 
bzr-revno: 380
 2009-03-05 20:58:34 +00:00