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

8879 Commits

Author SHA1 Message Date
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
Tim Bentley
945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Tim Bentley
1cf28fa763 Fix the Urls for Stage view poll 
bzr-revno: 2242
 2013-05-19 08:20:20 +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
Arjan Schrijver
6572ab31e8 - Fixed adding single images again 2013-05-14 17:05:41 +02:00
Arjan Schrijver
dcd346c8e5 HEAD 2013-05-14 16:57:37 +02:00
Arjan Schrijver
673a87a65d - 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 2013-05-14 16:48:49 +02:00
Arjan Schrijver
71335357dd - Fixed traceback on adding multiple image groups to the service in one go 2013-05-14 16:17:56 +02:00
Arjan Schrijver
d323f9d746 Reverted 'adding multiple service items' functionality 2013-05-14 15:58:07 +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
Patrick Zimmermann
d7eb6b20c3 Correct the naming of the preWizard -> pre_wizard. 2013-04-25 19:58:37 +02:00
Andreas Preikschat
9d54944ad4 use true division (py3) 2013-04-24 22:47:30 +02:00
Andreas Preikschat
22541e7297 use true division (py3) 2013-04-24 21:05:34 +02:00
phill-ridout
5512435c0c Changed then Givens, Whens and Thens arround 2013-04-24 18:37:15 +01: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
d3195dccf7 Swap round urls 2013-04-23 21:31:19 +01:00
Tim Bentley
0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley
11112e7712 Head 2013-04-23 20:08:50 +01:00
Tim Bentley
fba86c5552 Add tests 2013-04-23 20:08:07 +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
phill-ridout
774cf24bfd renamed type attribute 2013-04-21 20:15:49 +01: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
Tim Bentley
34180112be Fix Core from abend 2013-04-21 08:06:25 +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
3dd05a2f4d head 2013-04-20 22:25:06 +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
646b1596a9 should not be needed 2013-04-20 20:34:06 +02:00
Andreas Preikschat
0a595a5994 fixed importer 2013-04-20 20:25:46 +02:00
Andreas Preikschat
85224bb792 fixed importer 2013-04-20 20:24:48 +02:00
Andreas Preikschat
372a3cd4ef fixed importer 2013-04-20 20:23:42 +02:00
Andreas Preikschat
76799d931e head 2013-04-20 19:37:06 +02:00
Andreas Preikschat
e486bac91c removed entry from combo box 2013-04-20 19:36:18 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02:00
Andreas Preikschat
f82000eaa2 reverted change to avoid conflict 2013-04-20 11:06:26 +02:00
Andreas Preikschat
465fc7bff1 do not overrie build-ins 2013-04-20 11:02:45 +02:00
Andreas Preikschat
a2fddbb57c fixed fullstop 2013-04-19 21:43:17 +02:00
Andreas Preikschat
7682698cf1 media code standards 2013-04-19 21:15:12 +02:00
Andreas Preikschat
582f1aa003 code standards 2013-04-19 21:07:25 +02:00
Andreas Preikschat
b03c3c6f4f code standards 2013-04-19 21:03:16 +02:00
Andreas Preikschat
dad243dd74 songusage and presentation code standards 2013-04-19 20:52:39 +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
Andreas Preikschat
31aaafa254 clean ups 2013-04-18 20:27:54 +02:00
Andreas Preikschat
e7f553afb1 added test 2013-04-18 20:27:22 +02:00
Patrick Zimmermann
9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Patrick Zimmermann
ae5869e366 Add waiting cursor while searching. 2013-04-18 20:19:43 +02:00
Andreas Preikschat
b71d3e9e53 fixed bug-1170435 
Fixes: https://launchpad.net/bugs/1170435
 2013-04-18 19:50:39 +02:00
