Commit Graph

13259 Commits

Author SHA1 Message Date
191a739f81 Let's download things once only, instead of 3 times. 2015-10-14 23:19:02 +02: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
Jonathan Springer
54a18c68a2 Add ability to open Apple help file from app bundle. Only show offline help if we are running frozen.
bzr-revno: 2551
2015-08-28 21:28:35 +02:00
Tomas Groth
579f532aec Removed unnecessary line. 2015-08-28 14:20:17 +01:00
Tomas Groth
c559741143 Forgot to remove debug print... 2015-08-28 13:34:28 +01:00
Tomas Groth
0c24d3705b Fix traceback on windows in the OO/LO song importer. 2015-08-28 11:22:06 +01:00
Tomas Groth
585c319c8b Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fixes: https://launchpad.net/bugs/1489757
2015-08-28 09:50:13 +01:00
Tomas Groth
4488fedfdc Fix SongPro import. Fixes bug 1489376.
Fixes: https://launchpad.net/bugs/1489376
2015-08-27 12:24:24 +01:00
Tomas Groth
f98c35df94 Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.
Fixes: https://launchpad.net/bugs/1489143
2015-08-26 22:37:23 +01:00
Jonathan Springer
59a04e982f Add ability to open Apple help file from app bundle.
Only show offline help if we are running frozen.
2015-08-24 14:19:30 -04:00
f36a9c29dc Release 2.1.6
bzr-revno: 2550
2015-08-23 21:04:23 +02:00
Tim Bentley
23266a50f0 translation cleanup
bzr-revno: 2549
2015-08-23 17:14:45 +01:00
Tim Bentley
18af8e3ca1 remove low translations 2015-08-23 17:05:21 +01:00
Tim Bentley
0c9c9b710a Translation updates 2015-08-23 17:02:19 +01:00
Tim Bentley
2cf79e7931 Latest translations
bzr-revno: 2548
2015-08-03 20:48:11 +01:00
Tim Bentley
e7fb7b7e61 translations 2015-08-03 20:37:18 +01:00
Tomas Groth
50b2400521 Ignore Libre/OpenOffice exceptions if we are closing it.
Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632.

bzr-revno: 2547
2015-08-03 20:18:59 +01:00
Tomas Groth
8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth
5940a77b20 Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632.
Fixes: https://launchpad.net/bugs/1473632
2015-07-20 21:33:58 +01:00
Tomas Groth
62aef46b55 Revert changes to support python 3.5 to make sure we support python 3.3.
Fix traceback in OSIS import on empty verse tag.

bzr-revno: 2546
2015-07-14 21:59:15 +02:00
Tomas Groth
25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +01:00
Tomas Groth
4e3b1c0e8f Revert changes to support python 3.5 to make sure we support python 3.3. 2015-07-04 22:09:59 +01:00
Tomas Groth
814177e380 Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390.
Catch songselect connections error. Fixes bug 1464421.

bzr-revno: 2545
2015-06-27 07:30:33 +01:00
Tomas Groth
5444614ced Added songselect login except test 2015-06-24 21:26:52 +01:00
Tomas Groth
03b5ec6d16 Catch songselect connections error. Fixes bug 1464421.
Fixes: https://launchpad.net/bugs/1464421
2015-06-17 18:46:45 +01:00
Tomas Groth
3b0b75e5b6 Remove unneeded import. 2015-06-16 09:47:42 +02:00