Commit Graph

350 Commits

Author SHA1 Message Date
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
d96267934c Reload list only if title changes. 2009-06-14 08:25:39 +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
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
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
a9bad4aac7 From Head 2009-06-05 06:13:34 +01:00
Raoul Snyman
1c06b5aa4c Merged config changes into trunk.
bzr-revno: 455
2009-06-04 22:28:21 +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
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
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
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
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
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
643be2ca5e Fix screen close 2009-05-04 14:51:56 +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
e5ba8b73a6 More servicing changes (Preview and Live) behave and can be selected.
Setup Slidecontroller so it has an identity
Setup SlideController so it knows anout the display
Fix maindisplay view bugs
2009-05-03 08:20:15 +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
Raoul Snyman
2d9cfa9f75 Merged the ~raoul-snyman/openlp/dualdisplay changes into trunk.
bzr-revno: 437
2009-05-01 19:36:51 +02:00
Raoul Snyman
7bac2ac6e3 Minor fix. 2009-05-01 14:32:08 +02:00
Raoul Snyman
717e56fff7 Updated the handling of dual displays. 2009-05-01 13:50:09 +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
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
c8726a3892 Latest version with new displays 2009-04-28 20:40:51 +01:00
Tim Bentley
2dbe7d99a2 Changes to code to fix review comments. 2009-04-28 20:20:03 +01:00
Tim Bentley
e6c2ca29c8 Add new display window. 2009-04-28 20:19:20 +01:00
Tim Bentley
0facad72d6 Remove Print statement
Fix missing Theme bug
2009-04-25 07:38:21 +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
4696564c09 Add update to ServiceManager of Themes from ThemeManager 2009-04-23 19:22:54 +01:00
Tim Bentley
a3e2bce831 now we can save the theme as new or overrite 2009-04-23 19:12:36 +01:00
Tim Bentley
d85a0ba293 Fix renderer name
Introduce rendermanager
2009-04-22 20:46:10 +01:00
Tim Bentley
a1368e1f76 Finish Theme Editing 2009-04-22 18:28:32 +01:00
Tim Bentley
852e24ab35 More Theme Changes
State corrections 
XML boolean fixes
2009-04-21 20:45:50 +01:00
Tim Bentley
c8094b717f Add more controls and fix xml errors 2009-04-20 21:03:04 +01:00
Tim Bentley
0f80ab4266 Move Plugin Manager to core/lib 2009-04-20 19:22:42 +01:00
Tim Bentley
13a2339841 Remove unused file 2009-04-20 05:58:17 +01:00
Tim Bentley
cf2ad84e74 More renderer cleanups
More ThemeManager fixes
Sortout XML tag name errors
2009-04-19 21:07:52 +01:00
Tim Bentley
570a35ae65 Renderer cleanups
Remove code duplication and simplifications
2009-04-19 20:12:18 +01:00
Tim Bentley
6a309c43ff move the renderer.py class to core.lib 2009-04-19 19:21:22 +01:00
Tim Bentley
79e7e09d65 Add theme delete functionality 2009-04-19 19:17:17 +01:00
Tim Bentley
a02835f0f8 Add new dialog and fix the Theme import code not to include old style preview code 2009-04-19 09:15:40 +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
6b4a5ff5d9 Allow existing themes to be edited (well at least viewed) 2009-04-11 16:16:02 +01:00
Tim Bentley
61dbab1899 Amend theme XML to handle missing data
Add some value management on Theme dialog
2009-04-11 08:33:45 +01:00
Tim Bentley
192088165e Add Theme Manager files
Add Initial display of new theme
2009-04-11 06:43:52 +01:00
Tim Bentley
9b29d2b668 Change ThemeManager to use new XML format and renderer API's
Put in Propper logging for Screen resolution detection.
2009-04-10 06:59:40 +01:00
Tim Bentley
b581fcab8f Add screen list to General Tab
Add new Font bits to XML code
Add guards to renderer incase of no second text area
2009-04-10 06:48:57 +01:00
Tim Bentley
5d29da2547 Update Renderer to allow Main and Footer boxes on the display 2009-04-09 20:12:47 +01:00
Tim Bentley
8ea6f35f1f Generate Array of Screens and their sizes and pass through components. 2009-04-09 19:50:20 +01:00
Tim Bentley
1fb2b366b2 Fix ThemeXML class as per review comments
Change all references to it
2009-04-07 20:45:21 +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
95409076d0 Update Render.py to handle footers to slides if required.
Values will eventually come from Theme.
2009-03-29 17:51:42 +01:00
Tim Bentley
4ac2ed4fd6 Update Render to use Qgradient instead of home built code.
Colors hard coded for now.
2009-03-29 15:38:23 +01:00
Tim Bentley
8aa67b5a8b Fix bugs around ThemeManager
Add themexmlhandler to manage xml marshalling for themes
2009-03-28 20:12:22 +00:00
Tim Bentley
68501479d7 Add Theme Preview to ThemeManager 2009-03-28 07:01:00 +00:00
Tim Bentley
1e32183a2a Add Import functionality to Theme Manager 2009-03-28 05:43:30 +00: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
ddde031adb Final changes following a revert and removal.
Finish plugin.py
Add getThemes hook to thememanager.py
2009-03-23 20:18:06 +00:00
Tim Bentley
66f13e5ede 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
Revert changes to Alert Form.
2009-03-23 19:17:07 +00:00
Tim Bentley
62f48a33f2 Continue fixing the EventManager usage
Use Mainwindow to trigger the loading of the themes by the ServiceManager
2009-03-22 20:20:45 +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
b8c0ee1d70 Add ThemeManager and EventManager 2009-03-22 07:11:05 +00:00
Tim Bentley
be3725a6fe Remove PluginUtils as no longer used all references migrated
bzr-revno: 426
2009-03-19 17:36:06 +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
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
Tim Bentley
6224795661 Add Classes for songxml, video tidy up and custom plugins
bzr-revno: 413
2009-03-13 06:13:11 +00:00
Martin Thompson
90a91aa788 Updated tests to pass again.
Found some device dependent problems in the tests of the theme
rendering (when monitor resolution changes, so does font size (in
pixels)). This meant that the tests failed (as they are comparisons
with golden-bitmaps). Have updated the tests to do a more "approximate
comparison", with a low tolerance.  This is slow currently, could do
with optimising.

