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

1194 Commits

Author SHA1 Message Date
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 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 8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +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
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 68a0cd06e5 Head775 2010-03-27 20:28:04 +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
Raoul Snyman daa42bce71 Fixed the "Bible" item in the "Import" menu. 
bzr-revno: 773
 2010-03-27 19:06:13 +02: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 92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley 49ecc162ad Head770 2010-03-26 20:04:04 +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
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 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 317730be1f Head r759 2010-03-23 15:15:00 +00:00
Jon Tibble 310f790e8e Some head 2010-03-23 15:14:20 +00:00
Raoul Snyman 1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Tim Bentley fd23dbc030 Head755 2010-03-22 18:33:54 +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
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 12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02: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
Raoul Snyman 253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02: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
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
Raoul Snyman 2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02: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
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
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 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 90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02: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 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
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
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
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
Tim Bentley e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +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
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
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 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
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
Jonathan Corwin 714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +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
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 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
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 4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00: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
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
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 8f985291ac Head 2010-02-23 19:19:22 +00:00
Tim Bentley 8e2efcb183 Fix spelllling 2010-02-23 19:19:06 +00:00
Tim Bentley 60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +00:00
Jon Tibble ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00: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 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 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
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
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 b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +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 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 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