raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
13,284 Commits 5 Branches 0 Tags 296 MiB
cf4c30458f
Commit Graph

13284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
second@tgc.dk
cf4c30458f Make the zionworx importer work under python3. 
bzr-revno: 2567
 2015-10-29 22:15:47 +01:00
Tomas Groth
36aa35b260 Make zionworx importer work with python3. 2015-10-28 21:50:32 +00:00
raoul@snyman.info
3285088814 [Media Players] Added better detection for VLC, with thanks to Tomas. 
Note: I made a test, but this is untestable because of the hidden import inside the function.

lp:~raoul-snyman/openlp/ubuntu-vlc-bug (revision 2563)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1162/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1085/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1026/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/873/
[SUCCESS] htt...

bzr-revno: 2566
 2015-10-28 21:44:28 +00:00
second@tgc.dk
3393583d6d Implement a workaround for a PyInstaller 3.0 bug to load vlc. 
bzr-revno: 2565
Fixes: https://launchpad.net/bugs/1507385
 2015-10-28 21:43:54 +00:00
second@tgc.dk
6894f92927 Make OpenLP run on Python 3.3-3.5 
bzr-revno: 2564
 2015-10-28 21:42:51 +00:00
Tim Bentley
83d57d81af Fix translations 
bzr-revno: 2563
 2015-10-28 21:39:17 +00:00
Raoul Snyman
851af0b7a5 [Media Players] Added better detection for VLC, with thanks to Tomas. 2015-10-28 01:30:49 +02:00
Tim Bentley
43168d6f8a correct path 2015-10-24 07:03:51 +01:00
Tim Bentley
51bc55d217 Next one 2015-10-24 07:00:07 +01:00
Tim Bentley
41df272c9c Reset back as much as possible2 2015-10-23 18:31:38 +01:00
Tim Bentley
5110715075 Reset back as much as possible 2015-10-23 18:28:41 +01:00
Tomas Groth
8e6d1283f7 Implement a workaround for a PyInstaller 3.0 bug to load vlc. 2015-10-23 18:18:25 +01:00
Tim Bentley
419e8b17fe fix files 2015-10-20 17:42:05 +01:00
Tim Bentley
15ea46a606 fix paths 2015-10-20 17:25:48 +01:00
Tim Bentley
4f0f27296f fixed translations 2015-10-20 17:20:33 +01:00
Tomas Groth
b4669e0bf6 pep8 fixes 2015-10-19 23:32:26 +01:00
Tomas Groth
7470205185 Make songselect import work on both python 3.3 and 3.5 2015-10-19 23:26:58 +01:00
Tomas Groth
568904a6cf Fixes for python 3.5. 2015-10-17 23:07:28 +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
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
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
raoul@snyman.info
67b2aeb5ad "Let's download things once only, instead of 3 times." 
bzr-revno: 2559
 2015-10-15 00:16:00 +02:00
Raoul Snyman
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