Commit Graph

12740 Commits

Author SHA1 Message Date
b407a8ace5 HEAD 2014-12-12 22:58:21 +02:00
5742f7546e Fixed up merge conflicts. 2014-12-12 22:57:42 +02:00
Tim Bentley
4febe07889 Update Translations
bzr-revno: 2455
2014-12-08 20:25:54 +00:00
Tim Bentley
f967ac455c transalations 2014-12-07 19:50:24 +00:00
Tim Bentley
175760983b Head 2014-12-07 19:40:11 +00:00
Tomas Groth
4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
24a8f67fd0 Handle LibreOffice and SOffice commands on linux
Fixed imports conflict on merge.

bzr-revno: 2453
2014-12-07 08:20:30 +00:00
Philip Ridout
c9a2b87ac5 Fix links and Color buttons
bzr-revno: 2452
2014-12-07 08:16:15 +00:00
Tomas Groth
df6c533387 Fix upgrade on song db with lost version. Fixes bug 1391638.
Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015.
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271.

bzr-revno: 2451
2014-12-07 08:13:52 +00:00
Tomas Groth
46641fecbe Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944).
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.

bzr-revno: 2450
2014-12-07 08:11:59 +00:00
Tomas Groth
da7ff60697 Moved test service files into appropriate folder. 2014-12-06 21:05:45 +00:00
Tomas Groth
56f4b8aa5e Another fix for blank menu. 2014-12-06 20:40:40 +00:00
Tomas Groth
4123b9af1d Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type. 2014-12-06 20:08:42 +00:00
Tomas Groth
402e91f688 When cloning a song copy the mediafiles as well. Fixes bug 1309998
Fixes: https://launchpad.net/bugs/1309998
2014-12-05 22:36:49 +00:00
Tomas Groth
be12ce54bb Use shutil.which instead of calling which with check_output. 2014-12-05 21:10:58 +00:00
Phill Ridout
e190bf30e9 Fixes 1397570 by 'feature detection' 2014-12-05 17:04:44 +00:00
Tomas Groth
fd57f81376 Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden 2014-12-04 22:14:56 +00:00
Tomas Groth
782b3d3bcf trunk 2014-12-03 22:35:06 +00:00
Tomas Groth
fd48879513 The fix for loading songs with linked audio. Fixes bug 1398403
Fixes: https://launchpad.net/bugs/1398403
2014-12-03 22:31:23 +00:00
Tomas Groth
0038ffcbe6 Add test for loading song with linked audio - the actual test 2014-12-03 22:29:20 +00:00
Tomas Groth
304c489cd7 Add test for loading song with linked audio 2014-12-03 22:27:09 +00:00
Tomas Groth
e94579e7f1 Only update blank menu if needed 2014-12-03 21:19:43 +00:00
Phill Ridout
70c3a21620 HEAD 2014-12-03 19:50:41 +00:00
Phill Ridout
fc4eb5dd4d URL updates. PEP fix 2014-12-03 17:45:34 +00:00
Tomas Groth
65a10080b4 Allow removing functions in registry, and use it when registring MainDisplay. Fixes bug 1397287.
Added pptm as support file format for Powerpoint, Powerpoint Viewer and Libre/OpenOffice Impress. Fixes bug 1088800.
Added divx and xvid as supported files for VLC. Fixes bug 1215302.
Open opensong files in 'rb' mode. Fixes bug 1396958.
Fixed test_servicemanager crash on exit

bzr-revno: 2449
2014-12-02 17:29:58 +00:00
Tomas Groth
767e3d91f2 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar. 2014-12-02 11:07:03 +00:00
Tomas Groth
20394de842 pep8 fix 2014-12-02 10:02:13 +00:00
Tomas Groth
6ebc08d0d9 Attempt to fix crash in test 2014-12-02 09:46:50 +00:00
Tomas Groth
af4715dc3c Remove the registered functions instead of overwriting 2014-12-02 09:46:19 +00:00
Tomas Groth
1c71efc532 Allow overwriting functions in registry, and use it when registring MainDisplay. Fixes bug 1397287
Fixes: https://launchpad.net/bugs/1397287
2014-12-01 15:08:13 +00:00
Tomas Groth
e9410de13c Revert attempted fixes to projector tests. Just don't use windows... 2014-12-01 08:33:16 +00:00
Tomas Groth
7d2f2d147c Another projector test fix attempt 2014-12-01 08:22:17 +00:00
Phill Ridout
563347c8b8 HEAD 2014-11-30 07:44:57 +00:00
Tomas Groth
6af0aef8bd Another attempt to fix projector test across platforms and versions 2014-11-28 10:53:39 +00:00
Tomas Groth
612041dafa Remove unnecessary start of patch in test 2014-11-28 08:26:33 +00:00
Tomas Groth
9c64bd9d56 Added pptm as support file format for Powerpoint, Powerpoint Viewer and Libre/OpenOffice Impress. Fixes bug 1088800.
Fixes: https://launchpad.net/bugs/1088800
2014-11-28 08:21:03 +00:00
Tomas Groth
7d51352b2d Added divx and xvid as supported files for VLC. Fixes bug 1215302
Fixes: https://launchpad.net/bugs/1215302
2014-11-28 08:15:59 +00:00
Tomas Groth
01cbd921e9 Open opensong files in 'rb' mode. Fixes bug 1396958
Fixes: https://launchpad.net/bugs/1396958
2014-11-28 08:13:21 +00:00
Tomas Groth
9b731aad7a Fix projector tests on windows 2014-11-27 21:40:56 +00:00
34406385fb HEAD 2014-11-26 22:50:54 +02:00
a517ed5fea [refactor] Remove the progress bar on the first download page, and update the label to be slightly more descriptive
[fix] Hide the back button on the plugins page so that folks can't go back and re-download the config file
2014-11-26 22:02:48 +02:00
Tomas Groth
e3bd817c5b Merge with trunk 2014-11-26 09:04:09 +00:00
Tomas Groth
92a6831b15 Fix slidecontroller test 2014-11-25 22:31:18 +00:00
Tomas Groth
31018fb5ae When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271
Fixes: https://launchpad.net/bugs/1266271
2014-11-25 22:22:28 +00:00
Tim Bentley
d267144ea4 Fix bible traceback for non existant book
Prevent infine loop on invalid logic page split
Use existing plugin states when re-running FTW

bzr-revno: 2448
2014-11-25 21:46:11 +00:00
Tim Bentley
21db63b032 remove blank line 2014-11-25 21:36:52 +00:00
Tomas Groth
8a08be836d Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015
Fixes: https://launchpad.net/bugs/1390015
2014-11-25 16:00:27 +01:00
Tomas Groth
80a8434458 Added one more test for song db upgrade 2014-11-25 15:11:18 +01:00
Tomas Groth
4ca013e211 Added test for song db upgrade 2014-11-25 12:25:41 +01:00
Tomas Groth
c6e4c07a24 Fix upgrade on song db with lost version. Fixes bug 1391638
Fixes: https://launchpad.net/bugs/1391638
2014-11-24 23:12:04 +00:00