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

1072 Commits

Author SHA1 Message Date
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
Tim Bentley
ca919b74c3 Correct settings 2009-09-13 07:25:07 +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
Jon Tibble
bdaced63a3 Fix song list reloading bug 2009-09-11 22:34:05 +01:00
Tim Bentley
b005954e7e Head 2009-09-11 20:51:16 +01:00
Tim Bentley
43b374a994 Impress issues 2009-09-11 20:51:06 +01:00
Jon Tibble
633d2af487 Merged in lp:~meths/openlp/trivialfixes 
bzr-revno: 531
 2009-09-11 21:48:21 +02:00
Tim Bentley
f4966a655e Head 2009-09-11 20:30:12 +01:00
Tim Bentley
07452df24a fixes to custom and save state of screen 2009-09-11 20:29:57 +01:00
Raoul Snyman
74c6349ab0 Merged changes in from lp:~raoul-snyman/openlp/songmaintenance 
bzr-revno: 530
 2009-09-11 21:27:05 +02:00
Jon Tibble
e0427f8254 Fix DnD issue 2009-09-11 20:05:09 +01:00
Jon Tibble
50de32e882 Trunk resync 2009-09-11 19:46:15 +01:00
Jon Tibble
af2234b945 RFC: Different toolbar layout for Service Manager 2009-09-11 12:18:00 +01:00
Tim Bentley
b657af7a64 Head 2009-09-11 07:18:31 +01:00
Tim Bentley
1ca02a3536 Custom Plugin cleaup 2 2009-09-11 05:56:52 +01:00
Tim Bentley
3c3c1f19ce Custom Plugin cleaup 2009-09-11 05:54:22 +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
Raoul Snyman
0df9e356a6 Bringing up to date with trunk. 2009-09-10 20:15:40 +02:00
Jon Tibble
b865c8ab7f Add usability information for ServiceManager ThemeComboBox 2009-09-10 18:03:17 +01:00
Tim Bentley
e0a2e5e1f3 For space police 2009-09-09 19:09:17 +01:00
Tim Bentley
457885019b Custom editing fix part 2 2009-09-09 18:40:12 +01:00
Tim Bentley
cb1d5c2abb Custom editing fix part 1 2009-09-09 18:30:33 +01:00
Tim Bentley
05761ef442 Song editing fix - final 2009-09-09 18:02:44 +01:00
Tim Bentley
d7ecd8a493 Song editing fix 2009-09-09 18:01:02 +01:00
Tim Bentley
4dd19eb643 Song editing fix 2009-09-09 17:34:24 +01:00
Raoul Snyman
1e7cd82103 Added a small description to the lib module. 2009-09-08 22:03:39 +02:00
Raoul Snyman
fb9914fb08 Changed the license info from docstrings to normal comments. 2009-09-08 21:58:05 +02:00
Jon Tibble
38ff2f92ac Fix typo in previous commit 2009-09-08 18:51:34 +01:00
Raoul Snyman
4cfd7dfbaa Attempt to fix a bug where the song list is never updated. 2009-09-08 17:21:30 +02:00
Jon Tibble
0efcf15752 Move network code to initialise(). Add weight to plugin attibutes documentation 2009-09-07 21:39:17 +01:00
Tim Bentley
0f8700ce93 Fix up after last merge 2009-09-07 20:14:01 +01:00
Tim Bentley
9ec28564ee Head again 2009-09-07 20:00:41 +01:00
Tim Bentley
b734da3aa6 More Presentation Hacks, Remotes gets activation option 2009-09-07 20:00:24 +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
60a919a2da Save UI: change config section to 'user interface' 2009-09-07 19:02:21 +01:00
Tim Bentley
c2c4940ca7 Replace missing line 2009-09-07 18:08:58 +01:00
Tim Bentley
c1ccf8752f Head 2009-09-07 18:07:29 +01:00
Tim Bentley
28d52460d4 Reanme files 2009-09-07 18:06:11 +01: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
Raoul Snyman
9f12188b4f Merged lp:~raoul-snyman/openlp/docstrings into trunk. 
bzr-revno: 524
 2009-09-07 08:16:53 +02: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
