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

1634 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts 745a3e3ef8 Remove translations from error code number strings 2015-01-19 14:36:53 -08:00
Raoul Snyman de213b0f66 Copyright cleanup time, 
bzr-revno: 2479
 2015-01-19 08:34:29 +00:00
Ken Roberts 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
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Ken Roberts 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
Ken Roberts 9551920821 Catch network error in FTW 2015-01-13 11:03:05 -08: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
Raoul Snyman 3774cf3704 Update the credits in the About dialog 2015-01-11 21:46:41 +02:00
Ken Roberts 4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Raoul Snyman 172f13b12e Fix an erroneous import (probably PyCharm) 2015-01-11 17:18:17 +02:00
Raoul Snyman 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
Ken Roberts 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
Ken Roberts 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
Raoul Snyman 8758020568 HEAD 2015-01-11 17:02:32 +02:00
Phill Ridout dac7185692 Remove extra line 2015-01-09 19:51:39 +00:00
Ken Roberts 5c7777fd5a Fix line spacing 2015-01-09 10:55:46 -08:00
Ken Roberts 0b2445b9a2 Fix spacing 2015-01-09 10:53:36 -08:00
Ken Roberts 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
Ken Roberts 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
Raoul Snyman fe02a80e26 HEAD 2014-12-14 22:37:36 +02:00
Ken Roberts 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
Raoul Snyman 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
Raoul Snyman c33cf2b5b5 We need to remove the service manager from the Registry in tearDown 2014-11-27 01:45:17 +02:00
Raoul Snyman cbb5630ba5 See if this fixes things on CI 2014-11-27 01:39:31 +02:00
Raoul Snyman 049ca7e9d2 Go back to deleting everything, as it seems to yield the best result 2014-11-27 01:34:48 +02:00
Raoul Snyman d28e838fa6 Empty methods need a pass statement 2014-11-26 23:32:22 +02:00
Raoul Snyman d978f12630 Try something ridiculous, like removing all the deletes 2014-11-26 22:56:21 +02:00
Raoul Snyman 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
Raoul Snyman bca75efe53 Playing around 2014-11-24 23:37:57 +02:00
Raoul Snyman e537abf916 Lets try this again 2014-11-24 23:34:10 +02:00
Raoul Snyman 7f84fac9e5 Introduced a problem on CI it seems. 2014-11-24 23:22:24 +02:00
Raoul Snyman fbaad51811 Try to fix the segfault 2014-11-24 23:18:32 +02:00
Raoul Snyman bd79b1d059 [bug 1314469] Fix the border seen in the main display on KDE by not overwriting that bit of the stylesheet 
Fixes: https://launchpad.net/bugs/1314469
 2014-11-24 21:43:34 +02: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 22a4974d86 Comments 2014-11-22 07:07:08 +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 c85f49a16c Added test for openlyrics export of songs with same title and author 2014-11-16 22:44:44 +00:00
Tomas Groth 378132d82f Moved Settings KeyError handling to the export. 2014-11-13 20:15:43 +00:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Phill Ridout 5cc1fa2261 Fixes a few typos 2014-11-10 20:48:22 +00:00
Tomas Groth 61e42a9782 When querying values from Setting, return None if key does not exists. Fixes bug 1387278 
Fixes: https://launchpad.net/bugs/1387278
 2014-11-10 11:51:03 +01:00
Ken Roberts 3fa0635d79 Fix Projector Manager dock so View->Lock Panels will lock/unlock the UI features 
bzr-revno: 2445
 2014-11-09 13:20:09 +00: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
Ken Roberts 84f104b7f8 Test for bug 1390702 2014-11-08 18:54:08 -08: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
Raoul Snyman 14377f3329 [refactor] Renamed "was_download_cancelled" to "was_cancelled" 
[refactor] Put some more stuff back into initalise() where it belongs
[refactor] Rewrote old tests, wrote new tests
 2014-11-08 23:15:25 +02:00
Ken Roberts f2cd0a9743 Fix "Discard" and "Reset" button calls, pep8 2014-11-07 14:44:40 -08:00
Ken Roberts c89b54e4a4 Add basic test for projector.sourceselectform 2014-11-07 14:24:20 -08:00
Tomas Groth 519119aecb Fixed test to reflect 30 sec timeout in get_web_page 2014-11-07 10:41:37 +01:00
Tomas Groth 48c561e34b Made the FTW able to handle if the downloaded config file is invalid. 
Fixes: https://launchpad.net/bugs/1222944
 2014-11-07 10:32:45 +01:00