bzr-revno: 411
2009-03-12 20:19:24 +00:00
Martin Thompson
1d9569236d nothing
bzr-revno: 410
2009-03-12 20:18:14 +00:00
Martin Thompson
f1a6057b08 Removed some commented out code
bzr-revno: 409
2009-03-12 20:17:31 +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
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
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
980ed505e2 Tidy up Video and Bible tab code.
bzr-revno: 381
2009-03-06 06:05:01 +00:00
Raoul Snyman
c9ef88cfdc Fixed up the settings dialog and the alerts tab a bit.
bzr-revno: 379
2009-03-05 20:31:17 +00:00
Tim Bentley
dffcec7ca3 Change Tab load code to base class instead of plugins
Code VideoTab to save and reload value

bzr-revno: 378
2009-03-05 18:16:10 +00:00
Raoul Snyman
8533912cea Fixed the main form splitter problem, set the margins and spacing on some of the layouts in the bible media item.
bzr-revno: 377
2009-03-05 10:52:55 +00:00
Martin Thompson
c4c3fb4851 Tidied
bzr-revno: 376
2009-03-04 21:57:18 +00:00
Martin Thompson
3370a7f7c1 Pulled select row helper function out
bzr-revno: 375
2009-03-04 21:56:50 +00:00
Martin Thompson
940eb089e9 Merging multiple items done
bzr-revno: 374
2009-03-04 21:56:27 +00:00
Martin Thompson
5660ef45fd A few more tests
bzr-revno: 373
2009-03-04 21:55:50 +00:00
Martin Thompson
068f963077 First test of service manager works
bzr-revno: 372
2009-03-04 21:55:24 +00:00
Martin Thompson
b662b16c6f Still doing controllers, but missed this one
bzr-revno: 369
2009-03-04 21:54:00 +00:00
Martin Thompson
2be33e6c66 Pre merge from SVN
bzr-revno: 367
2009-03-04 21:53:09 +00:00
Martin Thompson
bef8369e86 Started splitting out the service manager
bzr-revno: 366
2009-03-04 21:52:32 +00:00
Tim Bentley
c451048355 Complete Alerts tab state saving , and reloading.
bzr-revno: 365
2009-03-04 19:55:37 +00:00
Tim Bentley
2ce0aafcc9 Update alerttab to save font and color and provide preview.
bzr-revno: 364
2009-03-04 19:25:27 +00:00
Tim Bentley
d924329cf0 Add persistance to Alerts Tab and default colors
bzr-revno: 363
2009-03-03 17:21:47 +00:00
Tim Bentley
6ff73a17b8 Tidy up more code and add color to alerts font
bzr-revno: 361
2009-03-02 22:37:03 +00:00
Tim Bentley
2faca83bd9 More Fixes and clean ups
bzr-revno: 358
2009-03-02 22:35:32 +00:00