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

8847 Commits

Author SHA1 Message Date
Andreas Preikschat 5ba72b4ad1 head + conflict 2013-07-21 22:34:51 +02:00
Tim Bentley 208e1c2e1e Change uno import for exception form to remove excess uno import noise 
bzr-revno: 2282
 2013-07-21 16:40:04 +01:00
Tim Bentley 72c83d444b missing blank line 2013-07-21 15:13:44 +01:00
Tim Bentley 790c9ae4f6 Add doc string 2013-07-21 15:10:21 +01:00
Andreas Preikschat 3fef52348b head 2013-07-20 11:38:24 +02:00
Tim Bentley 50f3b2b563 Fix uno import noise in python 3 2013-07-19 21:56:31 +01:00
s.mehrbrodt@gmail.com 4894ad6dc2 Improve message when an invalid order was entered 
It mentions that the delimiter has to be a space.

Fixes: https://launchpad.net/bugs/1094809
 2013-07-19 18:52:16 +02:00
Andreas Preikschat 4eb1c3b4f1 do not try to save an empty list 2013-07-19 18:38:43 +02:00
Andreas Preikschat a1577df2be fixed song export again 2013-07-19 18:27:16 +02:00
Andreas Preikschat d5b0f3ac9a fixed version number 2013-07-19 18:07:33 +02:00
Tim Bentley 7d081b866a head 2013-07-19 16:52:01 +01:00
Tim Bentley dc7cb85574 Uneeded import 2013-07-19 16:51:47 +01:00
s.mehrbrodt@gmail.com 951d8964db Don't allow to collapse the Live or Preview Pane. 
They can still be hidden via the menu.
 2013-07-19 17:36:45 +02:00
Andreas Preikschat a0f35e0d5e fixed bug 1183078 
Fixes: https://launchpad.net/bugs/1183078
 2013-07-19 15:57:19 +02:00
Andreas Preikschat e32f0869cc constructors 2013-07-19 15:00:15 +02:00
Andreas Preikschat 5fe64a1d39 super calls 2013-07-18 21:49:44 +02:00
Andreas Preikschat e93a59e83a spelling 2013-07-18 21:44:28 +02:00
Andreas Preikschat cd91e4dcbf changed constructor 2013-07-18 21:42:07 +02:00
Andreas Preikschat 0b22f36e6c changed constructor 2013-07-18 21:38:37 +02:00
Andreas Preikschat cbaf8beb1d changed constructor 2013-07-18 21:36:52 +02:00
Andreas Preikschat 7f541327ca changed to 120 chars 2013-07-18 21:28:35 +02:00
Andreas Preikschat 60833923dc changed super calls 2013-07-18 21:10:19 +02:00
Andreas Preikschat 5e2b7c310c changed constructor 2013-07-18 21:06:42 +02:00
Andreas Preikschat 25e7df079b changed constructor 2013-07-18 21:04:38 +02:00
Andreas Preikschat 8dd57bcc9d changed constructor 2013-07-18 21:00:37 +02:00
Tim Bentley c6f29ca53d fixed for fedora 2013-07-18 18:42:51 +02:00
Andreas Preikschat 9c42011541 fixed test 2013-07-18 16:42:55 +02:00
Andreas Preikschat 283d9c8e9d updated constructors 2013-07-18 16:40:40 +02:00
Andreas Preikschat 025e031d76 updated constructor 2013-07-18 16:34:33 +02:00
Andreas Preikschat 5fb36b5ef7 updated constructor 2013-07-18 16:32:23 +02:00
Andreas Preikschat 59be78f20a changed constructors 2013-07-18 16:28:03 +02:00
Andreas Preikschat 1571cab0cf changed constructors 2013-07-18 16:19:01 +02:00
Andreas Preikschat 13c9a69de1 changed constructors 2013-07-18 16:14:29 +02:00
Andreas Preikschat 3409c491fe changed constructors 2013-07-18 16:11:39 +02:00
Andreas Preikschat 0e480e389b changed constructor 2013-07-18 13:23:59 +02:00
Andreas Preikschat 542cdd78cb changed constructor 2013-07-18 13:19:20 +02:00
Andreas Preikschat e8e003d6f8 changed constructor 2013-07-18 13:17:40 +02:00
Andreas Preikschat 2c167ca996 changed constructor 2013-07-18 13:15:17 +02:00
Andreas Preikschat c4ead1185a head 2013-07-18 08:09:19 +02:00
Andreas Preikschat 53d5cda91a - fixed presentation file mask 
bzr-revno: 2279
 2013-07-18 08:09:00 +02:00
