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

1577 Commits

Author SHA1 Message Date
Tim Bentley 64de9f1d7a Head909 2010-07-02 19:21:59 +01:00
Tim Bentley 0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Andreas Preikschat f519e037b9 Some random fix ;-) 
bzr-revno: 909
 2010-07-02 19:18:54 +01:00
andreas c93cad3a20 fixed a small bug 2010-07-02 19:00:23 +02:00
Tim Bentley 603c2e7be2 Head907 2010-07-02 17:54:22 +01:00
Jon Tibble 3447c7fed6 XML: Start refactoring 2010-07-02 15:57:48 +01:00
Jon Tibble 45375e7442 Cleanup plugins (Bug #600996) 2010-07-02 13:13:46 +01:00
Jon Tibble 9e1474e851 Fix songs and wildcard import 2010-07-02 11:29:36 +01:00
Tim Bentley e3e6c82eac Fix up display levels and renames 2010-07-02 06:16:30 +01:00
Jon Tibble 254ac02561 Alerts: Import and long lines 2010-07-01 13:56:02 +01:00
Jon Tibble c61121bb51 DB cleanups 2010-07-01 11:31:37 +01:00
Jon Tibble 079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Martin Thompson 38ccc21f89 Added GUI for importing OpenSong 2010-06-30 22:19:18 +01:00
Martin Thompson 02fd6fe4da Main class handles zipfiles 2010-06-30 21:05:43 +01:00
Martin Thompson 94553048e3 Merged from trunk 2010-06-30 20:54:30 +01:00
Martin Thompson 7ce01d0e65 Moved test scripts and data to a test folder 2010-06-30 20:53:08 +01:00
Raoul Snyman eda9093064 Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 
bzr-revno: 903
 2010-06-30 21:29:08 +02:00
Raoul Snyman 568e80748c Change namespace of other plugin icons. 2010-06-30 20:16:07 +02:00
Tim Bentley 9ebdc1e2d3 Update missing checks 2010-06-30 18:05:12 +01:00
Tim Bentley 8b5931d50c Video and Image updates 2010-06-30 17:30:25 +01:00
Tim Bentley 7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Raoul Snyman 5c4a835dac Added decent images for remotes, alerts and song usage. 2010-06-29 23:23:56 +02:00
Jon Tibble cede98c0cb Head 897 2010-06-29 16:40:46 +01:00
Jon Tibble d37b4d1e8d Plugin and other docstrings 2010-06-29 16:25:24 +01:00
Jon Tibble 6235140868 Head r896 2010-06-29 11:04:22 +01:00
Jon Tibble 0b8e4f2845 Fix filter usage (Fixes theme deletion) 2010-06-29 11:02:23 +01:00
andreas 6d233a75a0 - small fixes 2010-06-28 22:02:56 +02:00
andreas 68a934de71 - small fixes 2010-06-28 22:00:35 +02:00
Martin Thompson 75c6ba2284 Improved =s 2010-06-28 20:55:04 +01:00
andreas 93ae2b9cf8 resolved conflicts 2010-06-28 21:28:28 +02:00
Tim Bentley ebb368559f Head894 2010-06-28 20:14:31 +01:00
Jon Tibble 19ff5dec55 Refactor database code 
bzr-revno: 894
 2010-06-28 20:12:08 +01:00
andreas 51e07d66df fixed deletion bug in media manager (custom, media, images, presentations) 2010-06-28 21:05:55 +02:00
andreas eccd2999ee started fixing deletion bug in media manager (custom still to be done) 2010-06-28 20:20:05 +02:00
Tim Bentley 109ef118c4 Head893 2010-06-28 17:48:36 +01:00
andreas 5de4832ae7 changed the variable name 2010-06-28 18:23:59 +02:00
andreas 4f05a42627 fixed bug #599066 2010-06-28 17:43:40 +02:00
Jon Tibble 3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble f0896422d4 Fix off-by-one in song saving 2010-06-28 13:43:14 +01:00
Jon Tibble ad9328a30f RFC: Fix couple of leftovers 2010-06-28 12:24:18 +01:00
Jon Tibble 6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Jonathan Corwin 9a2b05f830 Prevent crash if OpenOffice not installed on Windows 2010-06-27 23:34:33 +01:00
Jonathan Corwin 7cf31532b8 Remove error trace if no impress 2010-06-26 21:34:26 +01:00
Tim Bentley 4b38c22d30 Alerts now work and more hiding cleanups 2010-06-26 15:13:10 +01:00
Jonathan Corwin d4b70b34e7 sofimport error trap if ooo not installed 2010-06-26 12:16:59 +01:00
Tim Bentley d82f94e326 Refactor Alert code for Html 2010-06-26 09:09:09 +01:00
Jonathan Corwin e5da1cb5f9 head 2010-06-25 21:21:40 +01:00
Jonathan Corwin 217b40c26f Bug 598361 - Preview presentation error. Ensure presentations close correctly 2010-06-25 21:20:03 +01:00
Jon Tibble 4d1a7e8b41 Cleanup last few commits 2010-06-25 20:01:03 +01:00
Martin Thompson baec9d5c2f Unicode chars in my testcase work OK 2010-06-25 19:20:45 +01:00
Jon Tibble 01421770ed Head r883 2010-06-25 19:14:38 +01:00
Frode Woldsund 4807fed62e Fixed (c) symbol. 
bzr-revno: 883
 2010-06-25 16:28:55 +02:00
Frode Woldsund 5c5427d963 Merged with current trunk and used '\xa9' as (c) symbol 2010-06-25 10:07:51 +02:00
Raoul Snyman 0034691bd0 pptviewlib changes 2010-06-25 07:22:58 +02:00
Jon Tibble 585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jonathan Corwin adb5776d61 pptviewlib changes 
bzr-revno: 881
 2010-06-24 22:01:57 +01:00
Raoul Snyman ae17e3b6b3 Some more OOo related fixes. 2010-06-24 22:48:38 +02:00
Jonathan Corwin a23a354532 pptviewlib.dll 2010-06-24 21:25:35 +01:00
Jonathan Corwin 6f525dc0c2 Presentation tidies 
bzr-revno: 880
 2010-06-24 21:16:34 +01:00
Martin Thompson 76e3538127 Imports all of SOF and the opensong default songs without crashing 2010-06-24 21:13:32 +01:00
Jon Tibble 95945c622f Fix check_item_selection 
bzr-revno: 879
 2010-06-24 21:05:04 +01:00
Jonathan Corwin 1ea6d1da50 Merge excepts together (again) 2010-06-24 20:58:45 +01:00
Raoul Snyman 10663be6bc Fix bug #595676i, improve the OSIS importer and add source languages from Pootle. 
bzr-revno: 878
 2010-06-24 21:46:53 +02:00
Jonathan Corwin 84b7a4f4ad head 2010-06-24 20:43:06 +01:00
Jonathan Corwin 30f8441ce9 Merge excepts together 2010-06-24 20:42:15 +01:00
Raoul Snyman 9dc12ac522 Try to fix the song plugin's dependence on OOo. 2010-06-24 21:40:41 +02:00
Jon Tibble 78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Raoul Snyman e29127477e Merge from trunk. 2010-06-24 21:18:50 +02:00
Raoul Snyman aa2d1586ea Fix bug #595676 and improve the OSIS importer. 2010-06-24 20:35:01 +02:00
Jon Tibble 4ac7ce16c0 Ampersands and item selection checking 
bzr-revno: 877
 2010-06-24 19:16:43 +01:00
Jon Tibble 2c42aa0289 Refactor check_item_selected 2010-06-24 16:50:40 +01:00
Jon Tibble ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Jonathan Corwin bbf5ecf0fc Head 2010-06-23 23:30:15 +01:00
Jonathan Corwin fe01718d46 Presentation tidyups 2010-06-23 23:26:54 +01:00
Tim Bentley da5ff6c3db Update version numbers and white space 2010-06-23 18:37:01 +01:00
Frode Woldsund 56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Frode Woldsund 07db3c4c21 removed u' 2010-06-23 09:22:05 +02:00
Frode Woldsund 4826408536 stupid whitespace ... 2010-06-23 09:05:43 +02:00
Frode Woldsund b95b598340 Forgot to import translate from openlp.core.lib :( 2010-06-23 08:54:11 +02:00
Martin Thompson f7b8095f68 Handles [1] type verse numbering, parses all of SOF and Songs.zip 2010-06-22 22:54:10 +01:00
Frode Woldsund 683a53c594 Fixed 2 translate() functions in songplugin 2010-06-22 23:53:18 +02:00
Martin Thompson 9c573d7bef Handles [C] followed by non-numbered lines, by assigned them all to [C1] 2010-06-22 22:24:24 +01:00
Martin Thompson e8a397d3ec Handles songs without a preliminary V tag 2010-06-22 21:41:31 +01:00
Jon Tibble d9d976d64b Cleanup and import fix 2010-06-22 16:09:49 +01:00
Jon Tibble 43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Jon Tibble 70df49476d Long lines 2010-06-22 00:38:54 +01:00
Jon Tibble 1cf85205ce More translate() 2010-06-21 22:04:56 +01:00
Jon Tibble 2a71670149 Stray trailing backslashes 2010-06-21 21:52:25 +01:00
Tim Bentley a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman c8bbd65349 Updated the majority of the translate() functions. 
bzr-revno: 866
 2010-06-21 20:00:21 +02:00
Raoul Snyman 74767e3874 Merge from trunk 2010-06-21 18:47:34 +02:00
Raoul Snyman 6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Tim Bentley b08707cc80 Head864 2010-06-21 17:21:00 +01:00
Tim Bentley af5ae6047a Fix bug with Inactive not working 2010-06-21 17:20:41 +01:00
Jon Tibble e7b4e16405 Couple o' Cleanups 2010-06-20 14:03:06 +01:00
Jon Tibble 700b41390e Head r863 2010-06-20 13:43:09 +01:00
M2j 888bc50622 fixes 2010-06-20 08:48:32 +02:00
M2j 8e25f3850e corrected one string 2010-06-20 01:58:42 +02:00
M2j 87c21201e7 HEAD 2010-06-20 01:31:32 +02:00
M2j 3061c319d5 Automatic verse order entry expanding 
deleted a misplaced QSpacerItem
 2010-06-20 01:16:15 +02:00
Jon Tibble afefd3c45f Head r861 2010-06-20 00:12:00 +01:00
M2j 735ae40996 single character verse entries 2010-06-19 23:54:53 +02:00
Jon Tibble e3a07c1e57 Cleanups 2010-06-19 21:21:36 +01:00
Raoul Snyman d321249366 Removed unnecessary comments. 2010-06-19 20:38:17 +02:00
Jon Tibble 1005a3c1b1 Cleanup unneeded trailing backslashes 2010-06-19 19:29:18 +01:00
Raoul Snyman 38255ffdb6 Merge from trunk 2010-06-19 20:03:21 +02:00
Raoul Snyman e615401007 Make image formats filter in a central location. 2010-06-19 20:00:50 +02:00
Jon Tibble 91c0fcb9e7 Head r860 2010-06-19 18:30:41 +01:00
Jon Tibble 0235f251bf Cleanups 2010-06-19 14:18:38 +01:00
Jon Tibble 2d050b07db Head r858 2010-06-19 12:53:20 +01:00
Jon Tibble 14cafa91c2 Complete openlp.migration removal 
bzr-revno: 858
 2010-06-19 12:42:33 +01:00
Tim Bentley 0a3bf10fb9 Translation updates 
Remove Text over video for now.
Fix song editing bug

bzr-revno: 856
Fixes: https://launchpad.net/bugs/596211
 2010-06-19 12:02:18 +01:00
Tim Bentley cf73f77e0d Fix bug #596211 2010-06-19 11:37:58 +01:00
Tim Bentley 18a32a2217 Remove Media dynamic backgrounds for now. 
Clean up Media, Image and Custom translate strings
 2010-06-19 04:43:10 +01:00
Jon Tibble f7fb45e69e Complete openlp.migration removal 2010-06-18 23:13:10 +01:00
Raoul Snyman a616a7d160 - Fixed a problem where authors with null names in the db were not editable. 
- Fixed the add author shortcut on the edit song form to split up the author's name so that the above error doesn't occur.
- Made the Clear Search button run a blank search (which is what the user expects).
 2010-06-19 00:09:41 +02:00
Raoul Snyman d48daa2c98 Added last bits of streamlining of Song Maintenance form. 2010-06-18 21:55:45 +02:00
Raoul Snyman cc2db3a5f4 Merge from trunk 2010-06-18 18:44:10 +02:00
Jon Tibble 226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble 7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble 5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble 16ab2da4d6 Fix HTTPBible verse counts 2010-06-17 22:01:30 +01:00
Jon Tibble d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble 1af5f700e2 Bible search fix 
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

bzr-revno: 850
 2010-06-17 15:06:47 +01:00
Frode Woldsund d5bd675489 Complete trUtf8 -> translate conversion 
bzr-revno: 849
 2010-06-17 15:03:10 +01:00
Frode Woldsund 7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Jon Tibble 9d9464aee5 Head r848 2010-06-17 12:45:45 +01:00
Jon Tibble 4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Frode Woldsund cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Jonathan Corwin 674b9e00ad Remove the main display so we can see the ppt's 2010-06-16 22:22:02 +01:00
Jonathan Corwin 62376aa93d Head 2010-06-16 21:54:41 +01:00
Jon Tibble 04f2a9797b Bible search fix: 
* Add feedback
* cater for partial file-based bibles
* Prevent an uncaught exception
 2010-06-16 02:48:52 +01:00
Jon Tibble 5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +01:00
Jon Tibble 814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Martin Thompson fc27f8107e First test looks promsing 2010-06-15 22:25:50 +01:00
Martin Thompson 2f077c3982 Renamed so as not to conflict with the Pthon XML library which is still used by the Song XML class 2010-06-15 22:24:49 +01:00
Martin Thompson f709c90f0a Start opensong importer 2010-06-15 21:03:47 +01:00
Jon Tibble b7e3ec4441 RFC: Refactor a filter method 2010-06-15 19:08:02 +01:00
Jon Tibble 37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Jon Tibble 85661fe6e4 RFC: Tweaks 2010-06-15 16:42:52 +01:00
Meinert Jordan 48619f72cc Various i18n fixes. 
bzr-revno: 847
 2010-06-15 17:22:26 +02:00
Jon Tibble e92b017348 RFC PT4: The other DB plugins 2010-06-15 03:08:22 +01:00
Jon Tibble 554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
Jonathan Corwin f2a0fb9f29 Well at least you can open a presentation now. Can't see it yet though cos of some silly black window in the way 2010-06-14 23:01:04 +01:00
Jonathan Corwin 89e78b6528 Head 2010-06-14 22:12:22 +01:00
Jonathan Corwin b6057c0156 resize thumbs 2010-06-14 21:59:07 +01:00
Jon Tibble e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Jon Tibble 7c2c8f26e1 Revert resource location 2010-06-14 18:56:42 +01:00
Jon Tibble 754da4c28e Fix PEBKAC 2010-06-14 14:43:04 +01:00
Jon Tibble a4f0df76cc Fix QColorDialog usage 2010-06-14 14:23:19 +01:00
Frode Woldsund e94bba463b The translate() function is a static method. Fixed. 2010-06-14 14:24:30 +02:00
Frode Woldsund 7b43146421 merged with current trunk 2010-06-14 08:38:51 +02:00
Jon Tibble 0558900951 Head r843 2010-06-14 03:48:12 +01:00
Jon Tibble f54a423832 Fix bible runtime data location 2010-06-14 03:42:47 +01:00
Raoul Snyman b5aa2f86f9 Added in dynamic adding of authors and topics to the song edit form. 2010-06-13 22:29:47 +02:00
Raoul Snyman 4af5e1d8ef Tidied up the UI of the Song Maintenance Dialog to make it look good on all OSes. 2010-06-13 20:28:59 +02:00
Jon Tibble 54aa8958fe RFC PT2: Refactor Manager 2010-06-13 00:00:14 +01:00
Jon Tibble ec4d54e66a Fix variable naming 2010-06-12 21:22:58 +01:00
Jon Tibble e70ad3ca90 addToServiceItem is not an Icon 2010-06-12 21:22:20 +01:00
Jon Tibble 999df4e296 Fix db settings location 2010-06-12 21:06:01 +01:00
Jon Tibble 13c646153f Keep library classes/methods in lib dirs 2010-06-12 13:33:04 +01:00
Jon Tibble 5f2042168d RFC: Cleanup DB metadata for RFC 2010-06-12 03:14:18 +01:00
Jon Tibble 55f6197212 RFC: Refactor database setup code 
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
 2010-06-12 02:52:04 +01:00
M2j 96415d47a4 revert change in verse ordering 2010-06-11 19:07:33 +02:00
Jon Tibble 914a710f95 More docstrings 2010-06-10 22:30:50 +01:00
Jon Tibble 78114b8063 Apply docstrings feedback 2010-06-10 20:45:02 +01:00
Jon Tibble 7ddaff2843 Head r839 2010-06-10 17:36:49 +01:00
M2j 69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
Jon Tibble 5868a37018 Small refactorings 2010-06-10 14:28:41 +01:00
Jon Tibble 31c3be39e4 Remove old song import/export forms 2010-06-10 14:18:08 +01:00
M2j 2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
Jon Tibble 3a7ca9a185 Fix module name thinkos 2010-06-10 14:12:19 +01:00
M2j f8580333bd realized too late, that you may not test for NoneType 2010-06-10 11:10:54 +02:00
M2j 0229b362af phrase verse index decoding more pythonish 2010-06-10 11:05:56 +02:00
Jon Tibble 8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
M2j 50f123490f fix: verses in comboBox of editverseform 2010-06-09 23:50:55 +02:00
M2j 8296b8dc84 Additional translatable strings 
Removed string_to_unicode and variant_to_unicode
 2010-06-09 23:15:37 +02:00
M2j 940c6fd44f Set theme and service file content to UTF-8 
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
 2010-06-09 21:10:57 +02:00
M2j 8733ceac70 HEAD 2010-06-09 20:33:47 +02:00
Jon Tibble 0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Frode Woldsund f5b02659b6 Replaces missed trUtf8('...') -> translate(u'PluginName.ClassName', '...') 2010-06-09 13:11:01 +02:00
Jon Tibble 559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
M2j 62d7649e2b reenable verses without number in the verse order 2010-06-08 15:47:23 +02:00
Frode Woldsund 2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
M2j 69b98a44e8 fix for image names 2010-06-07 11:37:27 +02:00
M2j d7a84fb592 derive captable image formats from Qt 2010-06-07 01:40:24 +02:00
M2j 69608de08c fix: bug introduced in 833 2010-06-07 01:23:29 +02:00
Frode Woldsund 23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
M2j 761f30ec00 fix: set editverseform comboBox only for valid verse names 2010-06-06 21:56:41 +02:00
Tim Bentley b624ba0ed0 Fixed for now - could be better 2010-06-06 18:03:48 +01:00
Tim Bentley 950dc73d2b try again and fix from last merge 2010-06-06 17:25:39 +01:00
Tim Bentley cb35fb7be4 Head832 + fix 2010-06-06 16:59:01 +01:00
Frode Woldsund 6e1ef3cc70 Fixed translate() function in songsPlugin and songusagePlugin 2010-06-06 16:22:00 +02:00
Frode Woldsund 5e64814133 Fixed translate() function in RemotePlugin 2010-06-06 15:44:07 +02:00
Frode Woldsund 3c096b4d0a Fixed translate() function in PresentationPlugin 2010-06-06 15:42:24 +02:00
Frode Woldsund 4571e808ba Fixed translate() function in MediaPlugin 2010-06-06 15:30:57 +02:00
Frode Woldsund febb743acd Fixed all translate() function in ImagePlugin 2010-06-06 15:26:42 +02:00
Tim Bentley 0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01:00