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

4022 Commits

Author SHA1 Message Date
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
48d2956bdd head 2013-07-17 14:21:44 +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
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
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
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
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
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
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
e75a87c5c9 head 2013-07-03 19:03:08 +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
Tim Bentley
f583be0c76 fix registry call 2013-06-30 19:39:38 +01: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
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
26e80be5b7 Who forgot the return 2013-06-24 17:54:23 +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
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
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
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
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
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
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
ceb8020998 head 2013-05-12 14:04:55 +02:00
Andreas Preikschat
ad8e28fbe9 renames 2013-05-11 20:11:52 +02:00
Andreas Preikschat
d9288ac267 renames 2013-05-11 19:41:26 +02:00
Andreas Preikschat
23d5df568b renames 2013-05-11 19:28:42 +02:00
Andreas Preikschat
53160fc539 added doc 2013-05-09 21:43:44 +02:00
Andreas Preikschat
32957eca0c removed dead code 2013-05-09 21:38:57 +02:00
Andreas Preikschat
7e41362ca2 completed test 2013-05-08 22:05:54 +02:00
Andreas Preikschat
eae143d232 name fixes 2013-04-29 20:42:29 +02:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Andreas Preikschat
f396e07feb fixed regression 2013-04-28 20:34:04 +02:00
Andreas Preikschat
92d5fd8e19 removed dead code; fixed attribute names; fixed regression 2013-04-28 20:31:48 +02:00
Andreas Preikschat
02603eaad5 display tool tip in shortcut dialog 2013-04-28 20:22:36 +02:00
Andreas Preikschat
989b922ab9 added shortcut to jump to the search fields 2013-04-28 20:06:49 +02:00
Andreas Preikschat
2d22e8420a do not pass QImages to build_icon (if not needed) 2013-04-28 19:17:45 +02:00
Patrick Zimmermann
4c2f078bf1 Add a missing \n at EOF. Add a comment. 2013-04-27 22:59:56 +02:00
Patrick Zimmermann
154c82f5ea Rename a method and remove a non needed registry var. 2013-04-27 12:00:27 +02:00
Andreas Preikschat
22541e7297 use true division (py3) 2013-04-24 21:05:34 +02:00
Andreas Preikschat
6d414c0fdb r2240 2013-04-23 23:48:51 +02:00
Andreas Preikschat
7b7cbc588c - removed code using the sqlite package (which is not available in python 3) 
bzr-revno: 2240
 2013-04-23 23:47:02 +02:00
Andreas Preikschat
8f994b2895 - fixed short lines 
- renamed attributes and methods

bzr-revno: 2239
 2013-04-23 23:46:07 +02:00
Tim Bentley
11112e7712 Head 2013-04-23 20:08:50 +01:00
Patrick Zimmermann
edb0eab31d Remove a dev comment. Pretify a comment. 2013-04-23 19:14:35 +02:00
Patrick Zimmermann
145a1aedcb Add some docstrings and rename some methods for clarity. 2013-04-23 19:12:08 +02:00
Andreas Preikschat
ba261e76e5 - ported code to beautifulsoup 4 
- moved regular expressions to the top
- fixed regression

bzr-revno: 2238
 2013-04-23 18:56:23 +02:00
Patrick Zimmermann
1c2a5b5156 Merge trunk. 2013-04-22 23:02:12 +02:00
Patrick Zimmermann
823e7b1ec0 Change a line back to trunk state. 2013-04-22 22:51:33 +02:00
Tim Bentley
581c83e70d Final tidyups 2013-04-21 16:53:51 +01:00
Tim Bentley
2965271ada and more 2013-04-21 08:26:45 +01:00
Tim Bentley
02b1f7b78b and more 2013-04-21 08:21:29 +01:00
Andreas Preikschat
4063de2700 head 2013-04-20 22:34:46 +02:00
Andreas Preikschat
3f60c34440 head 2013-04-20 22:30:51 +02:00
Andreas Preikschat
ab9e0d7ba2 - removed General section and introduced a Core section 
- added test