Philip Ridout 22a5dfd3d9 Fixes Bug #1114457: Easy Worship importer progress bar is out 
Adds a test for the EasyWorship Importer

bzr-revno: 2278
 2013-07-17 22:11:05 +01:00
Raoul Snyman cec9689dce Fix up the build_file_mask_string test. 
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
- Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
 2013-07-17 23:07:52 +02:00
Andreas Preikschat 6e66cdefcf clean ups 2013-07-17 16:19:21 +02:00
Andreas Preikschat 4fee73fc37 added test 2013-07-17 15:59:35 +02:00
Andreas Preikschat 63bfacf0d1 fixed presentations 2013-07-17 14:37:42 +02:00
Andreas Preikschat b04d0f42cc fixed image filter 2013-07-17 14:28:48 +02:00
Andreas Preikschat 8bec349273 fixed image filter 2013-07-17 14:22:21 +02:00
Andreas Preikschat 48d2956bdd head 2013-07-17 14:21:44 +02:00
Andreas Preikschat 0512b74f32 reverted change 2013-07-15 20:06:45 +02:00
Andreas Preikschat ad715fec29 try to use locale.strxfrm 2013-07-15 20:02:54 +02:00
Tim Bentley 94e8b90c5d Added first test 2013-07-13 17:33:32 +01:00
Andreas Preikschat 7bb5d6afbd fixed FoliPresenter importer 2013-07-13 17:45:55 +02:00
Andreas Preikschat f37748ba51 fixed easyslides importer 2013-07-13 17:38:14 +02:00
Andreas Preikschat 678bb3e2be fixed DreamBeam importer 2013-07-13 17:35:47 +02:00
Andreas Preikschat cf9768aa2e another remotes fix 2013-07-13 17:30:45 +02:00
Andreas Preikschat aa7d45c09d started to fix remotes 2013-07-13 17:27:19 +02:00
Andreas Preikschat a091fe9395 fixed service load 2013-07-12 21:35:30 +02:00
Andreas Preikschat 765a10d2ea fixed service save 2013-07-12 21:32:46 +02:00
Andreas Preikschat 53b0825a18 fixed service save 2013-07-12 21:26:46 +02:00
Andreas Preikschat 419b6764c3 fixed OpenLyrics importer 2013-07-12 21:13:18 +02:00
Tim Bentley 38eec999b7 Head 2013-07-12 19:13:21 +01:00
Tim Bentley 6e7700d8fd rename url from live to main 2013-07-12 19:13:06 +01:00
Andreas Preikschat b8624e6019 fixed OpenLyrics export 2013-07-12 09:30:38 +02:00
Tim Bentley 6062605622 make sure we have the image file for theme backgrounds 
Fixes: https://launchpad.net/bugs/1197376
 2013-07-11 21:58:15 +01:00
Tim Bentley 51ab25b716 Fix the constraints to be > 1 
Fixes: https://launchpad.net/bugs/1196926
 2013-07-11 21:54:30 +01:00
Andreas Preikschat 3a021b6804 Head 2013-07-09 21:47:12 +02:00
phill-ridout 9190019ce9 head 2013-07-08 06:39:32 +01:00
Tomas Groth de0f5c912f Use json as services format instead of python pickle. 
bzr-revno: 2275
 2013-07-07 17:53:16 +02:00
Andreas Preikschat 3db606f653 theme import fixes 2013-07-07 16:47:04 +02:00
Andreas Preikschat 07039a4908 import clean up 2013-07-07 16:41:43 +02:00
Andreas Preikschat 90e867b797 fixed service print 2013-07-07 16:19:18 +02:00
Andreas Preikschat 1328ca62d2 print form constructor 2013-07-07 16:16:55 +02:00
Andreas Preikschat 83df3c293a fixed sorting again 2013-07-07 16:08:47 +02:00
Andreas Preikschat 8363979040 fixed duplicate finder 2013-07-07 16:00:14 +02:00
Andreas Preikschat 1ce72c3674 head 2013-07-07 15:45:40 +02:00
Philip Ridout 60d3a43c52 Adds a song importer for WorshipCenter Pro. 
Also adds associated tests.

bzr-revno: 2274
 2013-07-07 06:22:32 +01:00
Andreas Preikschat 3d803f4423 reverted not needed changes 2013-07-07 00:27:49 +02:00
Andreas Preikschat a3b99a6a5d removed fixme 2013-07-07 00:24:27 +02:00
Andreas Preikschat dec7cc64b3 head 2013-07-07 00:20:17 +02:00
Andreas Preikschat bd928962bb - app data clean up 
- removed not need enumeration (qt takes care of the config dir)