Raoul Snyman
94cd34d333 Merge from an old remote branch. 2009-09-06 20:59:21 +02:00
Raoul Snyman
e4756a1c6c Merge latest code from trunk, plus more modifications to docstrings. 2009-09-06 20:47:48 +02: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
5e088abfc2 Change Layout formula 2009-09-06 13:13:09 +01:00
Tim Bentley
e613cdac81 Presentation plugin - still getting there 2009-09-06 09:11: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
984915a979 Missing files - oops 2009-09-05 09:58:29 +01:00
Tim Bentley
00eecfc8c2 Presentation Plugin - cleanup 2009-09-05 09:52:01 +01:00
Tim Bentley
b94f091fb2 Cleanups and fixes 2009-09-05 07:29:23 +01:00
Jon Tibble
9992df2cb6 Fix formatted XML to output unicode strings 2009-09-05 02:27:38 +01:00
Jon Tibble
a8cf61c199 Fix loading of formatted XML theme files broken in previous commit 2009-09-05 02:22:05 +01:00
Raoul Snyman
dea03e21c8 Moar and moar documents-tations!! 2009-09-05 00:50:19 +02:00
Jon Tibble
cda62a2617 Save themes in formatted XML and clean touched files 2009-09-04 23:27:53 +01:00
Raoul Snyman
88a9eb020f Make the "Edit All" button work! 2009-09-04 19:19:54 +02:00
Raoul Snyman
0c7a53bb16 Moar documentation! 2009-09-03 23:41:34 +02: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
a183d1cc8b Try to stop blank last slides being generated 2009-09-03 05:46:09 +01:00
Tim Bentley
555b9b92a5 Renderer - speed up adding to slide controller 2009-09-03 05:41:30 +01:00
Raoul Snyman
a077fe40eb Updated the documentation more. Moved the Songs plugin out into it's own file. 2009-09-02 22:42:57 +02: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
20303b1812 Plugin Clean up for trying to display non selected items 2 2009-09-01 06:17:32 +01:00
Tim Bentley
3ba22197dd Plugin Clean up for trying to display non selected items 2009-08-31 22:53:35 +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
b6593be27f Minor renderer changes 2009-08-31 07:53:55 +01:00
Tim Bentley
9457030c04 Update Logging and make bibles selected 2009-08-30 22:14:15 +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
8b1425d163 Image Plugin Performance improvements part 2 2009-08-24 18:43:15 +01:00
Tim Bentley
b3f45c21c4 Image Plugin Performance improvements part 1 2009-08-24 18:01:55 +01:00
Tim Bentley
7dea8a37a1 SlideController clean up part 4 2009-08-24 06:13:27 +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
f6578fc000 Song Exit error message 2009-08-15 20:19:34 +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
1987258fcb Stop plugins being initialised when Inactive. Bible Import Tab state correction 2009-08-15 08:55:16 +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
0a5712b86c Fix plugins so Settings Tab is always available even if Inactive 2009-08-15 07:54:37 +01:00
Tim Bentley
d87f58747c Finish (for now) Impress start and Stop from Config 2009-08-14 20:12:14 +01:00
Tim Bentley
586425b0d9 Clean up Remotes 
Add Tab to remotes to set Openlp.org port number
 2009-08-14 18:41:29 +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
a684ecaa1e More remote fixes 2009-08-12 17:29:00 +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
7a6695b1a6 Update Presentation Plugin 2009-08-11 20:21:52 +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
Tim Bentley
6fa6b78e35 Head 2009-08-10 20:11:54 +01:00
Tim Bentley
6b7444ea97 Initial add of Remote Plugin 2009-08-10 19:20:46 +01:00
Tim Bentley
dc05294be6 Clean up the renderer some more. 
Play with profiler
 2009-08-09 19:38:44 +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
38f8005d5d Fix code so we can save songs 2009-08-08 07:19:09 +01: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
cf56b14383 Fix errors in Italic handling 
Add delay to get screen refresh workig
 2009-08-05 18:59:37 +01:00
Tim Bentley
f79b7b4e01 Fix renderer for text wider than the screen. 2009-08-05 18:11:31 +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
Tim Bentley
5ccf0581de Change xml handling to work with Normal/Bold and True 2009-08-03 20:49:21 +01: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
470f1d19df Add attributes to themes 
Save data
Update data
 2009-08-01 20:25:53 +01:00
Tim Bentley
b93cfa887c Head changes 2009-08-01 19:04:13 +01:00
Tim Bentley
279c34a67e Add theme bold/Italics to renderer 2009-08-01 19:03:07 +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
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
3111e07327 Updated the docstrings some more, and moved the documentation around a little. 2009-07-14 15:51:27 +02: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
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
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
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
d59f80d819 Rename the video plugin to media 2009-05-15 06:15:53 +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
5f2873a615 Start adding serviceitem code and SlideController code. 
Fix some Theme bugs as well

bzr-revno: 441
 2009-05-03 13:43:26 +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
Jonathan Corwin
32cf72153d Keeping the boss happy, if that is possible (formatting) 2009-05-02 22:40:10 +01:00
Jonathan Corwin
6ced2f5037 Bring song migration up to date. Remove need to edit dmp file. 2009-05-02 20:32: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