Commit Graph

1197 Commits

Author SHA1 Message Date
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
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
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
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
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
Phill Ridout 36417083ce head 2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt c5d716f565 Test 2014-12-24 14:21:17 +01: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
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
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 da7ff60697 Moved test service files into appropriate folder. 2014-12-06 21:05:45 +00:00
Tomas Groth 0038ffcbe6 Add test for loading song with linked audio - the actual test 2014-12-03 22:29:20 +00:00
Phill Ridout 563347c8b8 HEAD 2014-11-30 07:44:57 +00:00
Raoul Snyman 34406385fb HEAD 2014-11-26 22:50:54 +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
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 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 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
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
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
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 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 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
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
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
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 2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +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 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
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
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
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 36326085f8 trunk 2014-08-26 22:19:08 +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
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 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 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
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 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 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 87eb8804de Fixes 2014-07-04 00:06:18 +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
Tim Bentley 6847ee2e37 remove bl 2014-07-02 20:47:54 +01:00
Tomas Groth 376f8f3dc7 Added test for thememanager 2014-07-02 21:18:18 +02:00
Tim Bentley f71c4cc7af remove nonvalid test 2014-07-02 19:58:52 +01:00
Tim Bentley 4ac921a2e7 tests 2014-07-02 19:38:10 +01:00
Phill Ridout 05f4f2d72e fixed tests 2014-06-30 21:54:11 +01:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt 93c3a57ea9 Add missing files 2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Tomas Groth 44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Samuel Mehrbrodt d61111ab89 Add proper error messages to EasyWorship import.
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt 340857cecc Detect languages in source code folder when running from source
bzr-revno: 2393
2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt 95b816c843 ProPresenter Import
bzr-revno: 2392
2014-06-11 06:08:10 +01:00
Andreas Preikschat 2791b37525 pep fixes 2014-06-10 11:48:42 +02:00
Andreas Preikschat 3235c334eb sorted imports 2014-06-10 11:42:11 +02:00
Andreas Preikschat 837d95ae41 added a test case 2014-06-10 11:39:24 +02:00
Andreas Preikschat 6d0ee83de1 moved tests 2014-06-10 11:24:50 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt b2e4c6f99f Add test for missing songs.mb 2014-06-09 09:55:48 +02:00
Tim Bentley 8d67406728 Fix a validation bug with presentations being loaded from services
Fix range bug stopping service items being triggered unless it was the first!

bzr-revno: 2389
2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt 08e41672cb Better name for test 2014-06-08 16:27:03 +02:00
Samuel Mehrbrodt 5c90d7847e Merge trunk 2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt 007e18945e Various string fixes and other tidying up
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils

bzr-revno: 2388
2014-06-08 16:12:23 +02:00
Tim Bentley 567b3f4b57 Fix up description 2014-06-05 17:32:29 +01:00
Tim Bentley f23e603314 Fix up interface better 2014-06-05 17:25:37 +01:00
Tim Bentley 2e82d92ebc Head 2014-06-04 05:55:28 +01:00
Stewart Becker ed295d38dd Fixed a typo: load_Last_file -> load_last_file
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt a6a43264da Merge trunk 2014-06-03 21:23:21 +02:00
Samuel Mehrbrodt 9f5895dd82 Song duplicates added when using different author types for the same author
bzr-revno: 2386
2014-06-03 17:20:46 +01:00