Commit Graph

1434 Commits

Author SHA1 Message Date
Phill Ridout
126873ddaa fixes bug1416703 by implementing a function to do the conversion
Fixes: https://launchpad.net/bugs/1416703
2015-02-13 20:41:34 +00:00
Phill Ridout
e35a1d7763 head 2015-02-12 21:35:26 +00:00
Phill Ridout
f6de8a4f7a Fix 1416703 2015-02-12 20:44:34 +00:00
88cb02bb3d Fix bug #1417809: Remove default ascii encoding so md5hash can be used to hash other data.
bzr-revno: 2497
Fixes: https://launchpad.net/bugs/1417809
2015-02-10 21:38:53 +02:00
Tomas Groth
1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered.
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
2015-02-10 21:24:33 +02:00
Tomas Groth
2cdc1b2fe4 Remove print 2015-02-06 22:21:01 +00:00
11f32861f5 Remove unneeded files 2015-02-06 09:44:40 -08:00
Phill Ridout
dbd25822f2 Add tests 2015-02-05 17:22:31 +00:00
a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
fd5b8112f9 sha1_filecheck test 2015-02-03 14:59:59 -08:00
Tomas Groth
5b717db63a Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
Fixes: https://launchpad.net/bugs/1417033
2015-02-02 20:40:31 +00:00
b02d44416a Allow md5check to use non-ascii encoding, added md5_filecheck 2015-02-02 10:00:39 -08:00
Philip Ridout
cfa8e4f2df Fixes #1414585 Thumbnail of images isn't shown in stage view and remote control
and #1414585 2.1.2 Traceback on Presentations for MAC

bzr-revno: 2494
2015-02-01 19:51:54 +00:00
Philip Ridout
b40f931618 Fix - Preview media slider repeatedly shows "Error Occurred" dialogue box
bzr-revno: 2493
2015-02-01 15:04:37 +00:00
Tim Bentley
93038bb27d Move delete option to support ham fisted users
bzr-revno: 2492
2015-02-01 13:37:54 +00:00
93ce2caf34 Fix invalid call to QMessageBox() when user wants to delete user-defined source text.
bzr-revno: 2491
2015-01-31 14:18:19 +00:00
Tim Bentley
6f76c164e0 fix delete 2015-01-30 21:15:03 +00:00
Tomas Groth
1b75cc9c6b Fallback to manual encoding detection. 2015-01-29 21:15:39 +00:00
Phill Ridout
b33fe701df Make Phonon optional
Fixes: https://launchpad.net/bugs/1224404
2015-01-29 20:57:02 +00:00
Tomas Groth
4c53cb5184 Added tests 2015-01-29 20:54:06 +00:00
Phill Ridout
52a1033505 test tidies 2015-01-29 18:26:00 +00:00
Phill Ridout
0cc2ae5998 Fix exception raised on mac
Fixes: https://launchpad.net/bugs/1414360
2015-01-27 19:57:09 +00:00
Phill Ridout
091cb079e7 Fix up tests 2015-01-26 20:43:53 +00:00
Phill Ridout
1712464e8c Fix up tests 2015-01-26 20:42:19 +00:00
Phill Ridout
3dc248e556 Typo 2015-01-25 22:13:35 +00:00
Phill Ridout
34f8cbc09b Typos & tests 2015-01-25 22:12:33 +00:00
Tim Bentley
121f0908a1 fix tests
bzr-revno: 2489
2015-01-24 19:23:06 +00:00
Tim Bentley
46f038a49d Release 2.1.2
bzr-revno: 2488
2015-01-24 19:21:07 +00:00
Philip Ridout
5390ed5bac Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)

Also added code to remove the old thumbnails.

bzr-revno: 2487
2015-01-24 18:24:51 +00:00
Phill Ridout
4a52a90a4e test fix. Test options in order as per --help 2015-01-24 10:21:13 +00:00
Philip Ridout
fe3d887fd7 Corrects Translation strings
bzr-revno: 2485
2015-01-22 19:47:16 +00:00
Philip Ridout
c43823a2b0 Fixes the copyright headers
bzr-revno: 2484
2015-01-22 19:46:04 +00:00
Phill Ridout
92eee52d3f pep fixes 2015-01-22 18:07:56 +00:00
Phill Ridout
125f019486 test fixes 2015-01-22 17:52:48 +00:00
Phill Ridout
051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout
75dff3d2be HEAD 2015-01-22 17:31:00 +00:00
Phill Ridout
a64fdd8697 fix tests 2015-01-22 15:35:52 +00:00
Phill Ridout
833c6fb800 Add test 2015-01-22 15:05:03 +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
e7793fc9fa Pep fixes 2015-01-20 21:45:37 +00:00
Phill Ridout
7fda8043f5 Improve translation string
Fixes: https://launchpad.net/bugs/1412234
2015-01-20 21:38:34 +00:00
9c5ba940da Refactor source record test 2015-01-20 07:44:55 -08:00
Phill Ridout
88f69ea7c4 doc strings an typos 2015-01-20 07:14:58 +00:00
Phill Ridout
f1f0ab9c3d pep fixes 2015-01-19 22:59:49 +00:00
Phill Ridout
63f68d344f pep fixes 2015-01-19 22:56:30 +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
745a3e3ef8 Remove translations from error code number strings 2015-01-19 14:36:53 -08:00
de213b0f66 Copyright cleanup time,
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
44bf096bbb Source edit form button test 2015-01-18 20:24:45 -08: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
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
deb8ae8656 Fix First Time Wizard fail on URL error (ex: proxy authorization)
Fix spelling