Andreas Preikschat
098d733ad1 bible renamings 2013-04-18 19:45:14 +02:00
Andreas Preikschat
85ab27ab0c alters plugin renaming 2013-04-18 19:17:00 +02:00
Andreas Preikschat
14db927af7 more renaming 2013-04-18 19:10:26 +02:00
Arjan Schrijver
9752716672 HEAD 2013-04-18 15:57:31 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Andreas Preikschat
06b8707434 renaming 2013-04-18 11:30:55 +02:00
Andreas Preikschat
2d518febf0 renaming 2013-04-18 11:28:21 +02:00
Andreas Preikschat
d002cb383e renaming 2013-04-18 11:27:11 +02:00
Andreas Preikschat
c13c0a0474 renaming 2013-04-18 11:22:20 +02:00
Andreas Preikschat
cf209fef6f renaming 2013-04-18 11:20:56 +02:00
Andreas Preikschat
5547035550 fixed short lines 2013-04-18 11:17:00 +02:00
Andreas Preikschat
f3b49c4dd5 removed dead code 2013-04-17 22:12:53 +02:00
Andreas Preikschat
0fb24d2233 added tests 2013-04-17 20:33:44 +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
Andreas Preikschat
1e8ad4ab7e fixed setup.py 2013-04-16 19:56:06 +02:00
Andreas Preikschat
1b447c4590 reoved whitespace 2013-04-16 19:54:40 +02:00
Andreas Preikschat
01a0ad3618 added whitespace to avoid conflict 2013-04-16 19:48:42 +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
Andreas Preikschat
140178a674 added code back which should not be removed in this proposal 2013-04-16 17:55:23 +02: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
Andreas Preikschat
f0334457d0 removed sqlite2 code 2013-04-15 23:07:45 +02:00
Andreas Preikschat
ab3ee9768b remove bzrlib 2013-04-15 23:04:49 +02:00
Andreas Preikschat
e2b8dc54f3 fixed bs4 code; fixed regression 2013-04-15 21:54:27 +02:00
Patrick Zimmermann
fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Tim Bentley
7f78250bb2 Make object 2013-04-15 18:55:50 +01: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
Andreas Preikschat
db00c5049a fixed missing unicode 2013-04-15 17:50:59 +02:00
Andreas Preikschat
908e048d1a head 2013-04-15 17:43:18 +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
Tim Bentley
220681c900 Comment fixes 2013-04-14 16:59:57 +01:00
Tim Bentley
797a76f095 Head 2013-04-14 16:45:34 +01:00
Philip Ridout
38a95ffab8 Fixed importing of songs with verses numbered 1A, or 1.5 etc. in SongShowPlus importer 
bzr-revno: 2229
Fixes: https://launchpad.net/bugs/1125956
 2013-04-14 17:30:06 +02:00
phill-ridout
5aee3198ae Added WorshipCenter Pro song importer. 
Also added associated tests.
 2013-04-13 23:01:36 +01:00
phill-ridout
a307824d85 Moved some directories about. 
Added test files
 2013-04-10 17:24:53 +01:00
Patrick Zimmermann
789439dd6b Make wizard a little wider to fit at least two review widgets. 2013-04-09 23:32:19 +02:00
Raoul Snyman
e6a1d93121 Add tests around some of the functions in the db module 
- Fix some import ordering
- Add tests for init_db and get_upgrade_op
- Add an extra line for PEP8 compliance
 2013-04-08 23:08:28 +02: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
