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

2209 Commits

Author SHA1 Message Date
Tim Bentley
20cdcde1a1 Remove print 2010-04-06 19:34:51 +01:00
Tim Bentley
b51998c760 Replace missing tags 2010-04-06 19:26:25 +01:00
Tim Bentley
04fa7bda1c fix missing method 2010-04-06 19:14:59 +01:00
Tim Bentley
a866b30491 Presentation bug fixes 2010-04-06 18:52:09 +01:00
Tim Bentley
e934c7e623 Compress Impress previews 2010-04-05 12:06:37 +01:00
Tim Bentley
f5a9f9ed89 Update Image thumbnail if original has changed 2010-04-05 09:13:45 +01:00
Tim Bentley
fa8c543556 Clean up Media mediaitem 2010-04-05 08:22:21 +01:00
Tim Bentley
5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley
b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley
1cb25db4e9 Head785 2010-04-04 14:16:14 +01:00
Tim Bentley
5b9229777d fixes 2010-04-04 14:16:01 +01:00
Jonathan Corwin
728c524ff5 fixes 2010-04-04 09:26:53 +01:00
Raoul Snyman
513b7a10b7 Reworked the verse dialog. 2010-04-04 01:00:05 +02:00
Jonathan Corwin
b602dcafe0 A few more tidyups 2010-04-03 23:14:37 +01:00
Jonathan Corwin
3ceb0267e9 cleanups+multi-song delete 2010-04-03 20:17:37 +01:00
Raoul Snyman
646d8a658c A few changes. 2010-04-03 18:43:29 +02:00
Tim Bentley
4eca8e265a Consistancy 2010-04-03 12:59:17 +01:00
Tim Bentley
10c3c54db2 Correct error message 2010-04-03 12:11:57 +01:00
Tim Bentley
cef6d29a7c Plugin name case issues for additional items 2010-04-03 10:06:05 +01:00
Tim Bentley
89bbdea0b9 Code fixes from last merge and presentation improvements 2010-04-03 09:42:51 +01:00
Tim Bentley
3c2fb96376 File housekeeping all files not touched for over 1 year 2010-04-03 09:10:26 +01:00
Tim Bentley
bd8598a00e Head 782 2010-04-03 09:04:58 +01:00
Tim Bentley
18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Tim Bentley
66054c44e4 Display handling cleanups and changes to service item flags 
bzr-revno: 783
 2010-04-03 09:03:36 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Raoul Snyman
f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Jonathan Corwin
dad04bfd90 SOF fixes+delete all selected songs 2010-04-03 00:24:51 +01:00
Raoul Snyman
20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Tim Bentley
a178ea447e Handle backward compatibility 2010-04-02 20:05:37 +01:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Tim Bentley
3c8c20f2d4 cleanup the screen size code 2010-04-02 19:12:54 +01:00
Jonathan Corwin
2cabfc67f3 Hook it all together 2010-04-02 15:10:10 +01:00
Raoul Snyman
21b6bedcb4 First go at the Song Import Wizard. 2010-04-02 14:23:40 +02:00
Jonathan Corwin
1f41039e07 Split song and sof specifics 2010-04-01 22:36:03 +01:00
Jonathan Corwin
949dfd927d head 2010-04-01 08:43:36 +01:00
Jonathan Corwin
33f4bc05f2 tidy 2010-04-01 08:42:42 +01:00
Jonathan Corwin
8d6d2b8272 standalone sof test script 2010-04-01 00:06:57 +01:00
Tim Bentley
60d7416e69 Fix service path errors 2010-03-30 20:01:23 +01:00
Raoul Snyman
ab9b72dfb5 Fixed a broken import. 2010-03-30 09:05:24 +02:00
Jon Tibble
d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Tim Bentley
afc1fbde17 Remove ...s 2010-03-28 17:11:33 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
e67e21f445 Fix loss of slide menu for save services 2010-03-28 15:18:36 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Tim Bentley
66cd5f042a Stop outlines for footers they are too small 2010-03-27 20:27:33 +00:00
Raoul Snyman
85d44554b0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
 2010-03-27 22:19:47 +02:00
Raoul Snyman
d2670b1cb0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
 2010-03-27 21:59:35 +02:00
Tim Bentley
a6bcdb4e56 Fix dates 
bzr-revno: 774
 2010-03-27 17:16:10 +00:00
Raoul Snyman
daa42bce71 Fixed the "Bible" item in the "Import" menu. 
bzr-revno: 773
 2010-03-27 19:06:13 +02:00
Tim Bentley
fb3abf7f36 Fix date 2010-03-27 16:46:52 +00:00
Raoul Snyman
08ee7be551 Fixed the "Bible" item in the "Import" menu. 2010-03-27 16:53:41 +02:00
Raoul Snyman
abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley
8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Tim Bentley
d2b56fc719 Basic verse counting 2010-03-27 07:16:39 +00:00
Tim Bentley
097a414c59 oops string bug 2010-03-27 07:03:12 +00:00
Tim Bentley
611ae15790 Fix up tag editing 2010-03-27 07:01:50 +00:00
Tim Bentley
b90169a129 Song editing improvements 2010-03-26 21:04:50 +00:00
Raoul Snyman
8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Tim Bentley
35255c250e Fix up theme bugs 2010-03-26 20:48:46 +00:00
Tim Bentley
92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley
49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Raoul Snyman
ee879774b8 Update the credits. 2010-03-26 21:44:18 +02:00
Tim Bentley
44f3e02a5c Fix outline rendering bug 2010-03-26 08:49:26 +00:00
Tim Bentley
e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +00:00
Tim Bentley
463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley
63aa583942 Images bulk delete if selected 2010-03-25 20:01:15 +00:00
Tim Bentley
ef77f58136 Head 2010-03-25 19:27:57 +00:00
Tim Bentley
51d6d2410b Fix QT4.4 bug in service manager 2010-03-25 19:27:46 +00:00
Tim Bentley
b20c29f45c Add delete to context menu 2010-03-25 18:52:16 +00:00
Jonathan Corwin
b490e74012 Start presentation apps in right place 2010-03-24 22:59:05 +00:00
Raoul Snyman
ff215ace3c Fixed two bugs in the web downloads import dealing with non-latin characters. 
bzr-revno: 765
 2010-03-24 23:59:39 +02:00
Raoul Snyman
0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman
2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
Tim Bentley
a091c8f3b6 Fix Quick bible enter 2010-03-24 19:15:25 +00:00
Tim Bentley
59dd69eee1 Do not display empty list 2010-03-24 19:10:08 +00:00
Tim Bentley
f158044d5e Fix row counts and bad code before superfly spots it 2010-03-24 19:05:45 +00:00
Tim Bentley
161f7e88bb Head763 2010-03-24 18:59:48 +00:00
Tim Bentley
33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Jon Tibble
6578fb529e Test tweaks and remove unused variables 2010-03-23 21:51:20 +00:00
Jon Tibble
fd3b17f6fa Head r761 2010-03-23 20:33:17 +00:00
Jonathan Corwin
ab72e7d7cc Close down presentation apps at end correctly 
bzr-revno: 761
 2010-03-23 21:59:32 +02:00
