Commit Graph

13305 Commits

Author SHA1 Message Date
Jonathan Springer
285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
tim.bentley@gmail.com
7c5add7fac First merge for 2.4.
A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

bzr-revno: 2566
Fixes: https://launchpad.net/bugs/913508, https://launchpad.net/bugs/1168778, https://launchpad.net/bugs/1281100, https://launchpad.net/bugs/1390699, https://launchpad.net/bugs/1390706, https://launchpad.net/bugs/1413217, https://launchpad.net/bugs/1420276, https://launchpad.net/bugs/1439304, https://launchpad.net/bugs/1487014
2015-11-05 19:05:19 +00:00
tim.bentley@gmail.com
7fb1b03e75 Fix the pep 8 text.
lp:~trb143/openlp/bug-about (revision 2566)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1170/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1093/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1034/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/881/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/477/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/597/
[SUCCESS] https//ci.openlp.io/j...

bzr-revno: 2565
2015-11-04 18:39:01 +00:00
Tim Bentley
a888a4a4aa more missed 2015-11-04 18:37:06 +00:00
Tim Bentley
ba823a9302 fix align 2015-11-02 21:30:11 +00:00
Tim Bentley
6e754ec0a6 fix align 2015-11-02 21:25:38 +00:00
Tim Bentley
20f0d39113 fix align 2015-11-02 21:19:01 +00:00
Tim Bentley
0e4847b5fa head 2015-11-02 20:57:48 +00:00
second@tgc.dk
2cca48f26b Made ZionWorx importer work under python3, fixes bug 1510282.
Improved WorshipCenter Pro import, support more fields and verse types.

bzr-revno: 2564
Fixes: https://launchpad.net/bugs/1225760, https://launchpad.net/bugs/1510282
2015-11-02 20:56:27 +00:00
tim.bentley@gmail.com
64c6186020 Refactor the about dialog so it is not possible for translators to break OpenLP.
bzr-revno: 2563
2015-11-02 20:55:42 +00:00
Tim Bentley
d165010aaa minor fix ups 2015-11-02 20:52:22 +00:00
Tim Bentley
89d9d7d73a replace code removed in error 2015-10-28 21:21:05 +00:00
Tomas Groth
05043edb6d Strip trailing whitespaces from verse-string. 2015-10-28 16:43:17 +00:00
Tomas Groth
f712b35b08 pep8 fixes 2015-10-27 22:36:52 +00:00
Tomas Groth
a8c5f8cb52 Make test windows-only, again. 2015-10-27 15:15:22 +00:00
Tomas Groth
fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tomas Groth
85f034abdd Make zionwork imported work with python3
Fixes: https://launchpad.net/bugs/1510282
2015-10-27 12:28:13 +00:00
Tim Bentley
a197e92f7d Missing strings 2015-10-22 17:23:40 +01:00
Tim Bentley
ae8b2d051a Fix about dialog from translators 2015-10-19 22:14:30 +01:00
Tim Bentley
c61fde2d1f Refactor tests 2015-10-17 19:11:04 +01:00
Tim Bentley
cee4a138ac head 2015-10-17 14:48:38 +01:00
Tim Bentley
25332a2cb1 Head and 2.2 2015-10-17 12:20:51 +01:00
Tim Bentley
50ceb568e5 Release 2.2
bzr-revno: 2562
2015-10-17 12:18:23 +01:00
tim.bentley@gmail.com
c1dea2d979 Fixed translations by removing ../../
Last set of translations before 2.2 this weekend.

bzr-revno: 2561
2015-10-16 18:23:58 +01:00
Tim Bentley
375884b1bb Songs 2015-10-16 17:58:22 +01:00
Tim Bentley
9590de703a plugins again 2015-10-16 17:49:58 +01:00
Tim Bentley
e8f0844339 custom 2015-10-16 17:43:48 +01:00
Tim Bentley
ae1124f8bd bible 2015-10-16 17:38:39 +01:00
Tim Bentley
ff5513f630 add test 2015-10-16 17:33:33 +01:00
Tim Bentley
6b60573740 UI changes 2015-10-16 17:30:13 +01:00
Tim Bentley
742e0c912b Plug item 2015-10-16 17:26:01 +01:00
Tim Bentley
a5b8827c96 Pep 8 2015-10-16 17:17:38 +01:00
Tim Bentley
58124c01d2 Add advanced 2015-10-16 17:09:35 +01:00
second@tgc.dk
48c9389a9f Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.
bzr-revno: 2560
2015-10-15 21:52:13 +01:00
Tim Bentley
9ea1cab296 code fix 2015-10-15 19:21:04 +01:00
Tim Bentley
3bc0dbe4d9 func test pass 2015-10-15 19:15:55 +01:00
Tim Bentley
8be1450eae core_int_test 2015-10-15 19:06:16 +01:00
Tim Bentley
925623bf74 core_int 2015-10-15 19:03:57 +01:00
Tim Bentley
ccd604b3be Strings 2015-10-15 19:00:39 +01:00
Tim Bentley
cd4034ebf1 settings 2015-10-15 18:56:17 +01:00
Tim Bentley
0cd097c7ec new translations take 2 2015-10-15 18:34:42 +01:00
Tim Bentley
db70df45d7 new translations 2015-10-15 17:55:00 +01:00
67b2aeb5ad "Let's download things once only, instead of 3 times."
bzr-revno: 2559
2015-10-15 00:16:00 +02:00
191a739f81 Let's download things once only, instead of 3 times. 2015-10-14 23:19:02 +02:00
Tomas Groth
949bf4a8a7 Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows. 2015-10-13 22:52:33 +01:00
second@tgc.dk
924d0f8b29 Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.

bzr-revno: 2558
2015-10-13 11:30:40 +01:00
Tomas Groth
755f6c5e7c remove unneeded quotes from commit message 2015-10-12 13:59:53 +01:00
Tomas Groth
62e9663aec Make 2 texts translateable 2015-10-12 13:59:17 +01:00