bzr-revno: 2272
 2013-07-07 00:08:43 +02:00
Andreas Preikschat e145be9873 2013-07-06 23:32:58 +02:00
Andreas Preikschat 022f899c10 added fixme 2013-07-06 23:20:46 +02:00
Andreas Preikschat 18c3574cfe more FTW fixes 2013-07-06 23:18:15 +02:00
Andreas Preikschat 04bbeead56 more fixes to the FTW 2013-07-06 23:06:45 +02:00
Andreas Preikschat e3148f7f1a more fixes to the FTW 2013-07-06 23:04:47 +02:00
Andreas Preikschat a2b7ebcc30 started to fix FTW 2013-07-06 22:56:13 +02:00
Andreas Preikschat 414d9bb914 fixed song import wizard 2013-07-06 22:35:20 +02:00
Andreas Preikschat 2c5eb64f6e sort fix 2013-07-06 21:49:03 +02:00
Andreas Preikschat eb02bc659a appdata clean up 2013-07-06 21:21:21 +02:00
Andreas Preikschat 1aac52de8c do not remember when theme name is empty 2013-07-06 20:33:45 +02:00
Andreas Preikschat 18c33be967 python3 does not have buffer 2013-07-06 20:20:27 +02:00
Andreas Preikschat b0f0fb554f python3 does not have buffer 2013-07-06 20:15:44 +02:00
phill-ridout d1b2cd67c9 Fixed if statment logic. 
Fixed test
 2013-07-06 15:40:49 +01:00
phill-ridout 15153ace9c HEAD 2013-07-06 15:27:11 +01:00
phill-ridout b26793db1f HEAD 2013-07-06 15:23:30 +01:00
Tomas Groth 4e1868983e Merged trunk into branch. 2013-07-06 12:27:08 +02:00
Andreas Preikschat d038aa1d9b head 2013-07-05 21:33:16 +02:00
Andreas Preikschat bcc8853857 fixed attribute error 
bzr-revno: 2270
 2013-07-05 21:22:24 +02:00
Andreas Preikschat f23aafae46 head 2013-07-05 20:47:32 +02:00
Raoul Snyman 208b208412 migration to Alembic. 
bzr-revno: 2269
 2013-07-05 20:42:44 +02:00
Patrick Zimmermann 910587e81f When replacing live background with an image the preview is updated. When resetting the live background the preview was not reset. This commit fixes this. 
bzr-revno: 2268
 2013-07-05 20:41:49 +02:00
Andreas Preikschat 829d68cdd8 fixed attribute error 2013-07-05 20:39:31 +02:00
Andreas Preikschat 6bba69bf88 removed duplicate css 2013-07-05 20:35:27 +02:00
Andreas Preikschat a18129995e head 2013-07-05 20:33:03 +02:00
Raoul Snyman 8ddca0be2b HEAD 2013-07-04 21:15:24 +02:00
Andreas Preikschat b314b59b52 r2266 2013-07-04 08:41:31 +02:00
Andreas Preikschat 15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Andreas Preikschat 08f47c4a49 fixed str.decode 2013-07-03 19:10:37 +02:00
Andreas Preikschat ba462d321b reverted change 2013-07-03 19:06:21 +02:00
Andreas Preikschat 97a4bdf286 reverted changes to prevent merge conflicts 2013-07-03 19:04:45 +02:00
Andreas Preikschat e75a87c5c9 head 2013-07-03 19:03:08 +02:00
Raoul Snyman 88e1932097 HEAD 2013-07-02 22:28:06 +02:00
Andreas Preikschat 8ee3e7265c renames 2013-07-01 08:57:13 +02:00
Andreas Preikschat 9b4518467a r2265 2013-07-01 08:48:01 +02:00
Andreas Preikschat 93bd032cd9 html_builder clean up 2013-07-01 08:47:20 +02:00
Tim Bentley 988fca86a1 Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups 
bzr-revno: 2264
 2013-06-30 20:18:21 +01:00
Andreas Preikschat 2b584dabc7 - Converted last print statements to print functions. 
- Removed old test

bzr-revno: 2263
 2013-06-30 20:53:17 +02:00