Jon Tibble
fe1755c25f Head r760 2010-03-23 19:56:25 +00:00
Jonathan Corwin
00cb0d1277 Close down presentation apps at end correctly 2010-03-23 19:41:54 +00:00
Raoul Snyman
2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Jon Tibble
c4b49a1511 Import fixes 2010-03-23 16:00:52 +00:00
Jon Tibble
317730be1f Head r759 2010-03-23 15:15:00 +00:00
Jon Tibble
310f790e8e Some head 2010-03-23 15:14:20 +00:00
Jonathan Corwin
c4f9320f4d Fix up the bible migration. 
bzr-revno: 759
 2010-03-23 15:31:57 +02:00
Jonathan Corwin
f6e6357176 Fixed a bug with transparent backgrounds. 
bzr-revno: 758
 2010-03-23 15:30:29 +02:00
Jonathan Corwin
8524bf9174 Remove transparent error: QImage::scaled: Image is a null image 2010-03-22 23:50:32 +00:00
Raoul Snyman
1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Jonathan Corwin
16c510acf0 Head 2010-03-22 19:44:06 +00:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Tim Bentley
32086cb877 Fix slide selection so looks nice 2010-03-22 18:31:43 +00:00
Jonathan Corwin
5f2a637b63 Commit verses at end 2010-03-22 08:45:45 +00:00
Raoul Snyman
19c5c07c54 Add Christian and Phill to the credits 
bzr-revno: 755
 2010-03-22 10:37:18 +02:00
Raoul Snyman
ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Jonathan Corwin
13f76ef2cb Head 2010-03-21 22:54:49 +00:00
Jonathan Corwin
3500167907 Bible migration 2010-03-21 22:54:26 +00:00
Raoul Snyman
be598da4f9 Fixed a number of issues in the Bibles: 
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
 2010-03-22 00:16:43 +02:00
Raoul Snyman
5c6289d13d Being overzealous about unicode. 
bzr-revno: 753
 2010-03-21 22:44:42 +02:00
Tim Bentley
c8a0c2a34b Stop double loading of Service items from service manager unless triggered by remote edit. 
bzr-revno: 752
 2010-03-21 20:38:58 +00:00
Raoul Snyman
12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Tim Bentley
2ff005cdc0 Add verse tag to live song rows 2010-03-21 19:55:51 +00:00
Tim Bentley
3e4683bd6d Fix up issues and confusion with service item edit 2010-03-21 17:56:56 +00:00
Jon Tibble
2f840944e9 Unused variable fixes 2010-03-21 15:55:45 +00:00
Raoul Snyman
82a6bc791f Bug fixes for the Bible imports. 
bzr-revno: 751
 2010-03-21 17:11:37 +02:00
Tim Bentley
2d43cd2d8a Stop double loading of service items 2010-03-21 15:08:46 +00:00
Raoul Snyman
253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Tim Bentley
8f692d13be Remove prints 2010-03-21 14:30:18 +00:00
Tim Bentley
848eb601af Fix NONE appearing as song verses 
Delay the hidden window display
Fix missing add status for custom slides
 2010-03-21 14:24:41 +00:00
Jonathan Corwin
7866c8d031 Head 2010-03-20 21:21:34 +00:00
Raoul Snyman
7eaaf22467 Fixed a bug where failed/cancelled imported Bible files are not deleted. 
bzr-revno: 749
 2010-03-20 17:47:05 +02:00
Tim Bentley
92d39b1d98 Minor tidy ups and add stupidity block 2010-03-20 08:34:36 +00:00
rimach
9169870520 make Blank button workable 2010-03-20 00:02:23 +01:00
Raoul Snyman
eddd112811 Failed Bibles are deleted. 2010-03-20 00:08:06 +02:00
Tim Bentley
b011104deb Head747 2010-03-19 08:07:12 +00:00
Tim Bentley
09f18fd96d Clean up maintenance - Complete 2010-03-19 07:23:48 +00:00
Raoul Snyman
2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley
66b23f6a6f Fix dialog 2010-03-18 22:06:51 +00:00
Tim Bentley
44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman
6414330b2c Reworked the BibleGateway Bibles. 
Changed some code to be standards compliant.
 2010-03-18 23:36:30 +02:00
Jon Tibble
de767459bd Fix 2 for AppLocation changes 2010-03-18 16:25:25 +00:00
Jon Tibble
5d2fe81d71 Fix for AppLocation changes 2010-03-18 15:52:37 +00:00
Jon Tibble
fea160c5c4 AppLocation.PluginsDir changes 2010-03-18 15:43:27 +00:00
Tim Bentley
ff8145cef1 Add in maintenance page to service manager 2010-03-17 21:25:35 +00:00
Tim Bentley
72d2d8f83d Clean up service item form names 2010-03-17 21:08:18 +00:00
Tim Bentley
a71505a10c Bible can add verses to service item 2010-03-17 19:09:09 +00:00
Tim Bentley
13608bedae Alter form removal complete 2010-03-17 19:04:39 +00:00
Jon Tibble
a81c39ca65 Import fix 2010-03-16 21:13:23 +00:00
Tim Bentley
60a3468edb remove alert dialog 2010-03-16 21:03:10 +00:00
Jon Tibble
ed370650f8 Head r744 2010-03-16 20:58:34 +00:00
Jon Tibble
98a5dcd1b4 Some head 2010-03-16 20:57:57 +00:00
Raoul Snyman
dc6c6bec31 - Removed commented code (just for you, TRB143!) 
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
 2010-03-16 22:43:41 +02:00
Tim Bentley
c1182aa9cc Add maintain menu item 2010-03-16 20:30:33 +00:00
Tim Bentley
de8d0f4d9c Add add to existing service item 2010-03-16 20:22:28 +00:00
Raoul Snyman
c63c09017e Merge to head. 2010-03-16 21:47:48 +02:00
Raoul Snyman
9044ed3a4a Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems. 2010-03-16 21:46:19 +02:00
Raoul Snyman
223393e38b Fix a problem introduced per ongeluk. 2010-03-15 21:23:07 +02:00
Raoul Snyman
1835a922e5 Merged in some translation fixes. 
bzr-revno: 743
 2010-03-15 20:54:09 +02:00
Raoul Snyman
90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Jon Tibble
366fe2f508 Head r742 and import fix 2010-03-14 23:22:44 +00:00
Tim Bentley
ba21b15214 Fix blank screen color 
Fix save and cancel of services
Fix tool shortcut
add a filter to the save dialog - "OpenLP Service Files (*.osz)

bzr-revno: 742
 2010-03-14 18:00:56 +00:00
