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

1321 Commits

Author SHA1 Message Date
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