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

5371 Commits

Author SHA1 Message Date
Andreas Preikschat
53b0825a18 fixed service save 2013-07-12 21:26:46 +02:00
Tim Bentley
38eec999b7 Head 2013-07-12 19:13:21 +01: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
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
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
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
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
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
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
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
Tim Bentley
f583be0c76 fix registry call 2013-06-30 19:39:38 +01: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
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
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
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
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
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
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
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
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
d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +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
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
Tim Bentley
20bd86fbce Live works! 2013-05-25 18:05:44 +01:00
Tim Bentley
4b2868b271 Fox presentations and refactor service item 2013-05-24 21:17:47 +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
Tim Bentley
945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Andreas Preikschat
1d110f446c head + conflict 2013-05-18 16:11:43 +02:00
Andreas Preikschat
7a42cd3769 added test 2013-05-18 10:44:03 +02:00
Andreas Preikschat
ceb8020998 head 2013-05-12 14:04:55 +02:00
Andreas Preikschat
ad8e28fbe9 renames 2013-05-11 20:11:52 +02:00