bzr-revno: 2478
Fixes: https://launchpad.net/bugs/1409627
2015-01-16 22:43:47 +02:00
Tomas Groth
cf30667fb5 Fix Windows tests when running on WINE
bzr-revno: 2477
2015-01-16 22:42:00 +02:00
Tomas Groth
255b7d8495 pep8 fix 2015-01-16 20:23:56 +00:00
Tomas Groth
36e4b0c8eb Attempt to fix WorshipCenterProImport init under wine tests 2015-01-16 16:25:25 +01:00
Tomas Groth
76b47019b6 Mock out AudioPlayer to avoid loading Phonon during test. 2015-01-16 14:51:38 +01:00
Phill Ridout
e5bae7e885 Fixes1410694 by fixing typo, also added additional error. Added the OS Name and version to the version file request headers
Fixes: https://launchpad.net/bugs/1410694
2015-01-14 21:35:02 +00:00
Tomas Groth
1efc145cdf PEP8 fixes 2015-01-14 12:32:27 +01:00
Tomas Groth
dc3cd41576 Use a in-memory sqlite DB for projector test, instead of filebased. Fixes a filelock issue in windows tests. 2015-01-14 11:57:54 +01:00
9551920821 Catch network error in FTW 2015-01-13 11:03:05 -08:00
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
3774cf3704 Update the credits in the About dialog 2015-01-11 21:46:41 +02:00
4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
172f13b12e Fix an erroneous import (probably PyCharm) 2015-01-11 17:18:17 +02:00
0bb325fea7 HEAD 2015-01-11 17:17:33 +02:00
0deb0a10cc [bug 1397606] Set the file dialogue box to the currently selected background image
bzr-revno: 2471
Fixes: https://launchpad.net/bugs/1397606
2015-01-11 17:17:01 +02:00
91933c3e2f [bug 1409031] Fix retry counter when fetching a webpage
bzr-revno: 2470
Fixes: https://launchpad.net/bugs/1409031
2015-01-11 17:13:13 +02:00
02fb9edeb6 [bug 1407445] Fix remote previous/next calls to servicemananger
- Remove unneeded Registry() modification
- Fix line spacing

