Commit Graph

13591 Commits

Author SHA1 Message Date
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
second@tgc.dk
a98538c75f "Added merge-helper-script
Some Pep8 fixes"

bzr-revno: 2557
2015-10-11 18:28:32 +01:00
Tomas Groth
04d2bea5b2 Add merge helper script 2015-10-10 21:53:36 +01:00
Tomas Groth
19bd2dd25a pep8 fixes 2015-10-10 21:50:59 +01:00
second@tgc.dk
847f4fdb18 "Fix string that makes it possible to translate the string.
Updated QR code pointing to android app.
Update link to google play store.
"

bzr-revno: 2556
Fixes: https://launchpad.net/bugs/1461884
2015-10-03 18:14:15 +01:00
Tomas Groth
cacb3ca0a0 Fix string that makes it possible to translate the string. 2015-10-03 13:00:44 +01:00
Tomas Groth
7221778a16 Updated QR code pointing to android app. 2015-10-03 12:59:41 +01:00
Tomas Groth
05899eb41d Update link to google play store 2015-10-01 12:17:26 +01:00
Tim Bentley
41756630b4 Fix code so will actually start and long line lenght which broken standards
bzr-revno: 2555
2015-09-10 23:59:06 +02:00
Tim Bentley
21743e4472 fix length 2015-09-10 21:35:14 +01:00
Tim Bentley
afa4f7b0b2 fix broken trunk 2015-09-10 21:27:17 +01:00
Jonathan Springer
d60a1e8340 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized
Change relative import in bible db to absolute import
Docstring cleanups

bzr-revno: 2554
2015-09-10 22:11:46 +02:00
Tomas Groth
c9c1826977 Make the fix for bug 1473632 work on more linux distros.
Make sure presentations is closed correctly. Fixes bug 1490996. Test included.
Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998.

bzr-revno: 2553
Fixes: https://launchpad.net/bugs/1473632, https://launchpad.net/bugs/1490996, https://launchpad.net/bugs/1491998
2015-09-10 22:09:23 +02:00
Jonathan Springer
85d2cfda6a Move icon creation inside setup_item to avoid generating the icon multiple times 2015-09-09 16:02:19 -04:00
Tomas Groth
8fd8273209 Added test for bug 1490996. 2015-09-09 14:45:57 +01:00
Jonathan Springer
6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Jonathan Springer
46d4105cb1 Change relative import to absolute import 2015-09-08 15:13:26 -04:00
Jonathan Springer
934a9cb7b3 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 2015-09-08 15:11:09 -04:00
Tomas Groth
1dcbc6837c Make the fix for bug 1473632 work on more linux distros. 2015-09-04 10:01:07 +01:00
Tomas Groth
fec061782b Make sure presentations is closed correctly. Fixes bug 1490996.
Fixes: https://launchpad.net/bugs/1490996
2015-09-03 20:21:43 +01:00
Tomas Groth
964af5fc92 Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998.
Fixes: https://launchpad.net/bugs/1491998
2015-09-03 20:11:08 +01:00
Tomas Groth
0b4cf91c42 Fix traceback on windows in the OO/LO song importer.
Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fix SongPro import. Fixes bug 1489376.
Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.

bzr-revno: 2552
2015-08-28 22:05:57 +01:00