Tim Bentley
31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
Andreas Preikschat
78ed2f655c remove markupMassage 2013-04-06 19:59:07 +02: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
phill-ridout
047f567ed8 added some tests 2013-04-06 11:54:36 +01:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Andreas Preikschat
ac32b6ca65 fixed missing r'' and removed argument 2013-04-05 22:20:51 +02:00
Andreas Preikschat
19f9718aec added FIXME 2013-04-05 22:06:00 +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
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +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
Raoul Snyman
e15865c117 Finally have bullet-proof upgrade methods. 2013-04-04 21:51:37 +02:00
phill-ridout
c3583bd21d Added comment 2013-04-04 17:42:22 +01:00
Andreas Preikschat
0fbbf29cfa added pickle fixme 2013-04-04 13:54:19 +02:00
Andreas Preikschat
3e53ea9376 fixed formatting tags rename error 2013-04-04 13:18:49 +02:00
Raoul Snyman
9430e569f4 Fix one small issue with the songs upgrade scripts. 2013-04-04 10:02:47 +02:00
Raoul Snyman
d88e8a0b02 Migrated to Alembic (if you'll excuse the pun) 2013-04-03 21:46:41 +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
Raoul Snyman
d42f64e044 An attempt to move from migrate to alembic. 2013-04-03 12:33:29 +02:00
Andreas Preikschat
440876eff7 reverted fix: fix available for trunk 2013-04-03 12:33:15 +02:00
Andreas Preikschat
2c94f0df83 fixed #FIXME: constructor 2013-04-03 12:23:52 +02:00
Andreas Preikschat
8761117d34 fixed fixme: constructor 2013-04-03 12:19:15 +02:00
Andreas Preikschat
d9f8025042 r2225 2013-04-03 12:16:48 +02:00
M2j
2598674d2a Add ICU version string to exception form. 2013-04-02 22:52:31 +02:00
Andreas Preikschat
ffb2350f62 fix *cough* 2013-04-02 19:42:01 +02:00
Andreas Preikschat
7f111b31a7 use unicode instead of QDateTime 2013-04-02 17:24:27 +02:00
Andreas Preikschat
5e3563ceda added two tests 2013-04-02 17:08:46 +02:00
Andreas Preikschat
e3afbefd27 use QDate instead of python datetime object 2013-04-02 16:42:33 +02:00
Andreas Preikschat
6c4b282d20 updated vly.pc 2013-04-02 09:32:58 +02:00
Andreas Preikschat
ceb175e372 head 2013-03-31 19:21:12 +02:00
Andreas Preikschat
29d7b3411e - fixed auto preview of next service item 
- added test

bzr-revno: 2225
 2013-03-31 19:13:56 +02:00
M2j
b3bb9bc0c0 Python 3 transition comment 2013-03-31 18:43:08 +02:00
M2j
8696db9f75 - use list compression in get_natural_key 
- define DIGIT_OR_NONDIGIT
 2013-03-31 18:30:22 +02:00
M2j
118f295204 Precompute the whole comparision key for song sorting. 2013-03-31 12:31:54 +02:00
phill-ridout
3686da6a2e Changed regex string type to raw 2013-03-31 11:13:56 +01:00
Andreas Preikschat
aa7d56c4bc added fixmes 2013-03-31 10:53:34 +02:00
Andreas Preikschat
28b557af80 changed import 2013-03-31 10:00:28 +02:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Andreas Preikschat
7d336911ba disable manager 2013-03-30 17:38:48 +01:00
Andreas Preikschat
2a28094937 fixed encoding 2013-03-30 17:31:29 +01:00
Andreas Preikschat
c5e11ff558 head 2013-03-30 17:05:49 +01:00
Andreas Preikschat
bbf2ad3b4b head + conflict 2013-03-30 10:53:01 +01:00
Andreas Preikschat
947c9a7346 removed old code 
bzr-revno: 2224
 2013-03-30 10:41:40 +01:00
Andreas Preikschat
8b4b7a6d0f use QActionGroup instead of checkboxes 
Fixes: https://launchpad.net/bugs/1103906
 2013-03-30 10:33:21 +01:00
Andreas Preikschat
d67a697e1e r2223 2013-03-30 09:49:19 +01:00
Andreas Preikschat
fd3cad1c7c r2223 2013-03-30 09:40:49 +01:00
Tim Bentley
25d74260ce Add tests for the server 2013-03-30 06:56:28 +00:00
phill-ridout
68f26d1151 HEAD 2013-03-29 21:39:37 +00:00
phill-ridout
dcf2cae3a1 minor changes 2013-03-29 21:27:43 +00:00
Tim Bentley
efa7d8c8c0 minor fixes and move certificate location 2013-03-29 20:58:06 +00:00
Andreas Preikschat
2182f9c13c fixed short lines 2013-03-29 13:53:07 +01:00
Andreas Preikschat
a69323ea89 fixed auto preview of next service item 2013-03-29 13:40:04 +01:00
Arjan Schrijver
1beb9b06d3 HEAD 2013-03-29 13:02:35 +01:00
Tim Bentley
eb51590bec Code cleanup ready for reviews 2013-03-29 09:39:41 +00:00
Tim Bentley
6cd384e028 Fix up tests 2013-03-29 09:32:46 +00:00
Tim Bentley
ced77e4ec3 Add some proper tests 2013-03-29 09:06:43 +00:00
Tim Bentley
347636d078 Move userid and password change out of restart scope 2013-03-29 08:33:10 +00:00
Tim Bentley
31847abf2a Head and confilicts 2013-03-29 08:25:33 +00:00
Tim Bentley
8cf886971c Refactor http server 2013-03-29 07:48:55 +00:00
Andreas Preikschat
b139b6a4eb fixed regression :/ 2013-03-28 22:49:11 +01:00
Andreas Preikschat
643fa9436c fixed song editor regression 2013-03-28 22:36:18 +01:00
Andreas Preikschat
696f359cb0 changed order back 2013-03-28 21:25:35 +01:00
Andreas Preikschat
77bd7325a6 reverted code 2013-03-28 21:24:38 +01:00
Andreas Preikschat
a437ef0d3c r2219 2013-03-28 21:17:03 +01:00
Andreas Preikschat
4ffd25e1ae r2219 2013-03-28 21:16:16 +01:00
Andreas Preikschat
3b88c1341b removed broken code 2013-03-28 21:15:59 +01:00
Andreas Preikschat
85856cc717 head + conflict 2013-03-28 21:08:07 +01:00
Andreas Preikschat
6c7d608fbb fixed FTW regression 2013-03-28 21:05:46 +01:00
Andreas Preikschat
30a7034ac9 fixed regression + added test for it 2013-03-28 21:03:58 +01:00
phill-ridout
a73a305e38 HEAD 2013-03-28 19:50:52 +00:00
Andreas Preikschat
297b47fca3 added comment 2013-03-28 15:57:47 +01:00
Tim Bentley
ab011a22c1 last version before big refactor 2013-03-28 14:45:47 +00:00
Andreas Preikschat
6908577b54 fixed image display 2013-03-27 10:41:01 +01:00
Andreas Preikschat
0b2dc71f28 fixed not needed decode 2013-03-27 10:25:39 +01:00
Andreas Preikschat
4bd7c139f5 fixed settings tabs 2013-03-27 10:23:09 +01:00
Andreas Preikschat
bf60aa148e fixed settings tabs 2013-03-27 10:20:54 +01:00
Andreas Preikschat
8bf76a7baa fixed start time form 2013-03-27 10:14:24 +01:00
Andreas Preikschat
7476ff27ff fixed service item edit form 2013-03-27 10:12:54 +01:00
Andreas Preikschat
6127da074b fixed service note form 2013-03-27 10:11:16 +01:00
Patrick Zimmermann
4831fb29fa Translate verse tags. 2013-03-26 22:31:46 +01:00
Andreas Preikschat
60c1a4e9f4 removed contains method 2013-03-26 21:33:49 +01:00
Andreas Preikschat
37b7de22a5 removed encoding from calls 2013-03-26 21:31:48 +01:00
Andreas Preikschat
60cf33f23c fixed vlc.py not working 2013-03-26 21:22:15 +01:00
Andreas Preikschat
7790442240 fixed vlc.py not working 2013-03-26 21:19:19 +01:00
Andreas Preikschat
4f46e578e1 updated vlc.py 2013-03-26 21:18:50 +01:00
Andreas Preikschat
d9afa35b9f fixed import 2013-03-26 20:57:16 +01:00
Andreas Preikschat
f0da7465e8 initial changes 2013-03-26 19:13:21 +01:00
Andreas Preikschat
3fef841bb2 fixed FTW shown again 2013-03-26 12:45:18 +01:00
Tim Bentley
451189b222 Fix up login page to handle redirection correctly 2013-03-26 11:39:32 +00:00
Andreas Preikschat
e708140d13 head 2013-03-26 12:35:29 +01:00
Andreas Preikschat
2f6a1a37a2 r2218 2013-03-26 12:15:55 +01:00
Andreas Preikschat
e6e9dec396 updated vlc.py 2013-03-26 12:15:31 +01:00
Arjan Schrijver
6b032d52e5 - Fixed adding single images 2013-03-26 11:32:22 +01:00
Arjan Schrijver
daf21af699 HEAD 2013-03-26 10:49:13 +01:00
Arjan Schrijver
44547769c6 - Fixed traceback on adding multiple image groups to the service in one go 
- Cleaned up obsolete line in imagetab
 2013-03-26 10:47:05 +01:00
Tim Bentley
4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley
b3d453c9b8 More code cleanups and bug fixes from previous cleanups 
bzr-revno: 2218
 2013-03-26 07:48:38 +00:00
Tim Bentley
b9a5ee28a9 Fix missing string converstion 2013-03-26 07:34:42 +00:00
Tim Bentley
509917480c Fix missing string converstion 2013-03-26 07:17:29 +00:00
Arjan Schrijver
df1faa2a8d - Fixed traceback on canceling the 'choose group' dialog 
- Clear the 'new group' lineedit in the 'choose group' dialog
 2013-03-25 21:17:46 +01:00
Andreas Preikschat
fa43759d8d more regression fixes 2013-03-25 08:27:54 +01:00
Andreas Preikschat
4283742081 fixed settingsTab rename 2013-03-25 08:13:40 +01:00
Andreas Preikschat
52cecd44a2 fixed remotetab regression 2013-03-25 07:40:47 +01:00
Andreas Preikschat
fa91578aaa head 2013-03-25 07:23:17 +01:00
Andreas Preikschat
76a58001b7 fixed bible manager regression 2013-03-25 07:22:11 +01:00
phill-ridout
401da98d7c increased line lengths to 120 
renamed SongShowPlusImport vairables and methods to standards
 2013-03-24 14:56:22 +00:00
phill-ridout
86fb343759 Added test for SongShowPlus 2013-03-24 11:32:03 +00:00
Tim Bentley
12058ebf8c fix typo 2013-03-23 07:45:08 +00:00
Tim Bentley
90d0d3c133 More updates 2013-03-23 07:28:24 +00:00
Tim Bentley
decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Andreas Preikschat
d77efd63d2 fixed double space 2013-03-22 21:35:59 +01:00
Andreas Preikschat
e6e57b6c03 updated comments and docs to 120 characters per line 2013-03-22 21:29:52 +01:00
phill-ridout
53889be2e5 HEAD 2013-03-21 19:05:40 +00:00
Tim Bentley
729c93b70b More changes 2013-03-20 20:17:00 +00:00
Tim Bentley
79524dfbf4 Head + conflict 2013-03-20 19:38:20 +00:00
Tim Bentley
38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Arjan Schrijver
7237ad0c62 - Fixed small bug that removed the path from newly added media and presentations 
- Fixed keyboard shortcuts in images treeview
 2013-03-20 10:24:34 +01:00
Tim Bentley
90ac714c0d Mediamanageritem converted 2013-03-19 22:00:50 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver
ce528140ae This branch implements the 'images groups' feature. It has the following features: 
- convert old 'images files' setting to SQLite database
- existing images are loaded as top-level items to minimize the change for users
- groups can be nested
- images can be moved between groups by drag&drop
- new images can be added directly to a group by drag&drop, or by clicking the 'Add images' button
- image groups can be used as service items with multiple images

bzr-revno: 2214
 2013-03-19 09:38:01 +02:00
Arjan Schrijver
57651493ff - Removed wrong len() use 
- Replaced wrong 'is' use with '=='
- Added tests for ImageMediaItem.save_new_images_list()
 2013-03-18 23:04:09 +01:00
Arjan Schrijver
ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Arjan Schrijver
185754f9b5 Add more docstrings 2013-03-18 14:43:45 +01:00
Arjan Schrijver
50da75cfdb - Removed __checkObject method to clean up the code 
- Fixed busy cursor on 'choose group' dialog
 2013-03-18 14:31:47 +01:00
Arjan Schrijver
47c48618bc Fixed a traceback that occurred when calling critical_error_message_box and friends while the splashscreen is disabled in the settings. 2013-03-18 14:30:31 +01:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Raoul Snyman
a3f1769818 HEAD 2013-03-18 12:16:50 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
6ce33e0ec3 Settings cleanups and removal of config_updated 
bzr-revno: 2212
 2013-03-17 21:04:03 +00:00
Tim Bentley
5e6ec9d269 fix missed events 2013-03-17 20:40:47 +00:00
Tim Bentley
df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley
9f8b236f90 With tests 2013-03-17 17:37:19 +00:00
Tim Bentley
0809c8e192 minor fixes 2013-03-17 10:23:15 +00:00
Tim Bentley
af76c3f6b9 config_update removed 2013-03-17 09:21:18 +00:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00