bzr-revno: 2234
Fixes: https://launchpad.net/bugs/1133237
 2013-04-20 22:19:53 +02:00
Andreas Preikschat
76799d931e head 2013-04-20 19:37:06 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02:00
Patrick Zimmermann
1c31940650 Merge trunk. 2013-04-18 23:17:14 +02:00
Patrick Zimmermann
2b9a13ff97 Clean up PreviewWidget interface a little more. 2013-04-18 22:50:02 +02:00
Patrick Zimmermann
25db18d34c Use inheritance instead of composition. Some interface cleanup. 2013-04-18 22:15:44 +02:00
Patrick Zimmermann
9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Andreas Preikschat
098d733ad1 bible renamings 2013-04-18 19:45:14 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Andreas Preikschat
d002cb383e renaming 2013-04-18 11:27:11 +02:00
Patrick Zimmermann
d687288336 Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item. 2013-04-16 23:42:23 +02:00
Patrick Zimmermann
1bbf52c7bf Fix a logic error, an array index border was wrong. 2013-04-16 19:34:07 +02:00
Patrick Zimmermann
e4d3d8d6d2 Rename a slideno -> row for more consistency. 2013-04-16 19:33:36 +02:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +01:00
Patrick Zimmermann
0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
Andreas Preikschat
8d5aaa927d removed import from gui 2013-04-15 23:31:04 +02:00
Andreas Preikschat
b3d4be1a44 removed sqlite from exception form 2013-04-15 23:15:29 +02:00
Patrick Zimmermann
fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Patrick Zimmermann
0dbda9ee21 Accidentially removed image load logic. Readded. 2013-04-15 19:26:18 +02:00
Patrick Zimmermann
3609d2e0e1 Switch over to PreviewListWidget class. Untested. 2013-04-15 19:12:47 +02:00
Patrick Zimmermann
379a27212c Clean up preview widget interface a little. 2013-04-15 18:33:50 +02:00
Patrick Zimmermann
9220beba78 Pull preview_list_widget out into separate file. Not yet changed calls to this new class. 2013-04-14 23:38:40 +02:00
Andreas Preikschat
4bb4cd080a r2230 2013-04-14 21:51:35 +02:00
Meinert Jordan
571934e166 Fix Natural Sorting so works with Python3 
bzr-revno: 2230
 2013-04-14 19:19:33 +01:00
Andreas Preikschat
352d8da185 head 2013-04-08 20:24:46 +02:00
Tim Bentley
2345d59e6f Head 2013-04-08 17:53:26 +01:00
Patrick Zimmermann
97c6899a31 Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score. 2013-04-06 13:53:00 +02:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Andreas Preikschat
69009970c0 replaced BeautifulSoup3 by BeautifulSoup4 2013-04-05 21:58:13 +02:00
Tim Bentley
e36706e3ec Head 2013-04-05 20:37:56 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
Andreas Preikschat
07d6fa63c5 introduced constant 2013-04-05 15:41:42 +02:00
Andreas Preikschat
42f52cc300 Separate blank buttons don't hide on resizing (bug #1164925) 
Fixes: https://launchpad.net/bugs/1164925
 2013-04-05 12:50:10 +02:00
Andreas Preikschat
d0cbe5a56a r2227 2013-04-05 11:05:39 +02:00
Andreas Preikschat
131b46edef - use QActionGroup instead of Checkboxes (Bug #1103906 'Auto Play Slides menu should use radioboxes') 
bzr-revno: 2227
Fixes: https://launchpad.net/bugs/1103906
 2013-04-05 11:04:38 +02:00
Andreas Preikschat
72ba94d390 replaced cPickle by pickle 2013-04-03 16:53:30 +02:00
Andreas Preikschat
4b76db7ad7 convert bytes to str 2013-04-03 12:54:11 +02:00
Andreas Preikschat
a6d966d1d2 changed comment 2013-04-03 12:40:09 +02:00
Andreas Preikschat
74eb0b59fb fixed LooseVersion not working 2013-04-03 12:39:42 +02:00