bzr-revno: 2469
Fixes: https://launchpad.net/bugs/1407445
2015-01-11 17:09:57 +02:00
8758020568 HEAD 2015-01-11 17:02:32 +02:00
Phill Ridout
dac7185692 Remove extra line 2015-01-09 19:51:39 +00:00
5c7777fd5a Fix line spacing 2015-01-09 10:55:46 -08:00
0b2445b9a2 Fix spacing 2015-01-09 10:53:36 -08:00
d2fb2d47eb Tests for bug 1409031 2015-01-09 10:46:50 -08:00
Phill Ridout
e0fa70e47e Set the last file location in the file dialog box
Fixes: https://launchpad.net/bugs/1397606
2015-01-08 22:05:32 +00:00
Ken Roberts
7277e3e92a Remove unneeded Registry modification 2015-01-08 10:55:26 -08:00
Ken Roberts
3f3c4cf80b remote next/previous call test 2015-01-08 10:07:36 -08:00
Ken Roberts
3a9b61d9dc Remove old testing framework in setup() 2015-01-06 16:36:39 -08:00
Ken Roberts
093f853fd9 Remove testing api (not needed anymore) 2015-01-05 10:54:44 -08:00
Ken Roberts
2e9f274027 Fix test db temp file for windows, projector edit form notes clearing 2015-01-05 10:36:10 -08:00
Ken Roberts
ba66618ca0 Bump other copyright year 2015-01-04 09:45:10 -08:00
Ken Roberts
15f1381de8 Upstream merges 2015-01-04 09:38:59 -08:00
Ken Roberts
5006fb238d Bump copyright year 2015-01-04 09:31:15 -08:00
Tomas Groth
9461f334ce Disable webkit and phonon mediaplayers on Mac OS X,
bzr-revno: 2467
2015-01-04 09:01:18 +00:00
Phill Ridout
3cafbfd0ed Typo in comments fixed 2015-01-02 11:54:42 +00:00
Phill Ridout
9fef267fd3 Changed the year 2015-01-02 11:42:17 +00:00
Phill Ridout
b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Phill Ridout
20d927b270 Rework to use a subclassed QLabel to allow dynamic resizing 2015-01-02 11:40:07 +00:00
Tomas Groth
9b2660bf7f Rewrote tests for webkit and phonon player 2015-01-01 17:41:32 +00:00
Tomas Groth
e5c5a229a4 Update to 2015 2014-12-31 15:06:35 +00:00
Tomas Groth
1e95bc7fbb Added simple tests for webkit and phonon players 2014-12-31 14:57:41 +00:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
e89558da39 Fix label text for CCLI
bzr-revno: 2463
2014-12-31 10:26:50 +00:00
Phill Ridout
52c7d89706 removal of util function 2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized 2014-12-30 11:21:06 +00:00
Phill Ridout
3cf2a21ca2 fix tests 2014-12-30 09:03:35 +00:00
Ken Roberts
ff185523e1 Test for bug 1404967 2014-12-29 09:41:45 -08:00
Phill Ridout
36417083ce head 2014-12-29 17:25:36 +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
c5d716f565 Test 2014-12-24 14:21:17 +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
Phill Ridout
c9e1dcceff head 2014-12-23 18:57:04 +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
Tim Bentley
93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Phill Ridout
4a9a7f2829 adds tests for bible media item 2014-12-19 22:02:45 +00:00
Phill Ridout
cb0e4dc7ba added copyright header to test 2014-12-19 22:01:15 +00:00
Tim Bentley
927e610977 Fix tests 2014-12-18 21:15:14 +00:00
Ken Roberts
cfc0322eaf Test for projectoredit form 2014-12-18 11:06:25 -08:00
Tim Bentley
5686e85384 Fix custom duplication bug 2014-12-16 07:47:46 +00:00
fe02a80e26 HEAD 2014-12-14 22:37:36 +02:00
b2f6eaf7d4 [Fix #1386913] "Discard" option in projector-select input option should only be for editing source input text
- Fix "Discard" and "Reset" dialog buttons calling wrong functions (swapttped)
- Fix dialog title text to reflect proper "Select" or "Edit" title
- Fix tabbed dialog width to be consistent
- Added calls to translate for user text
- Added basic test for openlp.core.ui.projector.sourceselectform

bzr-revno: 2457
Fixes: https://launchpad.net/bugs/1386913
2014-12-14 22:34:52 +02:00
5742f7546e Fixed up merge conflicts. 2014-12-12 22:57:42 +02:00
Phill Ridout
2642a21d53 Refactor get_uno_command & get_uno_instance 2014-12-08 07:19:51 +00:00
Phill Ridout
6fd0612748 set connection type for each test 2014-12-07 19:13:21 +00:00
Phill Ridout
2aff850b64 HEAD 2014-12-07 17:46:46 +00:00
Phill Ridout
9d54d6351a Tests 2014-12-07 17:46:23 +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
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
782b3d3bcf trunk 2014-12-03 22:35:06 +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
Phill Ridout
70c3a21620 HEAD 2014-12-03 19:50:41 +00:00
Tomas Groth
6ebc08d0d9 Attempt to fix crash in test 2014-12-02 09:46:50 +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
9b731aad7a Fix projector tests on windows 2014-11-27 21:40:56 +00:00
c33cf2b5b5 We need to remove the service manager from the Registry in tearDown 2014-11-27 01:45:17 +02:00
cbb5630ba5 See if this fixes things on CI 2014-11-27 01:39:31 +02:00
049ca7e9d2 Go back to deleting everything, as it seems to yield the best result 2014-11-27 01:34:48 +02:00
d28e838fa6 Empty methods need a pass statement 2014-11-26 23:32:22 +02:00
d978f12630 Try something ridiculous, like removing all the deletes 2014-11-26 22:56:21 +02:00
34406385fb HEAD 2014-11-26 22:50:54 +02:00
Ken Roberts
ea14deaa87 Fix quotes 2014-11-26 09:24:05 -08: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
Tim Bentley
21db63b032 remove blank line 2014-11-25 21:36:52 +00: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
bca75efe53 Playing around 2014-11-24 23:37:57 +02:00
e537abf916 Lets try this again 2014-11-24 23:34:10 +02:00
7f84fac9e5 Introduced a problem on CI it seems. 2014-11-24 23:22:24 +02:00
fbaad51811 Try to fix the segfault 2014-11-24 23:18:32 +02:00