Tim Bentley f583be0c76 fix registry call 2013-06-30 19:39:38 +01:00
Andreas Preikschat 72933138a2 clean up 2013-06-30 20:37:12 +02:00
Tim Bentley 1d571507db remove import 2013-06-30 19:36:52 +01:00
Andreas Preikschat 143ce0015f added __hash__ methods 2013-06-30 20:33:41 +02:00
Andreas Preikschat aa2df0c5d1 removed test 2013-06-30 20:08:50 +02:00
Andreas Preikschat 8dd068b9c1 print func 2013-06-30 20:03:26 +02:00
Andreas Preikschat e99ba8a400 head 2013-06-30 19:57:21 +02:00
Andreas Preikschat 7a33b93473 - Removed the loop code and use the loop attribute. 
bzr-revno: 2261
 2013-06-30 19:55:22 +02:00
Andreas Preikschat f4b9ffc481 - fixes bug #1170435 (We should not warn when verse order is empty) 
bzr-revno: 2260
Fixes: https://launchpad.net/bugs/1170435
 2013-06-30 19:42:02 +02:00
Tim Bentley 5af820b7cd more cleanups 2013-06-30 06:45:34 +01:00
Tim Bentley 74432f93e2 oops 2013-06-30 06:35:57 +01:00
Tim Bentley 96fbb5ddbb clean up tags 2013-06-30 06:30:42 +01:00
Patrick Zimmermann 92d586427d Reset preview when reseting live background. 2013-06-29 12:00:44 +02:00
phill-ridout e9c56b6cc5 Corrected if statment and added enumeration class. 2013-06-28 22:16:44 +01:00
phill-ridout 95f75fa869 HEAD Resolved confilct 2013-06-27 19:59:52 +01:00
phill-ridout 0c8a13a087 HEAD 2013-06-27 09:30:34 +01:00
Andreas Preikschat f0693e8163 fixed bs4.__version__ 2013-06-26 20:54:21 +02:00
Tim Bentley b6954eba0f Rename tag 2013-06-25 15:44:56 +01:00
Tim Bentley 26e80be5b7 Who forgot the return 2013-06-24 17:54:23 +01:00
Tim Bentley 32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
Tim Bentley d32ece04a5 add missing imports 2013-06-23 20:51:17 +01:00
Andreas Preikschat 0fee84cbb6 works now 2013-06-23 19:32:25 +02:00
Andreas Preikschat c30748873c python3 fix 2013-06-23 19:22:44 +02:00
Andreas Preikschat 76b508848b head 2013-06-23 19:21:52 +02:00
Raoul Snyman 9bf7284b94 HEAD 2013-06-23 17:29:16 +02:00
Andreas Preikschat 8fe2aed62f bytes/str fix 2013-06-23 16:38:41 +02:00
Andreas Preikschat 4f8d93638b fixes 2013-06-21 20:13:59 +02:00
Andreas Preikschat 6265ce93de fixed tests 2013-06-21 12:16:50 +02:00
Tim Bentley 4d1061f723 Clean up registry for application 2013-06-21 06:16:35 +01:00
Andreas Preikschat b53ed99eea head 2013-06-21 07:06:16 +02:00
Tim Bentley e48b5e4cfb Fix for presentation type 
bzr-revno: 2258
 2013-06-20 21:41:11 +02:00
Tim Bentley 0f0097c1a4 Fix presentations 2013-06-20 20:12:55 +01:00
Andreas Preikschat c851fa84f0 head 2013-06-20 20:42:45 +02:00
Andreas Preikschat aeecc041ec removed spaces 2013-06-20 20:04:21 +02:00
Andreas Preikschat d78d147e1d bug #645452 (increase possible line spacing) 
bzr-revno: 2256
Fixes: https://launchpad.net/bugs/645452
 2013-06-19 16:18:50 +02:00
Andreas Preikschat de43bfcf2d fixed type() usage 
bzr-revno: 2255
 2013-06-19 16:17:33 +02:00
Andreas Preikschat 658b6f89da import 2013-06-18 21:32:04 +02:00
Andreas Preikschat 1e11f4d821 true division 2013-06-18 11:12:49 +02:00
Andreas Preikschat 62c5908d85 python3 division in slidecontroller 2013-06-18 11:09:54 +02:00
Andreas Preikschat bb7bbdf10c use isinstance instead of type 2013-06-16 21:42:50 +02:00
Tim Bentley ded3671a1b Clean up slide controller and add bible download tests 
bzr-revno: 2253
 2013-06-16 20:34:19 +01:00
Andreas Preikschat 6b881e312f added second error message 2013-06-16 19:28:44 +02:00
Andreas Preikschat 45313cb450 head 2013-06-16 19:20:51 +02:00
Andreas Preikschat f261a95a37 head 2013-06-16 18:48:37 +02:00
Andreas Preikschat 39d691d2eb fix 2013-06-16 18:46:44 +02:00
Andreas Preikschat 5cce4c9443 head 2013-06-16 18:40:47 +02:00
Patrick Zimmermann 1aeb9bef2f Duplicate Song finder merge - UI and Services. 
bzr-revno: 2252
 2013-06-16 15:53:40 +01:00