Tomas Groth ff4ddefa77 pep8 fix 2014-11-06 10:42:54 +01:00
Tomas Groth 02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01: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 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Phill Ridout 985717edb4 HEAD 2014-11-02 18:26:07 +00:00
Phill Ridout 2b710a82ab Correct tag 2014-11-02 17:41:04 +00:00
Phill Ridout 3218ae8cae Added 2.1.1 tag 2014-11-02 17:31:06 +00:00
Phill Ridout b119cc40be HEAD 2.1.1 release 2014-11-02 17:19:27 +00:00
Phill Ridout b464b5613c pep fixes 2014-11-02 17:19:02 +00:00
Phill Ridout b682117f92 Completed tests for ColorButton 2014-11-02 16:50:18 +00:00
Tim Bentley 616565fe19 Head 2014-11-01 11:12:27 +00:00
Raoul Snyman b692e11d82 Filter out ampersands and angle brackets 
bzr-revno: 2437
 2014-11-01 11:11:48 +00:00
Tomas Groth 146a505ee6 #1387286, playing audio CD clips on windows. 
#1247025, Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025.
Fix traceback on theme import in windows.

bzr-revno: 2436
 2014-11-01 11:09:10 +00:00
Tim Bentley b20b114a7b test fix 2014-11-01 11:06:17 +00:00
Tim Bentley 6323f8bba7 Add tests 2014-11-01 10:59:45 +00:00
Raoul Snyman 0e46a05ccc Apparently pylint doesnt like blank lines at the end of the file. fussy. 
Fixes: https://launchpad.net/bugs/1387309
 2014-10-31 22:15:44 +02:00
Raoul Snyman ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
Raoul Snyman 6a67a77240 Fix bug #1387309: Filter out ampersands and angle brackets 2014-10-31 21:47:36 +02:00
Tomas Groth 74b582032f Fix theme import in windows. Test included. 2014-10-31 13:01:07 +01:00
Raoul Snyman 69873c0db3 Two fixes: 
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
- Found a potential bug where the settings form was canceled, with one or more inactive plugins
- Wrote a test for the above settings form bug

Fixes: https://launchpad.net/bugs/1386896
 2014-10-31 00:53:06 +02:00
Phill Ridout 8c0f480b0e Start of ColorButton tests 2014-10-29 19:18:01 +00:00
Phill Ridout 3685948ed5 HEAD 2014-10-29 19:11:43 +00:00
Phill Ridout 013e59c527 fixes to FileDialog tests 2014-10-29 19:07:13 +00:00
Ken Roberts ddd94ba061 Upstream merges 2014-10-28 13:48:20 -07:00
Ken Roberts 6ae179d672 Upstream merges 2014-10-28 13:45:53 -07:00
Raoul Snyman 00455847a7 HEAD 2014-10-28 22:27:09 +02:00
Raoul Snyman 743dc59d51 [fix 1386710] Fix traceback after settings form is saved 
Fixes: https://launchpad.net/bugs/1386710
 2014-10-28 21:40:01 +02:00
Raoul Snyman ae7c863333 [fix 1385979] Check if the item is valid first 2014-10-28 21:02:06 +02:00
Tomas Groth c19613ce82 Various small bugfixes: 
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.

bzr-revno: 2431
Fixes: https://launchpad.net/bugs/1296574
 2014-10-28 20:36:54 +02:00
