Commit Graph

5524 Commits

Author SHA1 Message Date
Philip Ridout c43823a2b0 Fixes the copyright headers
bzr-revno: 2484
2015-01-22 19:46:04 +00:00
Phill Ridout 051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout 7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Philip Ridout fa05d3110e Image Name in Service Manager - bug1410456
bzr-revno: 2483
2015-01-21 21:12:30 +00:00
Tomas Groth f53187e26a Fix layout in player-settings. Fixes bug 1410772
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.

bzr-revno: 2482
2015-01-21 20:35:36 +00:00
Phill Ridout e3f147a226 Fixes 1410456 and adds a couple tests
Fixes: https://launchpad.net/bugs/1410456
2015-01-19 22:49:18 +00:00
Raoul Snyman de213b0f66 Copyright cleanup time,
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
Tomas Groth 685b2fde32 Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175
Fixes: https://launchpad.net/bugs/1405172, https://launchpad.net/bugs/1405175
2015-01-18 20:38:03 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tomas Groth 36e4b0c8eb Attempt to fix WorshipCenterProImport init under wine tests 2015-01-16 16:25:25 +01:00
Ken Roberts 5bfb5b5426 Add .bin file import support.
Sometime prior to 2015, SongSelect changed the default file name for USR files to .bin.

bzr-revno: 2474
2015-01-11 20:27:27 +00:00
Ken Roberts 4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Ken Roberts 3f3c4cf80b remote next/previous call test 2015-01-08 10:07:36 -08:00
Ken Roberts a4efccb00b Replace remote Registry().execute(event) next/previous with Qt signal 2015-01-06 14:37:18 -08:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Ken Roberts e89558da39 Fix label text for CCLI
bzr-revno: 2463
2014-12-31 10:26:50 +00:00
Samuel Mehrbrodt 46d9d60830 Add missing translationtype to song edit form
bzr-revno: 2462
2014-12-28 21:49:54 +00:00
Tomas Groth 25e3e742b9 Fix media end time, Bible Parsing, ServiceManage Preview, locking of keytpress
bzr-revno: 2461
2014-12-28 21:46:34 +00:00
Samuel Mehrbrodt f13a9d00b5 Missing translation type
Fixes: https://launchpad.net/bugs/1405164
2014-12-24 11:42:46 +01:00
Tomas Groth 795977b094 Make bible text parsing a bit more rebust, fixes bug 1404865.
Fixes: https://launchpad.net/bugs/1404865
2014-12-23 22:09:34 +00:00
Tim Bentley 98a3cd127f Update code to 2.2 from 2.1 so translators can get working!
bzr-revno: 2460
2014-12-22 21:55:44 +00:00
Ken Roberts 3be4f10833 Change edit song ccli label to "CCLI song number" 2014-12-22 12:19:05 -08:00
Tim Bentley 93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Tim Bentley 5686e85384 Fix custom duplication bug 2014-12-16 07:47:46 +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
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 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
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 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 e3bd817c5b Merge with trunk 2014-11-26 09:04:09 +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 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
Tim Bentley f4ff654a65 If invlaid bible name stop searching
Fixes: https://launchpad.net/bugs/1290246
2014-11-22 20:26:59 +00:00
Tim Bentley 4fb0e43c04 New start old bugs 2014-11-20 06:58:33 +00:00
93706f8d99 Fix for overwriting files on song export + test. Fixes bug 1216232.
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.

bzr-revno: 2447
2014-11-19 20:59:27 +00:00
Tomas Groth 571b50f016 Fix for overwriting files on song export. Fixes bug 1216232
Fixes: https://launchpad.net/bugs/1216232
2014-11-15 22:38:36 +00:00
Tomas Groth b7e3a33c4a Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Fixes: https://launchpad.net/bugs/1382672
2014-11-12 22:18:57 +00:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Tomas Groth 0a500eeb8d Fix for WA import with escaped characters, partial fix for bug 1390986
Fixes: https://launchpad.net/bugs/1390986
2014-11-10 10:25:31 +01:00
Philip Ridout 1ed8100537 Added new ColorButton subclassed from QPushButton to select colours reducing code duplication
Added tests for ColorButton
Renamed some methods to take in to account the new signal that ColorButton emits
Fixed some tests for FileDialog

bzr-revno: 2444
2014-11-09 13:18:53 +00:00
Raoul Snyman e9ec5d202c [bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
Tomas Groth a8bd5f1996 Fix for importing old bible DBs, like KJV 2014-11-07 13:06:58 +01:00
Tomas Groth 8f4ccc5426 Close db session after import to unlock file on windows 2014-11-06 14:14:05 +01:00
Tomas Groth b6e0036383 Re-re-fix duplicate song check on windows, and now it actually works in builds. 2014-11-06 10:34:07 +01:00
Tomas Groth 992ac3bbb8 Second attempt to fix duplicate-song-detection on windows 2014-11-05 21:44:45 +00:00
Tomas Groth 77c7da2d20 Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth af6a5322e2 Make it possible to break out of waiting loop 2014-11-04 12:58:03 +01:00