Andreas Preikschat df493947e7 Removed some code not compatible with python 3 to help with the migration 
bzr-revno: 2251
 2013-06-16 15:36:35 +01:00
Tim Bentley e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann 4106ecd71e Remove superfluous comment. 2013-06-15 12:56:09 +02:00
Patrick Zimmermann b18d96b3c9 Keep GUI responsive during search. Allow aborting the search. 2013-06-15 12:46:00 +02:00
Patrick Zimmermann d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Patrick Zimmermann 2f55624977 Extract method to delete a song. 2013-06-14 22:20:26 +02:00
Andreas Preikschat 6f0ea09327 increased possible min/max line spacing 
Fixes: https://launchpad.net/bugs/645452
 2013-06-14 11:56:53 +02:00
Andreas Preikschat 3c4e67545b head r2249 2013-06-13 12:52:47 +02:00
Patrick Zimmermann b172153b15 Use future division. 2013-06-11 22:27:30 +02:00
Patrick Zimmermann 4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Tomas Groth db0e243c08 Change from osjd to osj extension. Also use json for local service file. 2013-06-09 17:50:11 +02:00
Tomas Groth f6f93f41d1 Use json as services format instead of python pickle. 2013-06-09 14:14:25 +02:00
Andreas Preikschat 34099c5df7 if the media doc is invisible, make it visible 2013-06-06 18:07:05 +02:00
Andreas Preikschat a6422aa58b head 2013-06-06 08:46:11 +02:00
Andreas Preikschat 43326c5781 fixed code 2013-06-06 08:40:10 +02:00
Andreas Preikschat 67d12883c1 head 2013-06-04 21:36:34 +02:00
Tim Bentley 6e5588b7cf Update settings and minor cleanups 2013-06-03 19:47:25 +01:00
Tim Bentley 9160832e0a fix error 2013-06-03 19:03:45 +01:00
Tim Bentley 512155ff68 Add css file 2013-06-03 18:19:42 +01:00
Andreas Preikschat 1f80f6c830 renames 2013-06-01 20:35:00 +02:00
Andreas Preikschat 8c3c43a11d changed shortcut category 2013-06-01 20:16:34 +02:00
Andreas Preikschat 851c667c8d head 2013-06-01 16:48:30 +02:00
Tim Bentley 6cca9d536b head 2013-05-26 18:03:14 +01:00
Patrick Zimmermann 570aebb72b Correct the naming of preWizard -> pre_wizard resulting in the method not being called anymore. 
bzr-revno: 2248
 2013-05-25 19:07:00 +01:00
Tim Bentley 20bd86fbce Live works! 2013-05-25 18:05:44 +01:00
Tim Bentley 9f8a0572bc Fix Presentation plugin so it works. 
Correct abuse of the service item title field
Add migration code and test to prove it

bzr-revno: 2247
 2013-05-25 16:10:09 +01:00
Tim Bentley 0a8db629d9 Remove Print 2013-05-25 06:54:25 +01:00
Tim Bentley 4b2868b271 Fox presentations and refactor service item 2013-05-24 21:17:47 +01:00
Peter S. Bentley 3961db8b67 Fix invalid object names 2013-05-23 17:15:15 +01:00
Arjan Schrijver 1a0e583880 Fix bugs in group images 
- Fixed traceback on canceling the 'choose group' dialog
- Clear the 'new group' lineedit in the 'choose group' dialog
- Fixed traceback on adding multiple image groups to the service in one go
- Fixed a bug where new image groups added from the 'choose group' popup weren't added to the 'add group' and 'choose group' popup selectboxes
- Cleaned up obsolete line in imagetab
- Added a simple test for onResetClick()
- Added a test for recursively_delete_group()

bzr-revno: 2245
 2013-05-23 16:35:56 +01:00
Arjan Schrijver f22254501a Reverted another change from the 'adding multiple service items' functionality 2013-05-23 09:31:12 +02:00
Tim Bentley e1f3024ff1 Latest version 2013-05-21 18:45:33 +01:00
Tim Bentley 1113044955 Add basic Live display to remote 2013-05-19 20:56:48 +01:00
Andreas Preikschat b99d9a7ac9 More Python 3 changes - division fixes 
bzr-revno: 2244
 2013-05-19 19:13:26 +01:00
Arjan Schrijver 24cefc7249 HEAD 2013-05-19 13:32:31 +02:00