Tomas Groth 11b2b4dc3b Added test for checking extension list creation 2014-10-27 21:38:19 +00:00
Tim Bentley afde4a25ad Fix missing dummy values for debug 2014-10-27 20:22:57 +00:00
Raoul Snyman b34da371ba [fix #1385438] Make list widget items select tab pages via user data rather than just their position. 
Fixes: https://launchpad.net/bugs/1385438
 2014-10-25 22:26:19 +02:00
Ken Roberts e8e6410d45 Fix test suite change 2014-10-24 12:17:12 -07:00
Ken Roberts f81903bbcf Merge upstream 2014-10-23 15:16:38 -07:00
Raoul Snyman 3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman 76f4b6e3ad Forgot to add test file 2014-10-22 22:44:05 +02:00
Raoul Snyman 551a10d311 Added and updated tests: 
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests

Updated setup.py with some Python3 changes.
 2014-10-22 22:43:05 +02:00
Ken Roberts d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Ken Roberts b38921a90b Code cleanups 2014-10-21 14:40:47 -07:00
Tomas Groth 5662f4b2af Ask the user if a backup of the data folder should be created after upgrading 
bzr-revno: 2427
 2014-10-21 22:08:26 +01:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile 
bzr-revno: 2426
 2014-10-21 22:07:19 +01:00
Tomas Groth 5ecbfa61fd Fix tests so they can run individually. 
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
 2014-10-21 22:06:02 +01:00
Tim Bentley d6dc19ae5e Correct Version to Mainwindow communications. 
bzr-revno: 2424
 2014-10-21 22:03:31 +01:00
Phill Ridout 07c693c8c8 Changed some of the comments 2014-10-21 21:08:37 +01:00
Tim Bentley 2b3e3d777e Add Test and fix more code 2014-10-21 21:05:08 +01:00
Ken Roberts d914deacd2 Fix projector test cleanups 2014-10-21 08:41:09 -07:00
Ken Roberts 81f6214cc5 pep8 2014-10-21 08:21:19 -07:00
Ken Roberts 232f048616 fix call to changed function 2014-10-21 08:17:27 -07:00
Ken Roberts 8fcba0aa65 fix call to changed function 2014-10-21 08:15:20 -07:00
Ken Roberts ed4605be61 Remove old test db file in case of schema changes 2014-10-21 08:12:43 -07:00
Ken Roberts f9f4296acf Missed ProjectorEditForm import for test 2014-10-16 11:25:08 -07:00
Ken Roberts 81e7798c50 Change test from wizard to edit form 2014-10-16 11:22:34 -07:00
Tomas Groth cbd1b7c223 Changed setting version name 2014-10-14 09:52:59 +02:00
Samuel Mehrbrodt 806bb5973e Merge trunk 2014-10-13 19:40:12 +02:00
Tomas Groth 5091b3de37 Added a test 2014-10-13 16:08:06 +02:00
Samuel Mehrbrodt 637c0060f9 Add test 2014-10-13 13:38:13 +02:00
Ken Roberts 7545fb534f Fix changed imports in mockups 2014-10-06 14:19:08 -07:00
Tomas Groth 773a1cef39 Remove non-working test 2014-10-06 21:05:06 +01:00
Phill Ridout 3ea58aa4ca change line endings 2014-10-06 20:41:29 +01:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Phill Ridout ddec0e00cd Patch changes from botched branch 2014-10-06 19:09:47 +01:00
Tomas Groth 9dbbe9d5be Fixed console popping up on windows when running mudraw.exe 2014-10-03 11:57:35 +02:00
Tomas Groth 2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +01:00
Tomas Groth a8a7068de8 Added slidecontroller ui test 2014-09-27 20:57:28 +01:00
Tomas Groth 60dc075e3b pep8 fix 2014-09-25 21:46:09 +01:00
Tomas Groth 9b8b114a59 Fixed the new test. 2014-09-25 21:31:31 +01:00
Tomas Groth 839df08eb7 Another test fix 2014-09-25 17:02:10 +02:00
Tomas Groth 3e66b4aa98 Fix for importing custom tags from openlyricsxml + test in progress 2014-09-25 17:01:11 +02:00
Tomas Groth 977fd1d187 Fix tests so they can run individually. 2014-09-25 16:59:56 +02:00
Tomas Groth 31a868ca61 Moved thumbnail creation to httprouter.py 2014-09-23 22:45:42 +01:00
Tomas Groth 78d9da5c26 Fix comments and typos 2014-09-22 22:19:02 +01:00
Tomas Groth 4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Tomas Groth 5dceb1a0e6 Fixes for DVD 
bzr-revno: 2421
 2014-09-17 21:43:53 +01:00
Samuel Mehrbrodt b24ba5322b Merge trunk 2014-09-14 15:44:32 +02:00
Samuel Mehrbrodt e6a6015c21 Fix tests 2014-09-14 15:32:38 +02:00
Raoul Snyman efe030b020 Update the UI on Mac OS to make it look and feel more like a first-class Mac app. 
* Removed the icons from the menus (thanks to Jonathan S. for that)
* Use Mac OS X wizards instead of our Windows-style wizards when on OS X

bzr-revno: 2419
 2014-09-14 15:07:31 +02:00
Samuel Mehrbrodt aef7bb55c4 Add test 2014-09-14 00:00:43 +02:00
Tomas Groth 489f2266b2 Fix test for windows 2014-09-10 10:54:03 +02:00
Tomas Groth 74391978e8 pep8 fix 2014-09-10 10:07:10 +02:00
Tomas Groth 2e0c3e24f7 Changed thememanager test so it doesn't make the zipfile module unuseable. 2014-09-10 10:05:45 +02:00
Tomas Groth d767990280 Adjusted tests 2014-09-10 09:34:38 +02:00
Tomas Groth 3769a01682 Small fixes 2014-09-08 22:48:49 +01:00
Tomas Groth dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Tomas Groth 98c41ae586 Mock device detection during test. 2014-09-08 21:58:42 +01:00
Tomas Groth 79ef9315d5 Added a test 2014-09-08 21:49:33 +01:00
Raoul Snyman bf488da516 Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm. 2014-09-08 00:17:20 +02:00
Tomas Groth 98d5ed7acf Fix the OSIS bible importer 
bzr-revno: 2418
 2014-09-06 07:44:08 +01:00
Tomas Groth df28a6799b trunk 2014-09-02 21:17:56 +01:00
Tomas Groth a2710553d9 Implemented a workaround for bug1251437 / http://bugs.python.org/issue22248 
The problem is the urllib.request.urlopen cannot handle redirect urls with non-ascii chars, so I've added url-encoding of the redirect url.

bzr-revno: 2416
 2014-08-29 17:37:25 +01:00
Jonathan Springer f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Tomas Groth 7fecaa1d70 Added language detection when importing 
Fixes: https://launchpad.net/bugs/1214875
 2014-08-27 15:10:33 +02:00
Tomas Groth 1adeb175ae trunk 2014-08-27 10:44:04 +02:00
Tomas Groth 62811d660f Implemented a workaround for bug1251437 
Fixes: https://launchpad.net/bugs/1251437
 2014-08-27 10:43:18 +02:00
Tomas Groth 36326085f8 trunk 2014-08-26 22:19:08 +01:00
Tomas Groth 11a19fbd32 Merged Raouls GUI changes 2014-08-26 22:11:29 +01:00
Phill Ridout 9ca8be20fb HEAD 2014-08-26 17:09:28 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth 359a209341 Fixed copy/paste error. 2014-08-25 21:31:35 +01:00
Tomas Groth a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tomas Groth 71a1b26e1c Changed test desciption. 2014-08-24 16:14:29 +01:00
Tomas Groth 3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00
Tomas Groth 43d3823bfb trunk 2014-08-24 15:38:17 +01:00
Tomas Groth 254acf4601 trunk 2014-08-24 15:37:51 +01:00
Tim Bentley 2f8d8f912e Fix conversion error and add tests for service manager context menu 
bzr-revno: 2412
 2014-08-24 15:37:47 +01:00
Samuel Mehrbrodt c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tim Bentley 565c2312d0 head 2014-08-24 10:37:49 +01:00
Tim Bentley 09bb622af8 Final tests 2014-08-24 10:32:26 +01:00
Tim Bentley 516fd30bc7 fix conversion bug 2014-08-23 21:42:10 +01:00
Phill Ridout a2a4e6c4c7 HEAD 2014-08-22 17:26:46 +01:00
Tomas Groth fd4dc4caf7 Fixed another windows test by properly constructing paths. 2014-08-21 15:07:02 +02:00
Tomas Groth 3a1fda85d5 Fixed windows test failure by removing special char from filenames 2014-08-21 14:51:34 +02:00
Tomas Groth 49fca807f4 deleted file leftover from merge 2014-08-21 14:41:46 +02:00
Tomas Groth 3b092319c9 trunk 2014-08-21 11:24:40 +02:00
Raoul Snyman 86291d0c41 Round 1 of media clip dialog refresh 2014-08-21 01:35:24 +02:00
Samuel Mehrbrodt bde55c79f8 No newline at end of file... 2014-08-18 21:15:23 +02:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Tomas Groth db477f8d9c trunk 2014-08-04 18:12:03 +01:00
Stewart Becker 04bafa62fa Added an option to wrap footer text 
bzr-revno: 2409
 2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt 16399e2ea5 This prevents updates from running (which should only run on outdated databases that existed before) 
bzr-revno: 2408
 2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt 82b3c00863 Add importer for PresentationManager 
bzr-revno: 2407
 2014-08-04 06:01:41 +01:00
Samuel Mehrbrodt 933ec66efc Fix theme export and add unit test. 
bzr-revno: 2406
 2014-08-04 06:00:34 +01:00
Stewart Becker 2f984c45c4 Style fixes for Tim 2014-07-24 22:57:16 +01:00
Stewart Becker d90fcface2 Style fixes for Tim 2014-07-24 20:28:57 +01:00
Stewart Becker 668864c38d Tidy up tests and formatting 2014-07-22 21:06:48 +01:00
Stewart Becker 9a1ce000b7 Patch Registry.execute so that it is undoen at end of test 2014-07-21 22:45:27 +01:00
Stewart Becker 2555bc50d4 Add test for wrap footer setting 2014-07-21 18:13:20 +01:00
Phill Ridout 6a09b727b5 HEAD 2014-07-20 21:17:50 +01:00
Phill Ridout 67ab508286 Tweeked test to use a call list 2014-07-20 21:00:06 +01:00
Samuel Mehrbrodt fa5787e5d8 Add test 2014-07-17 23:16:00 +02:00
Tomas Groth a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth 00693b8cce trunk 2014-07-15 15:41:34 +02:00
Tomas Groth b6cd13fc91 pep8 fixes 2014-07-15 12:02:56 +02:00
Tomas Groth e1c00f9689 Fix tests for pptview - again 2014-07-15 11:50:52 +02:00
Tomas Groth 0a018a59fb Fix tests for pptview 2014-07-15 11:45:23 +02:00
Tomas Groth 9853b21170 Added test.ppt needed for tests 2014-07-15 11:28:50 +02:00
Tomas Groth 597e06153c Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes 2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt b2afbd688d Add an importer for PowerPraise 
bzr-revno: 2404
 2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt 6c40962afb Allow editing of author types and fix bug in servicemanager 
bzr-revno: 2403
 2014-07-14 17:25:59 +01:00
Tomas Groth 88fc41a5eb Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py 2014-07-14 16:15:08 +02:00
Tomas Groth 29f8eedeaf Merged with trunk and reverted changes to the tag test 2014-07-14 09:19:47 +02:00
Tomas Groth 022ac9bfac trunk 2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt af64bece26 Improve Song Copyright 
bzr-revno: 2402
 2014-07-13 21:57:05 +01:00
Raoul Snyman a670724ebe Fix tags test to work with cross repo flags 
bzr-revno: 2401
 2014-07-13 21:56:02 +01:00
Raoul Snyman 563fb794b5 Added an explanatory comment 2014-07-13 21:21:50 +02:00
Raoul Snyman 63350ab6eb Try to ignore the 2.0.x line of tags 2014-07-13 15:10:58 +02:00
Raoul Snyman ba9ff89354 [fix] PEP8 error: no whitespace 2014-07-13 13:04:37 +02:00
Raoul Snyman f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Samuel Mehrbrodt 79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Tomas Groth 3edabb268e removed websockets 2014-07-11 22:35:23 +02:00
Samuel Mehrbrodt 53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Tomas Groth 98a58d45bf pep8 fixes 2014-07-11 15:35:44 +02:00
Tomas Groth 52f298fdc1 change to unix style lineending 2014-07-11 14:54:00 +02:00
Tomas Groth 9d64837602 fixed image test 2014-07-11 14:43:40 +02:00
Tomas Groth 4920f86351 removed leftover file from merge 2014-07-11 14:21:49 +02:00
Tomas Groth 406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt 7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt 79009a1a7f Add test 2014-07-09 14:41:55 +02:00
Tomas Groth fdded5adc2 Fix tag tests 2014-07-07 19:28:27 +02:00
Tomas Groth e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Tomas Groth e6f5136708 Suggested changes to tests 2014-07-07 19:22:58 +02:00
Samuel Mehrbrodt b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt 2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Tomas Groth 695079dd00 Improve powerpoint error handling. 
bzr-revno: 2399
 2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt 520c251923 Cleanup: Move song import plugins into subfolder 
bzr-revno: 2398
 2014-07-07 17:08:32 +01:00
Tim Bentley 2770c76895 Fix setup.py for python3 to remove binary strings. 
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.

bzr-revno: 2397
 2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt b7a141f75c Add Presentation Manager import 
Fixes: https://launchpad.net/bugs/957017
 2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 0fb445e117 PEP8 2014-07-04 11:36:54 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Tomas Groth 33e104d57d Tried to fix some linux vs windows issues. Also added a test. 2014-07-04 10:45:17 +02:00
Samuel Mehrbrodt 953adf7145 A blank line! 2014-07-04 10:35:24 +02:00
Samuel Mehrbrodt 87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt 7112356c21 Parse verse order 2014-07-03 23:48:52 +02:00
Samuel Mehrbrodt 9f34552364 PowerPraise importer 
Fixes: https://launchpad.net/bugs/1336929
 2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt c9b47e8e6f PEP8 2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt 3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Tomas Groth 79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Tim Bentley 12c8663f8e indent 2014-07-02 20:52:26 +01:00