Tim Bentley
36b9688695 Fix save service file name 2010-03-14 17:53:14 +00:00
Tim Bentley
23236b50e1 remove print 2010-03-14 17:14:38 +00:00
Tim Bentley
af5a52fa62 Fix service saving and cancelling 
Fix Red and Bla
 2010-03-14 17:05:50 +00:00
Tim Bentley
d0f3322aa5 Fix ServiceManager drag and drop` 
Fix rendering size issues
Fix screen sizes following display changes

bzr-revno: 741
 2010-03-14 14:36:48 +00:00
Tim Bentley
df8ffa53b2 Fix DND for service items 2010-03-14 07:56:39 +00:00
Raoul Snyman
5d8c1e42ba Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. 2010-03-14 00:35:17 +02:00
Raoul Snyman
7da00bc26f Attempt to get Bibles to work properly. 
Merge from HEAD
 2010-03-13 23:48:04 +02:00
Tim Bentley
3b59525e98 Renderer screen and font fixes 2010-03-13 20:50:52 +00:00
Tim Bentley
2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Tim Bentley
601abab854 Text string fixes 
bzr-revno: 739
 2010-03-13 13:02:50 +00:00
Jon Tibble
af74e1d295 Head r738 2010-03-13 12:11:44 +00:00
Jon Tibble
660a35486b Head r737 2010-03-13 12:11:11 +00:00
Tim Bentley
47dc69b194 More text fixes 2010-03-13 08:43:54 +00:00
Raoul Snyman
881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Tim Bentley
db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Raoul Snyman
ccfa7501ce - Fixed up Mac OS X detection 
- Removed an unnecessary import
- Fixed an export
 2010-03-12 20:31:13 +02:00
Jon Tibble
9196a6b6f6 Head r736 2010-03-12 17:43:17 +00:00
Tim Bentley
80da6c5c61 Head 2010-03-12 16:55:21 +00:00
Tim Bentley
4c9bd6d34b Fix text 2010-03-12 16:55:01 +00:00
Raoul Snyman
04c1db2033 Merge from head. 2010-03-12 17:42:47 +02:00
Raoul Snyman
00b9305a51 Doing the docstring thing! 2010-03-12 17:41:15 +02:00
Raoul Snyman
c7c1a9c06a Added icons for: 
- Blank Screen
 - Show Desktop
 - Show Theme Background
 2010-03-12 17:38:56 +02:00
Tim Bentley
cd873b9196 add full stops 2010-03-12 07:31:59 +00:00
Tim Bentley
2607d23c00 String more strings and song edit error 2010-03-11 21:01:19 +00:00
Tim Bentley
68287b9604 String fixes 2010-03-11 19:28:49 +00:00
Jon Tibble
8124f0e8fe Import and weird character cleanups 2010-03-11 14:02:43 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Tim Bentley
dde75e2288 Head733 2010-03-11 12:48:19 +00:00
Jonathan Corwin
9308669ec5 Fix issues regarding the blank button for presentations and added methods to extract presentation text and notes for use in the future. 
bzr-revno: 733
 2010-03-11 13:43:22 +02:00
Tim Bentley
27d09b8be8 Blank text screens do not have footers 2010-03-11 08:29:32 +00:00
Tim Bentley
b3ce7bf940 Refactor theme outlines 2010-03-11 08:11:36 +00:00
Raoul Snyman
142f679098 Fix "red letter" versions of Crosswalk Bibles. 2010-03-11 08:15:29 +02:00
Jonathan Corwin
bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin
1613610853 Good idea to test conflict resolutions before committing 2010-03-10 22:32:27 +00:00
Jonathan Corwin
99a963e509 Head 2010-03-10 22:28:19 +00:00
Jonathan Corwin
d48046c0c3 Blanking issues 2010-03-10 22:24:09 +00:00
Tim Bentley
74b288aa6a Head731 2010-03-10 16:58:07 +00:00
Tim Bentley
9bace991fa renderer changes 2010-03-10 16:57:33 +00:00
Jon Tibble
26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Raoul Snyman
32b267fab9 Windows modifications: 
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

bzr-revno: 730
 2010-03-10 07:50:48 +02:00
Raoul Snyman
1e79260c5c Renamed the versionThread class to VersionThread to fit with our coding standards. 2010-03-09 22:29:45 +02:00
Raoul Snyman
16ea5dd0ad Tidied up the tabs on the media manager. 2010-03-09 22:26:12 +02:00
Raoul Snyman
8e5e1dfc36 Merged from HEAD 2010-03-09 21:58:59 +02:00
Jon Tibble
56d2e30fe6 Head r729 2010-03-09 19:45:13 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble
51d95b661c Head r728 and truth test 2010-03-09 19:14:23 +00:00
Tim Bentley
47bf6252bb Head 728 2010-03-09 18:49:28 +00:00
Tim Bentley
0b1ce89017 Fix translation 2010-03-09 18:19:58 +00:00
Raoul Snyman
0ef8005b52 Fixed up some problems and inadvertant bugs from the move to the scripts directory. 2010-03-09 08:07:42 +02:00
Tim Bentley
b75bc2abbf Remove Print statements 2010-03-08 19:55:13 +00:00
Tim Bentley
55c676dc03 Minor servicemanager fixes 2010-03-08 19:50:35 +00:00
Jon Tibble
54c4bc9c19 Head r727 and C style fix 2010-03-08 19:43:37 +00:00
Tim Bentley
6f87c362d1 Use Icon to show we have Notes 2010-03-07 20:45:27 +00:00
Tim Bentley
5560aac575 Fix expanding service items 2010-03-07 19:22:54 +00:00
Tim Bentley
77e671bd78 Remove unneeded version tagging 2010-03-07 06:42:22 +00:00
Jonathan Corwin
714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Tim Bentley
d3564b2df7 Fix translation 2010-03-06 14:08:51 +00:00
Tim Bentley
88289475ec Head 724 2010-03-06 08:01:30 +00:00
Tim Bentley
1932ed886e Fix up service notes 2010-03-06 08:00:36 +00:00
Jonathan Corwin
a33a6d53ca coding standards 2010-03-05 22:10:53 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Jonathan Corwin
edad400a73 Minor fixes 2010-03-05 19:50:51 +00:00
Jonathan Corwin
851f5a4e47 head 2010-03-05 19:39:30 +00:00
Raoul Snyman
250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley
56f8d3befb Cleaned up logging code 
Added code to stop themes in use being deleted
Added Service Notes to service items
Fixed ServiceManager context menu so it works based on the item selected
Various minor bug fixes
Fix up bug for Theme savings and OOS

bzr-revno: 723
 2010-03-05 13:27:42 +00:00
Tim Bentley
eec672c944 Fix up bug for Theme savings and OOS 2010-03-05 12:06:19 +00:00
Tim Bentley
d2b4bc4314 Fix up Copyright and utf8 2010-03-05 10:04:49 +00:00
Tim Bentley
763b7cfeed Fix up context menu for serviceitem 2010-03-05 09:24:42 +00:00
Jonathan Corwin
77838615b3 Presentations - close app down correctly, and mode to automatically detect file type 2010-03-05 08:36:32 +00:00
Tim Bentley
f4e25bf329 Finish logging cleanup 2010-03-04 22:09:03 +00:00
Tim Bentley
181c7c9946 Event clean ups and fixes 2010-03-04 22:03:43 +00:00
Raoul Snyman
977e896a21 Create the config directory if it doesn't exist yet, in order to save the log file. 
bzr-revno: 722
 2010-03-04 21:47:17 +02:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Jon Tibble
132022205e None tests redux 2010-03-04 18:43:53 +00:00
Jon Tibble
0baa0e6884 Head r721 2010-03-04 18:34:53 +00:00
Tim Bentley
bb0a3f7293 Head 721 2010-03-03 17:51:19 +00:00
Tim Bentley
3084140741 Remove extra line 2010-03-03 17:49:28 +00:00
Tim Bentley
6bff7936eb Add ServiceItemNoteForm and handling 2010-03-03 17:48:37 +00:00
Raoul Snyman
e0acec1274 A fix to the OSIS importer, and added the version file. 
bzr-revno: 721
 2010-03-03 15:28:14 +02:00
Raoul Snyman
98cd78c7b2 Merged to head. 2010-03-03 12:19:01 +02:00
Jonathan Corwin
5863541a61 Split live/preview presentation documents, plus fixes for Windows 
bzr-revno: 720
 2010-03-03 08:28:39 +02:00
Jonathan Corwin
aa5f21b50d Live/Preview presentation changes for Windows 2010-03-02 23:15:13 +00:00
Jonathan Corwin
743ae230a8 Split live/preview presentation documents 2010-03-02 21:01:23 +00:00
Tim Bentley
b949ab0054 Head719 2010-03-02 19:45:54 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman
e7f7fe8861 Added Service Edit and Service Notes icons. 2010-03-02 09:01:56 +02:00
Raoul Snyman
024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Raoul Snyman
e37ab565ad A fix to the OSIS importer, and added the version file. 2010-02-28 22:50:14 +02:00
Jon Tibble
0c97973469 Head r718 2010-02-27 19:29:57 +00:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble
5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley
065986c33c Automate Media type list from phonon 2010-02-27 14:57:33 +00:00
Tim Bentley
86e03f0c11 Move editing to line 2 2010-02-27 10:10:03 +00:00
Tim Bentley
1979f24502 Fix song editing where text is lost 2010-02-27 09:55:44 +00:00
Tim Bentley
4a83e572e9 Fix bugs in last merge and fix comments 2010-02-27 09:18:26 +00:00
Tim Bentley
d47fc53b78 Add Alternate rows to slide controller 2010-02-27 07:39:47 +00:00
Jon Tibble
80d54dc1be None tests 2010-02-27 00:11:26 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley
0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Tim Bentley
38a8575989 Sort out startup http gets. 2010-02-25 21:09:27 +00:00
Raoul Snyman
2766081522 Merged from trunk. 
Fixed a conflict.
 2010-02-24 21:02:39 +02:00
Raoul Snyman
0ddaa2bf4a Some more visual tweaks. 
Fixes for older versions of PyQt4.
 2010-02-24 20:39:12 +02:00
Tim Bentley
3cf8b491ea Fix field name 2010-02-23 19:37:07 +00:00
Tim Bentley
8f985291ac Head 2010-02-23 19:19:22 +00:00
Tim Bentley
8e2efcb183 Fix spelllling 2010-02-23 19:19:06 +00:00
Jon Tibble
d02fc68a72 Fix unzipping theme files 2010-02-22 16:57:08 +00:00
Jon Tibble
61c7b6479f Fix theme import font colours 2010-02-22 16:42:10 +00:00
Jon Tibble
0337127985 Fix theme import alignment 2010-02-22 15:53:23 +00:00
Tim Bentley
60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +00:00
Jon Tibble
45c7fad1d6 Fix theme import colours 2010-02-21 23:40:16 +00:00
Jon Tibble
962f1364e4 Fix v2 theme importing 2010-02-21 23:05:03 +00:00
Jon Tibble
f7d95a8fdb Remove debug prints 2010-02-21 21:41:30 +00:00
Tim Bentley
20ab9d1ce2 Force regeneration of all changes 2010-02-21 14:12:47 +00:00
Tim Bentley
985ce73dfd Force regeneration of sevice item on theme change 2010-02-21 14:06:56 +00:00
Jon Tibble
5715819e83 Head r710 2010-02-21 13:21:44 +00:00
Jon Tibble
ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Raoul Snyman
6f4b4b2616 Moved all "get_xxxxx_directory" functions into one "AppLocation" class. 
Set the plugin manager to use this new AppLocation class as well.
 2010-02-21 14:43:03 +02:00
Raoul Snyman
174a85d969 Couple more visual tweaks, to make OpenLP look good in Windows. 
Print the location of file OpenLP is logging to in debug mode.
 2010-02-21 12:28:35 +02:00
Raoul Snyman
70251a4321 - Created independant "get_config_directory" and "get_data_directory" methods. 
- Moved log file to configuration file location for non-root/administrator users.
 2010-02-21 08:32:43 +02:00
Jonathan Corwin
357c1e6a20 A few more small presentation fixes/cosmetics. 
bzr-revno: 708
 2010-02-19 21:38:56 +02:00
Jonathan Corwin
cf62d6187f More presentation fixes/tidies 2010-02-17 22:57:59 +00:00
Tim Bentley
516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble
711bd3cf00 Import fixes and copyright insertion 2010-02-17 19:13:04 +00:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Jon Tibble
2287db11d7 head 2010-02-17 19:04:53 +00:00
Jonathan Corwin
959c2469a5 Fix PowerPoint and PowerPoint viewer screen lookup 2010-02-16 22:28:35 +00:00
Tim Bentley
0335547d73 Fix SongUsage Dialog so should be complete 
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

bzr-revno: 705
 2010-02-16 19:58:10 +00:00
Tim Bentley
04d79f72a1 Fix typos 2010-02-16 18:51:41 +00:00
Tim Bentley
e0b7c54ddc Minor fixes and unicode changes 2010-02-16 18:47:26 +00:00
Tim Bentley
fef8986550 Fix theme import bug 2010-02-16 17:40:41 +00:00
Tim Bentley
2fefcef09d Alerts editing now work - history and pre determined 2010-02-14 20:19:57 +00:00
Tim Bentley
acc97f3c79 Alerts now have history 2010-02-14 13:27:32 +00:00
Tim Bentley
9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley
973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley
47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley
944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
73d6a24792 Add Fontsize and location to alerts settings 2010-02-09 14:56:31 +00:00
Tim Bentley
643801ae05 New alert tag features and song usage dialog 2010-02-09 14:44:36 +00:00
Jon Tibble
8240605839 Head r702 2010-02-09 12:20:56 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley
be4c40b401 Cleaner fix 2010-02-09 11:20:19 +00:00
Tim Bentley
fc9b8fcdad fix presentation import values 2010-02-09 08:28:34 +00:00
Tim Bentley
18760262ab Edit Cancel updating song by accident 2010-02-07 20:11:37 +00:00
Tim Bentley
d4668e2ba3 Fix log levels 2010-02-06 17:13:55 +00:00
Tim Bentley
2ffe5af9a3 Fix log levels 2010-02-06 17:12:03 +00:00
Tim Bentley
8992f410a5 Bible fixes part 2 2010-02-06 16:51:18 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Raoul Snyman
bd4d2daa74 Removed now unnecessary file. 2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b Mis-named variable in QuickSearch click. 2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57 Fixed multi-verse dual bible. 2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49 Last few fixes 2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Tim Bentley
58894e2afa Update default config file and add version checking option 2010-02-05 19:08:47 +00:00
Raoul Snyman
ce6738a976 Fixed up searching for non-latin characters in Bible book names. 
Removed an annoying exception to do with debug logging.
 2010-02-04 21:34:12 +02:00
Tim Bentley
079c9a4679 Key handling changes 2010-02-04 19:25:32 +00:00
Raoul Snyman
e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Tim Bentley
5838495bb4 Update remote client 2010-02-03 18:53:31 +00:00
Tim Bentley
1164ab9beb Added Extra key events to SlideController 2010-02-03 18:29:02 +00:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Tim Bentley
af58043690 Make startup smoother with a Thread 2010-02-02 20:05:21 +00:00
Tim Bentley
632fae5a76 Remove print statements 2010-02-02 18:16:11 +00:00
Tim Bentley
377f3ad6ea Put the messagelistener back 2010-02-01 20:06:50 +00:00
Tim Bentley
17a08e3847 latest hacking 2010-02-01 19:42:52 +00:00
Raoul Snyman
01ec0f407f Fixed up some of the Bible loading 2010-01-31 22:36:54 +02:00
Raoul Snyman
db534dc2e8 Removed signals while they're still not working. 2010-01-31 21:51:23 +02:00
Raoul Snyman
2b5ddb13a4 An attempt to fix the problems some folks are having. 2010-01-31 21:49:01 +02:00
Raoul Snyman
ab7125c98e Make the progress bar only pop up when we *actually* fetch a verse from the Internet 2010-01-30 10:42:03 +02:00
Raoul Snyman
d45a9733af Fixed a bug in Windows and other versions of PyQt4 where "setProperty" was not available. Changed it to "setValue" which is what it's meant to be anyways. 2010-01-30 00:26:30 +02:00
Raoul Snyman
baabcba290 Changed the value of the progress bar to look a little more "active" 2010-01-29 23:35:02 +02:00
Raoul Snyman
0cbb079aa3 Added the little progress bar back in. 2010-01-29 23:26:24 +02:00
Raoul Snyman
965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman
0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Tim Bentley
3610b232bd Fix up saving and loading service items 2010-01-29 16:38:28 +00:00
Tim Bentley
1fd98217ab Pass active presentation types to other controllers 2010-01-29 13:06:47 +00:00
Tim Bentley
04d7a9227e Automate Presentation filters 2010-01-29 11:59:13 +00:00
Tim Bentley
dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley
dc7148b76e Fix screen display setup when returning from presentations 2010-01-28 11:46:25 +00:00
Tim Bentley
3baf2f2f7b Import the startup showing the update screen 2010-01-28 07:39:34 +00:00
Tim Bentley
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Tim Bentley
9beb6c7db5 Add Image layer and rename text layer 2010-01-25 20:34:47 +00:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley
dd18a4da76 Fix spacing of media items 2010-01-24 16:30:48 +00:00
Tim Bentley
d6912adbf8 Make display blanking work correctly 2010-01-24 16:28:18 +00:00
Tim Bentley
e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley
ad40020169 Fix logging to single file 
Fix QMessage to displays on correct screen.
 2010-01-24 13:58:39 +00:00
Raoul Snyman
4a9a8149c4 Fixed up web Bibles. 
Renamed "csv.py" to "csvbible.py" to resolve a namespace conflict with the Python csv module.
 2010-01-24 09:08:14 +02:00
Tim Bentley
c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley
2d7c9dd402 Fixes from the merge 2010-01-22 18:59:36 +00:00
Tim Bentley
56275fbc21 Remove prints for merge 2010-01-22 17:54:08 +00:00
Tim Bentley
af3f69afce Finish off Theme thumbnail performance improvements 2010-01-21 19:41:17 +00:00
Tim Bentley
a69ba0a151 Fix themes loading performance by storing small icons. 2010-01-18 19:56:02 +00:00
Raoul Snyman
a976d6b59a A few fixes after renaming some functions. 2010-01-17 18:48:45 +02:00
Raoul Snyman
c9e07d3b0c Cleaned up all them docstrings. 2010-01-17 10:56:25 +02:00
Tim Bentley
9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Raoul Snyman
a523d127bd Merge from trunk. 2010-01-11 17:07:53 +02:00
Raoul Snyman
027d6d3e4e Moved the stop import out of the base class, since Qt doesn't like it. 2010-01-11 17:03:16 +02:00
Tim Bentley
85bada91ba Move towards sorting out renderer text sizes 2010-01-10 19:03:52 +00:00
Tim Bentley
ee8a92b77f fix screen lines calcs so they are correct. 
Prints added for rendering size diagnostics.
 2010-01-10 11:49:04 +00:00
Tim Bentley
6ef3f6aadc Lots of fixes: 
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
 2010-01-09 09:34:06 +00:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Raoul Snyman
0374233db6 Lots of changes here, I think. 
- Pluggable import system
- The enumeration class provides the correct importer class
- Reworked Bible verse parsing, using regular expressions
- Reworked verse query method to accept multiple verse ranges
- Renamed lots of methods, which is probably gonna break lots of stuff
 2009-12-30 19:29:08 +02:00
Raoul Snyman
34ab7ea901 Started moving Bible formats to a generic system. 2009-12-28 01:54:00 +02:00
Raoul Snyman
6c7939bd71 Implemented canceling of imports and some better handling around the import process. 2009-12-28 00:19:39 +02:00
Raoul Snyman
8d04e4cc11 YEEEHAH! Revision 700! 2009-12-24 20:03:49 +02:00
Raoul Snyman
4f09b260db This time had to bribe the Line Length Police! 2009-12-24 20:01:39 +02:00
Raoul Snyman
c900ed9b5c Merged from HEAD. 
Cleaned up conflict.
Fixed a few other potential breaks.
Paid bail to the Line Length Police.
 2009-12-24 19:54:39 +02:00
Raoul Snyman
4500b02824 Moved openlp database upgrade script to scripts directory. 
Removed old bible import form.
Removed some debugging in the OSIS and bible db classes.
 2009-12-24 17:21:03 +02:00
Raoul Snyman
3e425803e3 Last few fixes for the OSIS importer. 2009-12-24 17:12:09 +02:00
Raoul Snyman
b7f224e280 99% of OSIS import now working. 2009-12-24 00:31:14 +02:00
Raoul Snyman
1181152c5a Trying to regexify and make the OSIS importer more robust. 2009-12-23 23:09:07 +02:00
Raoul Snyman
dc0f7e7f5a Finishing touches on the Import wizard and the OpenSong bible importer. 2009-12-21 22:58:00 +02:00
Raoul Snyman
e29a88e9a3 Final touches to the import Wizard; Fixed a few bugs in the OpenSong implementation. 2009-12-19 00:31:28 +02:00
Raoul Snyman
fa93b10b94 A pre-import working Import Wizard. 2009-12-16 22:52:44 +02:00
Tim Bentley
0cdc827a1d Fix up custom plugin issues 2009-12-16 17:54:45 +00:00
Raoul Snyman
77bf9b6f9a Web download bibles now load correctly. 2009-12-16 04:22:16 +02:00
Tim Bentley
a7833f900f Add Outline and Shadow size options and make editable 2009-12-15 20:36:15 +00:00
Tim Bentley
43a99451a3 Add Outline and Shadow size options 2009-12-15 20:11:52 +00:00
Raoul Snyman
438c5cf00a Added an OpenSong implementation, a new import wizard, and validation for the import wizard. 2009-12-15 21:37:56 +02:00
Tim Bentley
1b1b811cb7 Custom display footer if Credit required 2009-12-14 18:10:00 +00:00
Tim Bentley
2f09c70274 Presentation cleanup - finished for now 2009-12-14 17:05:53 +00:00
Tim Bentley
1271eac76e Correct comment 2009-12-14 16:55:58 +00:00
Tim Bentley
be3fecac20 Sort out Presentation plugin Handler 
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
 2009-12-13 22:08:10 +00:00
Tim Bentley
fe959f451f Fix up Alert generation (needs to be tested on duel screen) 2009-12-13 14:20:24 +00:00
Tim Bentley
d676430ffa Add option to Custom to suppress the footer. 
Not always needed for Copyright.
Default Required
 2009-12-13 08:57:58 +00:00
Tim Bentley
f7f0f18142 Fix bug with Verse Tags being lost when expanding or contracting the verse edit list 2009-12-13 08:28:51 +00:00
Tim Bentley
14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley
231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley
aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley
540f63c9de Fix Theme handling so Song level works again 
bzr-revno: 686
 2009-12-10 17:03:21 +00:00
Tim Bentley
3cc63840f4 Fix up theme string issues to False is matched 
Remove any Print statements
 2009-12-09 17:09:45 +00:00
Tim Bentley
9893a887ab Add slideTransition Flag to theme to allow for transitions to be turned off at theme level 2009-12-08 17:52:45 +00:00
Tim Bentley
4158ae458e Clean up ServiceItem usage in ServiceManager 2009-12-08 17:04:27 +00:00
Tim Bentley
26dd28d083 Remove unneeded code 2009-12-06 19:22:41 +00:00
Tim Bentley
5d79141cfc Verse tagging - combo complete 2009-12-06 16:50:13 +00:00
Tim Bentley
528004df23 Start to add change in toolbar 2009-12-06 13:55:07 +00:00
Tim Bentley
40523ed0f6 Toolbar fixups 2009-12-06 08:39:56 +00:00
Raoul Snyman
583d96b5d1 Song Verses Toolbar: Phase 1 
- Convert verse icons to drop-down verse menu.
 2009-12-06 09:14:11 +02:00
Tim Bentley
a745d15a98 Remove the media tab correctly 2009-12-05 09:44:44 +00:00
Tim Bentley
480fc4771f Fix up song tagging so case does not matter 
Fix bug in transitions when using images
Remove MediaTab as not wanted
 2009-12-05 08:05:11 +00:00
Tim Bentley
b8149cc826 Fix up Icon code to use isinstance 
Fix up code to ignore cases when doing tests.
 2009-12-04 20:25:48 +00:00
Tim Bentley
547074d29a Verse tagging verses must be in format of vX 2009-12-04 18:52:44 +00:00
Tim Bentley
1b6ad5814b Verse Tagging complete 2009-12-02 11:22:48 +00:00
Tim Bentley
a2ff6433ba Build Dynamic Icons for SlideController 2009-12-02 10:59:54 +00:00
Tim Bentley
ca7d032aa5 Correct Icon Path 2009-12-02 09:20:40 +00:00
Tim Bentley
250fd4e41b Fix Icons on toolbar 2009-12-02 08:55:15 +00:00
Tim Bentley
156a70208b Add new types to verse editing 
Clean up dialog so looks better
Add controls around the editor in terms of validation
 2009-12-02 08:35:02 +00:00
Tim Bentley
7eeb81f00a Head683 2009-12-01 17:02:34 +00:00
Tim Bentley
6ebd1d9e60 Cleanup from rendering changes 2009-12-01 17:02:18 +00:00
Michael Gorven
9f5d1956ac Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings. 
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

bzr-revno: 683
 2009-12-01 09:13:35 +02:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice. 
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
 2009-11-30 22:29:26 +02:00
Tim Bentley
9f80c5a742 Fix problem with slide controller 
soften the renderer transition
 2009-11-30 19:51:29 +00:00
Raoul Snyman
47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Raoul Snyman
074b639635 Removed "Video Mode Rendering" as it is no longer relevant (or even related!) 2009-11-30 20:26:37 +02:00
Tim Bentley
6380cc5126 Fix up song verse expansion to handle no verse order 
Fix bug in slide controller when no slide and button is pressed
 2009-11-30 18:22:43 +00:00
Michael Gorven
ba89e6e1a2 Fix copyright symbol in translation strings. 2009-11-30 08:39:36 +02:00
Tim Bentley
939909fdd8 Remove Timer from transitions not needed 
Add Code to use the Verse Order to expand songs
 2009-11-29 21:03:24 +00:00
Raoul Snyman
a6d8813a50 Merge from HEAD, started changing the copyright to include Michael Gorven. 2009-11-29 22:30:41 +02:00
Raoul Snyman
910a61ce3f Merged in HEAD 2009-11-29 22:01:23 +02:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
77b0da2c41 Tidy ups pre merge 2009-11-29 19:00:10 +00:00
Tim Bentley
f46cd2c6cb Song validation changes 2009-11-29 18:21:40 +00:00
Raoul Snyman
420b0ef68d Merged in Michael's changes from the AST module and resolved some conflicts. 2009-11-29 16:18:42 +02:00
Raoul Snyman
ae905abfde Spruced up the About page. Made a few configuration key changes. 2009-11-29 16:07:25 +02:00
Tim Bentley
ff8ab8f14f Fix song editing validation 2009-11-29 14:06:41 +00:00
Tim Bentley
829e4976e2 Slide Controller refactoring ready for Verse changes 2009-11-29 08:33:46 +00:00
Tim Bentley
f04e5c078a Head677 2009-11-28 12:39:13 +00:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Michael Gorven
2bd1ff755b Merge lp:~mgorven/openlp/get-strings-ast: Use AST module to parse code and extract translation strings. 
https://code.launchpad.net/~mgorven/openlp/get-strings-ast/+merge/15328

bzr-revno: 677
 2009-11-28 14:09:17 +02:00
Tim Bentley
1c60a29d68 Basic Tranisitions 2009-11-28 09:12:22 +00:00
Tim Bentley
2247d01d6f Verse Tag editing - Add, Edit, Edit All and save work 2009-11-28 07:50:12 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values 
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
 2009-11-27 21:54:37 +00:00
Raoul Snyman
ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Michael Gorven
662962abef Merge from trunk. 2009-11-27 13:00:01 +02:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley
8dc0742e1e Headr676 2009-11-26 18:42:00 +00:00
Tim Bentley
1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Raoul Snyman
4d715a3d5d Moved i18n to resources (better place for it). 
Fixed up openlp-get-strings.py to use the new TS file location.
Started fixing up the trUtf8() strings.
 2009-11-24 21:51:41 +02:00
Raoul Snyman
d42a6a53e1 Merged in changes from trunk 2009-11-24 21:10:54 +02:00
Raoul Snyman
a3714e98d1 Lowercased config settings (they are case insensitive). 
Made text render antialiased.
 2009-11-24 21:08:53 +02:00
Tim Bentley
fe2d35a937 More song tagging changes - fixes 2009-11-23 17:54:47 +00:00
Tim Bentley
5e2beba4ea More song tagging changes 2009-11-23 17:28:21 +00:00
Tim Bentley
50aa143446 Save verse details 2009-11-22 20:51:52 +00:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley
56c69bd8e8 Fix up renderer to protect it from Gushie 2009-11-21 14:32:19 +00:00
Raoul Snyman
461acc2bc8 Added a small fix, courtesy of Jon Tibble. 2009-11-14 22:18:14 +02:00
Raoul Snyman
9e96aac849 Make sure screen and button are still black after coming back from media. 2009-11-13 23:37:11 +02:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking. 
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
 2009-11-13 23:24:59 +02:00
Raoul Snyman
8c599b6707 Fixed up an issue between the display screen and the blank button 2009-11-13 22:10:35 +02:00
Raoul Snyman
262577bd6e Removed an unused parameter from addToolbarButton, and added a "checkable" argument. 2009-11-13 20:46:47 +02:00
Tim Bentley
8da19172a7 Slide Controller cleanups and Media bug fixes 
bzr-revno: 669
 2009-11-12 19:51:58 +00:00
Tim Bentley
6df4e5a369 Remove transition code 2009-11-12 19:12:13 +00:00
Tim Bentley
04873758e9 Remove extra Video 2009-11-12 19:05:24 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
9970ae8281 Transitions between slides 2009-11-12 17:48:49 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Tim Bentley
e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00
Jon Tibble
37e2342a8c Unicode and import fixes 
bzr-revno: 668
 2009-11-12 17:18:30 +00:00
Jon Tibble
a821179a63 A unicode fix for themes 2009-11-12 00:49:55 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00
Tim Bentley
1eb41aab78 SlideController cleanups 2009-11-11 19:10:38 +00:00
Tim Bentley
ab12f73a21 spacing cleanups 2009-11-10 20:44:02 +00:00
Tim Bentley
0170d09c21 Add media Preview code 
bzr-revno: 666
 2009-11-10 19:03:05 +00:00
Tim Bentley
f778948abb Reset Preview when exiting media 2009-11-10 06:13:59 +00:00
Tim Bentley
1c3c672e9b Add Media Preview to slideController 2009-11-09 20:27:25 +00:00
Tim Bentley
b6332e7ff5 Fix media previews ti work and not display the extra screens 2009-11-09 16:37:37 +00:00
Tim Bentley
9eb88a4300 Try to hide display screens for previews 2009-11-09 06:11:26 +00:00
Tim Bentley
bf63b2ae2f Fix up toolbar handing to stop toolbar going off screen 
Added Media Toolbar for the media items
Added it to Preview 
Added and wired in a volume control
 2009-11-09 05:58:45 +00:00
Jon Tibble
95acdbfde0 Fix import 2009-11-09 00:11:01 +00:00
Tim Bentley
ff8e181d19 Clean up slidecontroller 
bzr-revno: 665
 2009-11-08 18:35:56 +00:00
Tim Bentley
bc28e3e78f Clean up slide sizes part 2 2009-11-08 17:40:43 +00:00
Tim Bentley
ebce104f30 Clean up slide sizes part 1 2009-11-08 17:02:46 +00:00
Tim Bentley
00ed999964 Fix bugs in theme and slidecontroller 
bzr-revno: 664
 2009-11-08 15:20:48 +00:00
Tim Bentley
f18ba14fc9 remove print for log 2009-11-08 14:16:02 +00:00
Tim Bentley
5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
Tim Bentley
85e158c458 SlideController cleanups 
bzr-revno: 663
 2009-11-08 13:36:45 +00:00
Tim Bentley
f3f3906ca0 Add test to stop icons going over the limit 2009-11-08 09:09:23 +00:00
Tim Bentley
66a6dfd42a Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media" 2009-11-08 08:58:31 +00:00
Tim Bentley
f0e0cfa4c1 Head552 2009-11-08 07:22:12 +00:00
Jonathan Corwin
c10b4742be Presentation fixes 
bzr-revno: 662
 2009-11-07 19:39:52 +00:00
Jonathan Corwin
337df8da9f Fix Impress off-by-one and slow slide update problems Meths found 2009-11-07 16:45:49 +00:00
Tim Bentley
1bedf56dc3 Plugin clean ups 
bzr-revno: 661
 2009-11-07 16:19:18 +00:00
Tim Bentley
381e91294f Fix blocking for Active/Inactive 2009-11-07 14:58:24 +00:00
Tim Bentley
2e02f1c94f Remove "Can_be_disabled" as no longer require 
Sort out status handling in plugin form.
 2009-11-07 07:42:18 +00:00
Tim Bentley
6148d845ae Headr660 2009-11-07 06:49:14 +00:00
meths@btinternet.com
eba4115490 Fix file handling 
bzr-revno: 660
 2009-11-07 06:45:25 +00:00
Tim Bentley
87d3cbf289 Remote editing for custom and theme fix 
bzr-revno: 659
 2009-11-07 00:05:34 +00:00
Jon Tibble
ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Jonathan Corwin
65736ef8d1 Fix a couple of issues with last commit 2009-11-06 19:23:58 +00:00
Tim Bentley
38e3ca66cb Fix error in previous merge for ThemeManager 
Get Custom Working with remote editing
 2009-11-06 18:50:46 +00:00
Tim Bentley
b6602e67d4 Headr658 2009-11-06 17:36:38 +00:00
Tim Bentley
4f495da735 Remote Edit for Custom 2009-11-06 17:36:18 +00:00
Jon Tibble
aa8b7c3fe5 Clean theme handling 
bzr-revno: 658
 2009-11-06 15:38:30 +00:00
Michael Gorven
a89cec05da Change to Unicode string. 2009-11-06 11:52:04 +02:00
Michael Gorven
4ee481ca6e Change to Unicode string. 2009-11-06 11:52:04 +02:00
Tim Bentley
6139f049d4 Refactor Service Item and clean up Slide Controller 
bzr-revno: 673
 2009-11-15 16:57:11 +00:00
Tim Bentley
365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley
f9f4cc2518 Renderer cleanups and fixes 2009-11-15 07:07:40 +00:00
Raoul Snyman
2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs 
bzr-revno: 671
 2009-11-15 09:02:27 +02:00
Tim Bentley
98e4b47d91 headr670 2009-11-14 17:01:14 +00:00
Tim Bentley
78fd8efdf7 Remove unneed varables 
Move code into serviceItem
Fix up splitter code
 2009-11-14 12:24:27 +00:00
Tim Bentley
26b9274604 ServiceItem cleanup - fix presentation issues 2009-11-14 11:47:10 +00:00
Tim Bentley
3ecec95aca ServiceItem cleanup - remove code duplication 2009-11-14 11:44:06 +00:00
Tim Bentley
b0ae4e4ceb ServiceItem cleanup - fix media playing 2009-11-14 10:51:58 +00:00
Tim Bentley
b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley
0aca1665be ServiceItem cleanup - remove CommandItem 2009-11-14 09:37:54 +00:00
Tim Bentley
02ad0595d7 ServiceItem cleanup - hide lists 2 2009-11-14 09:06:25 +00:00
Tim Bentley
ad6abb1e9c ServiceItem cleanup - hide lists 2009-11-14 09:02:30 +00:00
Tim Bentley
e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Jon Tibble
f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00:00
Jon Tibble
3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble
f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Jon Tibble
b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble
b6eadecb46 isfile test doesn't need try 2009-11-12 23:46:20 +00:00
Jon Tibble
1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Jon Tibble
1c0a86b17f Simplify OS path setting 2009-11-12 23:33:59 +00:00
Jon Tibble
74b08cb9c4 Clean theme loading 2009-11-06 02:12:56 +00:00
Jonathan Corwin
e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley
cfd5b536c7 Headr657 2009-11-05 17:50:57 +00:00
Raoul Snyman
3853a257b3 Merged in display fixes from lp:~raoul-snyman/openlp/fixes 
bzr-revno: 657
 2009-11-05 19:33:38 +02:00
Tim Bentley
831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Tim Bentley
536d26f5db Headr656 2009-11-05 16:43:54 +00:00
Raoul snyman
7a359c047a Renamed DisplayLabel to DisplayWidget 
Fixed typo in DisplayWidget.__init__
Changed MainDisplay.__init__ to call DisplayWidget.__init__ not QtGui.QWidget.__init__
Fixed issue where the display window was showing up on the primary display.
 2009-11-05 08:06:43 +02:00
Jon Tibble
d5e2ba7808 Fix double checks 2009-11-05 00:28:05 +00:00
Jon Tibble
62031c24b9 Fix last theme.parse() without a cleanTheme() 2009-11-05 00:09:19 +00:00
Jon Tibble
3d56391d1c Fix typo 2009-11-04 23:16:33 +00:00
Jon Tibble
c8226bf2fc Fix mismerge 2009-11-04 23:13:17 +00:00
Raoul Snyman
08786fdcec Fixed incorrect showing of image based on splash screen configuration. 
Fixed a bug where the display screen's image would not resize when the display screen was set to another desktop.
 2009-11-04 22:06:46 +02:00
Tim Bentley
03607395eb Song editing utf8 fixes part 2 2009-11-04 19:13:49 +00:00
Tim Bentley
3929792bea Headr655 2009-11-04 18:53:19 +00:00
Tim Bentley
f4d373e7a5 Song editing utf8 fixes part 1 2009-11-04 18:53:05 +00:00
Jon Tibble
0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +00:00
Tim Bentley
4e9aa7f142 Fix song editing error messages 
bzr-revno: 654
 2009-11-04 18:16:35 +00:00
Tim Bentley
4a05f6e9cf Fix song editing 2009-11-04 17:48:46 +00:00
Jon Tibble
2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble
5b4ce8124d Fix theme loading 2009-11-03 20:04:38 +00:00
Jon Tibble
85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Tim Bentley
7029235f45 Expansion and Song editing fixes 
bzr-revno: 653
 2009-11-03 19:12:02 +00:00
Jon Tibble
c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Tim Bentley
2d690c209d Fix phantom expansion in Service Manager 2009-11-03 18:39:58 +00:00
Jon Tibble
84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Jon Tibble
51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Tim Bentley
89e0aee373 Headr651 2009-11-03 06:16:27 +00:00
Tim Bentley
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble
debaf91298 Fix media icon initialisation 2009-11-03 01:38:15 +00:00
Jon Tibble
7f176bf16f Improve iterator use 2009-11-03 01:37:08 +00:00
Jon Tibble
7767746f7a More usability fixes 2009-11-03 01:12:35 +00:00
Jon Tibble
066cfcc830 Single monitor and usability fixes 2009-11-03 00:04:41 +00:00
Tim Bentley
2d473d9436 Headr650 2009-11-02 18:08:16 +00:00
Jon Tibble
d0145bd1e4 Video on multi-monitor setups 2009-11-02 18:05:52 +00:00
Tim Bentley
e3dd7842d4 Merge it right this time 
bzr-revno: 650
 2009-11-02 17:37:41 +00:00
Tim Bentley
29119c91a4 Minor fixes and copyright 
bzr-revno: 649
 2009-11-02 17:30:37 +00:00
Tim Bentley
0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble
a1d29862a4 Enable consecutive video playing 
bzr-revno: 648
 2009-11-02 13:46:26 +00:00
Jon Tibble
ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Jon Tibble
9b0f62d01e Fix plugin translation 2009-11-01 23:15:19 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
e96f54758d Headr646 2009-11-01 20:26:21 +00:00
Tim Bentley
d58327435a Media is starting to work - just 
bzr-revno: 646
 2009-11-01 20:21:49 +00:00