Commit Graph

2469 Commits

Author SHA1 Message Date
271a35581c Release 2.4
bzr-revno: 2621
2016-02-13 16:41:12 +02:00
Tim Bentley
ea40173f9b new start 2016-02-13 13:13:00 +00:00
Tomas Groth
e99fe71ca2 Added test 2016-02-12 21:23:18 +01:00
Tomas Groth
510e109ff5 trunk 2016-02-12 20:59:32 +01:00
Tomas Groth
b90dbbc303 pep8 fix 2016-02-12 20:46:04 +01:00
dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Chris Hill
76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
a172183a4e Release 2.3.3
bzr-revno: 2617
2016-02-06 23:12:06 +02:00
second@tgc.dk
8d083af742 More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth
c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
Chris Hill
f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00:00
4a5f77f884 "Fixed a problem with the shortcuts.
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi..."

bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
2016-02-05 22:04:00 +02:00
0802682a13 Fix up some comments 2016-02-05 21:01:21 +02:00
0dd29893da More tests 2016-02-04 23:25:06 +02:00
94edb189e8 Added some tests around the shortcut list form 2016-02-04 23:19:01 +02:00
734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +02:00
s.mehrbrodt@gmail.com
8fbd431bed Fix entering Songbooks with keyboard
Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt
0f1c7bae44 Add test 2016-01-30 15:13:35 +01:00
Tomas Groth
f61ac941d0 Mock FormattingTags in test, instead of loading all tags. 2016-01-23 10:53:34 +01:00
Tomas Groth
c1108b1593 Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field. 2016-01-23 09:19:12 +01:00
Tomas Groth
4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth
e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
Tim Bentley
4a0330f126 Add wrapper for mediainfo 2016-01-22 20:12:46 +00:00
Ian Knight
3900c33083 Corrected pep8 fails 2016-01-19 17:39:09 +10:30
Ian Knight
7f8e19adca Prevented Single Click Preview when a double click had triggered & Updated tests for this 2016-01-19 17:22:23 +10:30
Ian Knight
34c771688c Tests for Better Preview for Service Manager Blueprint 2016-01-18 12:49:20 +10:30
Ian Knight
960fbb8865 Implemented Better Preview for Service Manager Blueprint 2016-01-18 03:16:37 +10:30
f588b82976 Fix up the tests for Windows by retrying deleting the databases.
bzr-revno: 2608
2016-01-15 21:37:53 +01:00
478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00
e1ed3ab163 Use rmtree in the retry mechanism 2016-01-15 20:10:09 +02:00
b11b88f4eb Add a retry mechanism 2016-01-15 19:58:21 +02:00
d7b9e2cbe5 Try deleting the file itself after telling Python to do garbage collection 2016-01-15 19:50:57 +02:00
402917024b Another go at this 2016-01-15 19:11:02 +02:00
11b7bfd22d See if waiting a second helps 2016-01-14 22:31:37 +02:00
9e8fe903a7 attempt to fix some tests in windows 2016-01-14 22:25:58 +02:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth
b1660c0525 Added test 2016-01-13 21:56:55 +01:00
Tim Bentley
31d6f931e5 head 2016-01-11 21:58:21 +00:00
Tim Bentley
3f0025a013 add tests 2016-01-11 21:57:45 +00:00
simon.hanna@serve-me.info
98258bc753 Reenable the stylesheet
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00:00
springermac@gmail.com
e6959992f9 Fix Mac OS X display flags test
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

bzr-revno: 2604
2016-01-11 21:27:11 +01:00
Jonathan Springer
fc2efb7343 Fix Mac OS X display flags test 2016-01-10 22:27:28 -05:00
Jonathan Springer
c07503f5dc Fix import 2016-01-10 17:10:50 -05:00
Jonathan Springer
263a7b2c62 Fix macosx_display_windows_flags_state test 2016-01-10 17:10:05 -05:00
Jonathan Springer
a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna
09faa0cb87 Add a test 2016-01-10 21:06:41 +01:00
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
0e8dc032da Release 2.3.2
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
Simon Hanna
0f1d6718bd Add tests for ignored case 2016-01-10 01:34:53 +01:00
Simon Hanna
70e1f3926b Add test for fix 2016-01-10 01:18:27 +01:00
s.mehrbrodt@gmail.com
ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
2016-01-09 19:53:09 +00:00
5a2c3e5abc Ticket 921817 - exception when connecting using PJLink authentication method
Fix incorrect location data when projector instance created.

Fix typo in getting authenticated connection salt setup.

Move salt/pin/test hash to resources file for multiple tests.

Add test for ticket 921817.

Passes local nosetests3 and pep8.

bzr-revno: 2599
2016-01-09 19:44:30 +00:00
d5856f02c6 [Song select] Stop search on viewing a song.
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...

bzr-revno: 2598
2016-01-09 19:38:10 +00:00
9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00
a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
bcbb523375 pep8 2016-01-09 09:46:20 -08:00
f8d353efcb Rename test method 2016-01-09 09:43:38 -08:00
94df2d2d86 Fix test for pjlink ticket 921817 2016-01-09 09:21:20 -08:00
8fcae33516 resolve merge conflics 2016-01-09 08:59:42 -08:00
simon.hanna@serve-me.info
04e117181d Strip whitespace from title when importing a Songbeamer song.
bzr-revno: 2596
2016-01-09 16:59:25 +00:00
Simon Hanna
0416e29a83 Merge with trunk 2016-01-09 17:50:08 +01:00
Simon Hanna
afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
2785fbaa2d Fix tests 2016-01-09 16:53:49 +01:00
Samuel Mehrbrodt
ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt
fe74a19783 Merge 2016-01-09 16:04:34 +01:00
Tomas Groth
e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna
bf4225838e Fix failing test due to name conflict 2016-01-09 01:15:23 +01:00
Simon Hanna
21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna
8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +01:00
Samuel Mehrbrodt
da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth
a44d70cb0f Fix some tests on windows. 2016-01-08 22:44:22 +01:00
Tomas Groth
b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth
21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth
345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tim Bentley
7fd37c1033 head 2016-01-08 17:44:47 +00:00
s.mehrbrodt@gmail.com
859288f172 Usability improvements
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
2016-01-08 17:28:47 +00:00
simon.hanna@serve-me.info
e8e553b663 Modify all forms to remove the help button from their status bar.
I don't think I missed a form. The Wizards remain untouched as the help button works there

bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
simon.hanna@serve-me.info
a6ef19683d CodecForTr was dropped in Qt5
The deletion of songs still depended on that.

Just a minor edit to drop the dependency

bzr-revno: 2590
2016-01-08 17:24:48 +00:00
Tim Bentley
fd3a85a68c head 2016-01-08 17:09:29 +00:00
Simon Hanna
2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
c4bb673ac0 Remove potentially unnecessary code 2016-01-08 00:00:02 +02:00
Tomas Groth
a61430a59f Fix the tests on Windows too 2016-01-07 23:57:01 +02:00
7853706479 Apparently BibleServer.com has removed that Bible. Use another one instead. 2016-01-07 23:38:13 +02:00
543d6898d3 Fix up the projector interface tests 2016-01-07 23:36:43 +02:00
Tomas Groth
f2cccb90ae Fix projector tests 2016-01-07 23:07:55 +02:00
Simon Hanna
d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna
7ebbf65a86 Add a test 2016-01-07 13:36:11 +01:00
b1febaa452 Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied. 2016-01-06 22:02:39 +02:00
51eefc84d9 Fix OS X test which wasn't being skipped on non-OS X platforms 2016-01-06 22:00:51 +02:00
Simon Hanna
5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Simon Hanna
46301b63f4 Add docstrings to tests 2016-01-05 22:35:35 +01:00
Tim Bentley
8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Samuel Mehrbrodt
75b885961e Add test for converting verse order to uppercase 2016-01-05 17:11:30 +01:00
Samuel Mehrbrodt
5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt
bfdd9e81ab Extend test for multiple songbooks 2016-01-04 20:23:42 +01:00
Samuel Mehrbrodt
ccd8b0625f Fix test 2016-01-04 20:20:21 +01:00
Samuel Mehrbrodt
ecd2c28cc7 Add test 2016-01-04 20:14:00 +01:00
Simon Hanna
7ed23514b4 Add test for about() function of MediaPlugin 2016-01-04 01:28:13 +01:00
Simon Hanna
8121f77e2d Add test for about() function of SongUsagePlugin 2016-01-04 01:27:56 +01:00
Simon Hanna
9459aff90c Add test for webkit_version function 2016-01-03 12:47:07 +01:00
2edb32ac7f pep8 fix 2016-01-03 00:32:43 -08:00
f0a5e2eddb fix extraneous docstring notes in pjlink1 test 2016-01-03 00:18:58 -08:00
a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Simon Hanna
96c99f3e28 Add test to check if title is stripped on Songbeamer import 2016-01-03 01:53:17 +01:00
Simon Hanna
c7563a5a64 Add documentation to tests 2016-01-03 00:37:22 +01:00
Tim Bentley
607371a6d7 Years move on
bzr-revno: 2588
2016-01-02 21:37:40 +00:00
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna
990a8a9502 Add tests for the SongFormat class 2015-12-30 22:36:37 +01:00
ffbf75bb2f Release 2.3.1
bzr-revno: 2586
2015-12-28 22:19:43 +02:00
springermac@gmail.com
b87156e104 "Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused"
bzr-revno: 2585
2015-12-28 22:01:34 +02:00
springermac@gmail.com
160550f836 "Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt.
Display keyboard shortcuts with modifiers in their platform native form."

bzr-revno: 2584
2015-12-28 21:35:15 +02:00
9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Tomas Groth
b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
Jonathan Springer
65b8b12590 Add tests 2015-12-24 14:27:44 -05:00
8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
Jonathan Springer
b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
springermac@gmail.com
d9a02f6ada Migrate to PyQt5
bzr-revno: 2576
2015-12-21 21:27:10 +01:00
Jonathan Springer
bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth
89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth
2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth
037d3f4f7d Added support for author types in tests + some VideoPsalm fixes 2015-12-18 23:24:20 +01:00
Tomas Groth
6eb17b561d trunk 2015-12-18 21:13:21 +01:00
s.mehrbrodt@gmail.com
12141d6a7e Small fixes:
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
  * OpenLP 2.0 -> OpenLP 2
  * Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
  * Improve exception dialog (mention that description should be english and relevant files should be attached)
  * Do not translate the bug report labels
  * Ignore "E402 module level import not at top of file" pep8 errors (added to ...

bzr-revno: 2574
2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt
e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Tomas Groth
6b8178a0b4 Added support of importing VideoPsalm songbooks. 2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt
020864dd26 PEP8 2015-12-17 22:28:36 +01:00
Samuel Mehrbrodt
0ce6804171 Fix pep8 2015-12-17 21:27:08 +01:00
Jonathan Springer
8327346647 merge trunk 2015-12-16 17:25:41 -05:00
Jonathan Springer
445e755895 Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt.
Display keyboard shortcuts with modifiers in their platform native form.
2015-12-16 17:19:50 -05:00
Jonathan Springer
0a935bdb90 merge trunk 2015-12-13 19:21:58 -05:00
springermac@gmail.com
4687d71c50 Fix traceback in mediacontroller if a service item had a processor type of automatic
bzr-revno: 2573
2015-12-13 22:59:45 +01:00
Tomas Groth
44a523631e Only import vlc in one place. Make it work with PyInstaller. 2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt
0d4541b8dc Merge trunk 2015-12-11 09:33:24 +01:00
Jonathan Springer
3108adff17 Add test for failing situation 2015-12-10 12:25:34 -05:00
Jonathan Springer
f241aa663d Add test to reproduce traceback in mediacontroller 2015-12-07 16:31:46 -05:00
Tim Bentley
dcf97bf93b head 2015-12-05 12:45:01 +00:00
Jonathan Springer
6b35a99775 merge trunk 2015-12-01 17:07:00 -05:00
Jonathan Springer
609f5a8512 Fix projector tests 2015-12-01 14:47:46 -05:00
Jonathan Springer
3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Tim Bentley
6a48bb5ac2 Style fixes 2015-11-28 20:13:16 +00:00
Tim Bentley
3a31f86e84 Head 2015-11-28 17:05:06 +00:00
Tim Bentley
64867b52a8 Add tests for Presentations 2015-11-28 17:04:46 +00:00
Tomas Groth
a5525e96c1 Fix projector tests. 2015-11-26 21:44:19 +01:00
Tomas Groth
be222ca597 Fix tests that fails on py35. 2015-11-25 22:47:56 +01:00
Tim Bentley
78078fb2ed catchup late fixes from 2.2.1 2015-11-21 08:31:17 +00:00
Jonathan Springer
d178aa1eec Fix tests 2015-11-20 14:30:46 -05:00
Jonathan Springer
4175b18507 Fix color button test 2015-11-16 23:58:30 -05:00
Tim Bentley
a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley
b4d7798300 fix join in tests 2015-11-08 21:23:15 +00:00
Tim Bentley
97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Jonathan Springer
285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley
0e4847b5fa head 2015-11-02 20:57:48 +00:00
Tomas Groth
f712b35b08 pep8 fixes 2015-10-27 22:36:52 +00:00
Tomas Groth
a8c5f8cb52 Make test windows-only, again. 2015-10-27 15:15:22 +00:00
Tomas Groth
fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth
d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tim Bentley
c61fde2d1f Refactor tests 2015-10-17 19:11:04 +01:00
Tim Bentley
25332a2cb1 Head and 2.2 2015-10-17 12:20:51 +01:00
Tim Bentley
50ceb568e5 Release 2.2
bzr-revno: 2562
2015-10-17 12:18:23 +01:00
Tim Bentley
ff5513f630 add test 2015-10-16 17:33:33 +01:00
Tim Bentley
a5b8827c96 Pep 8 2015-10-16 17:17:38 +01:00
Tim Bentley
58124c01d2 Add advanced 2015-10-16 17:09:35 +01:00
Tim Bentley
9ea1cab296 code fix 2015-10-15 19:21:04 +01:00
Tim Bentley
3bc0dbe4d9 func test pass 2015-10-15 19:15:55 +01:00
Tim Bentley
8be1450eae core_int_test 2015-10-15 19:06:16 +01:00
Tomas Groth
8fd8273209 Added test for bug 1490996. 2015-09-09 14:45:57 +01:00
Tomas Groth
585c319c8b Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fixes: https://launchpad.net/bugs/1489757
2015-08-28 09:50:13 +01:00
Tomas Groth
4488fedfdc Fix SongPro import. Fixes bug 1489376.
Fixes: https://launchpad.net/bugs/1489376
2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt
fc3a5f27c9 Add test 2015-08-26 10:50:38 +02:00
f36a9c29dc Release 2.1.6
bzr-revno: 2550
2015-08-23 21:04:23 +02:00
Tomas Groth
8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth
25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +01:00
Tomas Groth
5444614ced Added songselect login except test 2015-06-24 21:26:52 +01:00
Chris Hill
c95ca007b5 updated unit test 2015-06-20 23:35:22 +01:00
Chris Hill
1e33b7c292 trunk 2015-06-14 22:00:54 +01:00
Chris Hill
ed9146ae06 fixed bug #1000729 'Support more song fields in the search' - added unit tests
Fixes: https://launchpad.net/bugs/1000729
2015-06-14 21:58:56 +01:00
Tomas Groth
fe40cb6eec Use patch decorator for test. 2015-06-13 15:48:57 +01:00
Tomas Groth
33a4e00002 Made test work on windows. 2015-06-11 17:11:16 +02:00
Tomas Groth
a97d30f2e5 Added test. 2015-06-10 22:43:03 +01:00
Tomas Groth
1b332c1580 Fix PDF reader using wrong maindisplay size. 2015-06-10 17:05:29 +02:00
Tim Bentley
39b3b0efbf Release 2.1.5
bzr-revno: 2543
2015-05-31 14:53:04 +01:00
Tim Bentley
b7d0fc8ffc Fix focus and test 2015-05-31 07:40:37 +01:00
bd92e6a7d3 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None
bzr-revno: 2541
2015-05-30 13:11:32 +01:00
8c5a7d27b2 Some tests 2015-05-29 23:01:44 +02:00
Tomas Groth
623a0974a5 For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
 * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
 * Implement workaround for unblanking bug in PowerPoint 2010.
 * Open PowerPoint hidden so the main application window isn't visible.
 * Added support for odp for PowerPoint 2007 and newer.
 * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
 * Minimized the flashing of the PowerPoint presentation window in the taskbar.

bzr-revno: 2539
2015-05-29 17:22:22 +01:00
Jonathan Springer
aa97feb064 Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen.
bzr-revno: 2538
2015-05-28 00:06:22 +02:00
Jonathan Springer
f41dc964c7 Merge tests 2015-05-26 00:52:00 -04:00
Jonathan Springer
79abd9b82e PEP8 fix 2015-05-26 00:33:55 -04:00
Jonathan Springer
0a8d1906ce Fix patch in tests 2015-05-26 00:27:43 -04:00
Jonathan Springer
a880d152ec Add tests for window flags change 2015-05-25 17:41:18 -04:00
Tomas Groth
a5cebb73c4 trunk 2015-05-25 21:58:05 +01:00
Tim Bentley
f704cc9bb3 Pep8 2015-05-25 21:09:18 +01:00
Tim Bentley
1cfd33df30 Fix Jenkins, tests and spellings 2015-05-25 21:03:31 +01:00
Tim Bentley
54dbafed8e Fix issue with android where tagging is wrong is the render takes too long 2015-05-25 20:31:12 +01:00
Tomas Groth
4266d9cbdf For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
Fixes: https://launchpad.net/bugs/1458056
2015-05-25 12:11:04 +01:00
d354bcf365 Test that the overridden method does the right thing 2015-05-17 23:13:05 +02:00
6d8882d302 Fix up some tests to dodge Windows 2015-05-07 23:53:19 +02:00
2860d3edeb HEAD 2015-05-07 23:29:43 +02:00
167fd6cf45 Play tests pretty much done 2015-05-07 18:44:55 +02:00
08639493ee Initial stab at a test around the play() method 2015-05-05 21:47:38 +02:00
Tomas Groth
51b37de551 Fix a powerpoint test and make it run on all platforms. 2015-05-05 15:20:24 +02:00
4bd385b902 WIP: play test 2015-05-03 00:17:33 +02:00
4ae8250f77 Update UI tests 2015-05-02 23:15:50 +02:00
822912e0a6 load tests 2015-05-02 22:36:07 +02:00
Tomas Groth
a7a71237c0 Added tests of powerpoint blanking. 2015-05-01 21:54:05 +01:00
35d722f872 WIP: load tests 2015-05-01 22:00:52 +02:00
fea79cf7dc Add a test for get_info() 2015-05-01 17:56:16 +02:00
6126546977 Add tests around set_visible 2015-05-01 17:15:14 +02:00
f5301cc9f2 Add a test around reset 2015-05-01 17:09:32 +02:00
f5b883d40b Add tests around seeking 2015-05-01 17:05:42 +02:00
9232e75582 Add tests around pausing 2015-05-01 15:05:38 +02:00
dd9e12d2b5 Fixed an interface test, added some more VLC tests 2015-04-30 23:14:23 +02:00
Tomas Groth
335d8d2d17 pep8 fix 2015-04-29 09:20:25 +02:00
Tomas Groth
cc5aba2008 Fix vlc test 2015-04-29 09:13:01 +02:00
54ce226ad8 Add tests for stop(), resize(), check_available() and volume() 2015-04-28 22:27:55 +02:00
d09c5acd0a Silence a Phonon warning by providing an application name in the tests. 2015-04-28 20:20:03 +02:00
64695b9c33 Strip out unnecessary asserts 2015-04-28 16:06:36 +02:00
fda7ab562c Add some tests 2015-04-28 16:01:09 +02:00
2a1778c878 Add a test for the constructor 2015-04-28 01:04:16 +02:00
b1237b6b6a Add 2.1.4 to the list of allowed tags. 2015-04-27 23:18:03 +02:00
07b7d9b6a9 Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out.
bzr-revno: 2533
2015-04-27 17:02:16 +01:00
f638418b7b Fix the tests on OS X to remove the plugin path and the module when re-running the tests 2015-04-27 11:33:29 +02:00
1ad2578065 WIP: Add another test to check that both tests are working properly 2015-04-27 11:12:28 +02:00
1387bfc838 Fixed up the test 2015-04-25 21:29:39 +02:00
ab54b04468 Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path 2015-04-25 16:32:09 +02:00
Jonathan Springer
8e0fc05b82 Inital stab at test 2015-04-25 10:06:32 -04:00
Tomas Groth
ae785815c8 Fix test on windows. 2015-04-22 22:05:46 +01:00
Tomas Groth
cbeece7375 Added test for on_delete_click in the image plugin. 2015-04-22 21:57:33 +01:00
Tomas Groth
67ecf9b901 Take focus back if Powerpoint steals it - fixes bug 1423913.
Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847.
Made OpenLP respect hidden slides. Improved logging in case of errors.
For Impress, go to previous effect instead of the previous slide.

bzr-revno: 2527
Fixes: https://launchpad.net/bugs/1423913, https://launchpad.net/bugs/1194847
2015-04-03 20:36:02 +02:00
Tomas Groth
cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671.
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
2015-04-03 20:31:19 +02:00
Tomas Groth
335c804e8f Fix support for special characters in theme names. Fixes bug 1438563.
Fixes: https://launchpad.net/bugs/1438563
2015-04-02 10:04:56 +01:00
Tomas Groth
d5804567b5 Added test + some cleaning 2015-04-02 09:33:46 +01:00
02128c85f0 Fix bug #1437771: Clear the song after every import
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
2015-03-31 22:58:51 +02:00
Tomas Groth
3f8a7975ee Test fix 2015-03-30 15:31:41 +02:00
Tomas Groth
f8084059ba Added test + small fixes. 2015-03-18 22:04:30 +00:00
cecde62157 Fix bug #1411433 by moving some stuff around.
bzr-revno: 2522
2015-03-11 18:47:29 +00:00
Tomas Groth
8fe254e576 Added test 2015-03-10 23:46:37 +00:00
3c130cf201 Fix bug #1411433 by rearranging methods within the media plugin
Fixes: https://launchpad.net/bugs/1411433
2015-03-10 23:33:35 +02:00
Tomas Groth
aefe3e9cad trunk 2015-03-09 20:42:28 +00:00
Tomas Groth
512df1451d Use the language id when importing bibles. And fixed presentationcontroller tests. 2015-03-09 20:42:03 +00:00
54c23cc7bd Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click
Fixes: https://launchpad.net/bugs/1419300
2015-03-07 00:18:51 +02:00
88ceae517a Fix code analysis 2015-03-02 21:21:41 +02:00
Tim Bentley
5cf4e79489 Fix invalid log_exception
bzr-revno: 2517
2015-02-28 18:59:59 +00:00
Oliver Wieland
408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
2015-02-28 20:46:31 +02:00
Tim Bentley
1d82bc534c Add tests 2015-02-28 09:41:06 +00:00
3131c3f7c8 Some CCLI import fixes, a quitting dialog in one case, and empty lyrics in another.
Fix bug #1412216 where a song from CCLI without lyrics would cause a traceback - now just tell the user.
Fix bug #1423699 so that you're not logged out when you want to import more songs.

bzr-revno: 2515
2015-02-28 06:47:35 +00:00
e14c03166d Minor style fixes 2015-02-28 01:02:19 +02:00
f843e5a8a0 HEAD 2015-02-28 00:30:47 +02:00
7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs.
Fixes: https://launchpad.net/bugs/1423699
2015-02-28 00:28:24 +02:00
Oliver Wieland
6aff21c784 Changed test descrition 2015-02-27 20:33:49 +01:00
Tomas Groth
e6f93904f7 trunk 2015-02-26 21:10:35 +00:00
Tomas Groth
4fb55448f8 Fixes for code and tests. 2015-02-26 20:58:54 +00:00
Oliver Wieland
07c997817d added test 2015-02-23 19:30:45 +01:00
4847efdfd6 Release 2.1.3
bzr-revno: 2513
2015-02-21 22:05:25 +02:00
85b8cb2c50 Fix bug 1422683: Added exception checks to get_web_page() to help with changed description. Rearrange calls so thumbnail downloads don't hang other event threads. Reraise exception when retries > CONNECTION_RETRIES.
bzr-revno: 2512
Fixes: https://launchpad.net/bugs/1422683
2015-02-21 21:11:25 +02:00
Tomas Groth
66b898f2c3 Don't try to play media if no players are available. Fixes bug 1422761.
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.

bzr-revno: 2510
Fixes: https://launchpad.net/bugs/1422761, https://launchpad.net/bugs/1423956
2015-02-21 21:03:59 +02:00
Phill Ridout
a6fed0a3e5 HEAD 2015-02-21 13:10:28 +00:00
Phill Ridout
4b52fde1da Fixes possible bug and adds test 2015-02-21 13:08:56 +00:00
Tomas Groth
df9594e11d trunk 2015-02-21 12:45:44 +00:00
3a2cd7472b Fix duplicate test names in songselect test
bzr-revno: 2507
2015-02-21 12:43:09 +00:00
Phill Ridout
79204ea723 PEP fix 2015-02-19 22:04:54 +00:00
Phill Ridout
a255faa95b HEAD 2015-02-19 21:53:21 +00:00
Tomas Groth
dde3684cf0 Added test 2015-02-19 20:53:42 +00:00
Phill Ridout
75c9391d8e Tests 2015-02-19 18:57:05 +00:00
e0c44c4b9f Rename test to match file import type 2015-02-18 14:39:02 -08:00
872d5b9d26 Fix duplicate test names 2015-02-18 14:04:29 -08:00
Tomas Groth
52f3695334 Initial support for fetching list of web bibles. Not used yet. 2015-02-17 22:58:29 +00:00
80055b7ec0 Fix ftw socket.timeout bug 1422683 2015-02-17 13:27:51 -08:00
Tim Bentley
870b69b497 Remove cache for http authentication
bzr-revno: 2503
2015-02-17 19:49:16 +00:00
Tomas Groth
1b2b1c74cc Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197.
If no copyright info is given for bible, don't print it. Fixes bug 1420785.
Make csv-bible import work with python3. Fixes bug 1421136.
Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.

bzr-revno: 2502
2015-02-17 18:50:10 +00:00
Philip Ridout
f7cb420a31 Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog.
Also added a ValidationError exception class, to tidy up the unzip code slightly

bzr-revno: 2501
2015-02-17 05:51:24 +00:00
Philip Ridout
16758d1b80 Fixes bug1073931 "Corrupted databases stop OpenLP from starting"
Checks if the database session is available before trying to use it.
Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256

bzr-revno: 2500
2015-02-17 05:47:19 +00:00
Tomas Groth
0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tim Bentley
57efed63a3 fix comments 2015-02-16 20:56:39 +00:00
Tomas Groth
aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888.
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tim Bentley
58f10d3b6b Fix cache for http authentication 2015-02-14 09:12:35 +00:00
Phill Ridout
2eb58a56bd PEP fixes 2015-02-13 23:21:57 +00:00
Phill Ridout
498d17b000 Added tests 2015-02-13 23:10:16 +00:00
Tomas Groth
81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Phill Ridout
3e697dc213 HEAD 2015-02-13 20:41:54 +00:00
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
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
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
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
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
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
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
ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
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
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
00455847a7 HEAD 2014-10-28 22:27:09 +02:00
743dc59d51 [fix 1386710] Fix traceback after settings form is saved
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
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
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
3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
76f4b6e3ad Forgot to add test file 2014-10-22 22:44:05 +02:00
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
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
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
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
a670724ebe Fix tags test to work with cross repo flags
bzr-revno: 2401
2014-07-13 21:56:02 +01:00
563fb794b5 Added an explanatory comment 2014-07-13 21:21:50 +02:00
63350ab6eb Try to ignore the 2.0.x line of tags 2014-07-13 15:10:58 +02:00
ba9ff89354 [fix] PEP8 error: no whitespace 2014-07-13 13:04:37 +02:00
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
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
b4be73b616 Fix bzr tags test 2014-06-26 11:21:46 +02:00
Samuel Mehrbrodt
c638834023 Add missing files 2014-06-26 09:59:16 +02: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
Tomas Groth
346c9e475a updated test 2014-06-15 21:33:05 +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
Tomas Groth
d832933110 Small fix for locating mudraw on windows and mac.
Enabled presentation plugin on mac and adjusted test accordingly.

bzr-revno: 2390
2014-06-08 21:25:32 +01: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
Tim Bentley
7bea1ea7de fix pep 2014-05-31 21:10:59 +01:00
Tim Bentley
983db7b0f0 fix pep 2014-05-31 21:07:46 +01:00
Tim Bentley
82f97ee736 Fix suffix error in presentation 2014-05-31 21:00:10 +01:00
Tomas Groth
13cc26f26a Support for importing Zefania bible XML format
bzr-revno: 2385
2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt
50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly.
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt
0441f0e71b Better description 2014-05-30 19:59:11 +02:00
Tomas Groth
d424270b7f Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac. 2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt
873f18ad65 Add test 2014-05-22 15:48:57 +02:00
Samuel Mehrbrodt
dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Tomas Groth
d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt
854149408f Add test 2014-05-21 17:31:25 +02:00
Samuel Mehrbrodt
5cd2f7ebff Remove tests 2014-05-21 17:31:02 +02:00
Samuel Mehrbrodt
4fadbef196 PEP8 2014-05-21 17:22:13 +02:00
Samuel Mehrbrodt
2462fcf06e Remove test 2014-05-21 17:18:04 +02:00
Samuel Mehrbrodt
d1814f05de Add test 2014-05-21 17:17:08 +02:00
Tomas Groth
7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Tomas Groth
c0b167ca78 Added tests for import of OpenSong bible format 2014-05-21 11:30:36 +02:00
Tomas Groth
4039cf1103 More tests 2014-05-20 23:54:18 +02:00
Tomas Groth
58179f8d83 Tests 2014-05-20 20:41:07 +02:00
Tomas Groth
37f04c5199 Added simple tests. 2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt
d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt
a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt
1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt
35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt
97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt
b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt
a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt
6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Jonathan Springer
1cd9fff9bd Change how we define which menu items are included in the main menu on Mac OS
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified

bzr-revno: 2382
2014-05-11 05:45:30 +01:00
Tim Bentley
ec7a7b74fe test 2014-05-10 08:38:38 +01:00
Samuel Mehrbrodt
9dd9f21135 Add an option to display the songbook in the footer
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt
8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth
45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Jonathan Springer
13b9a7de72 Add test for the main window function set_service_modified 2014-05-08 10:57:26 -04:00
Jonathan Springer
6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Tim Bentley
c6d6be30c6 fix 2014-05-07 21:38:34 +01:00
Tim Bentley
dbf2330896 head 2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt
9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt
f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Stefan Strasser
fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Tim Bentley
1e6f00c2eb Add test 2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt
cca1ce57f3 Add test 2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt
3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt
ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth
c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Tim Bentley
f21d3cfa83 fix tests 2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt
37653bfd13 Add missing tag to test 2014-05-03 17:34:13 +02:00
Samuel Mehrbrodt
f60379b542 Add new test 2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt
b02fc541a3 Reorganize tests 2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt
922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt
a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Samuel Mehrbrodt
e8c7547ab2 Try to get ccli number even if there is text in the field 2014-05-03 10:47:31 +02:00
Tomas Groth
689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth
5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt
b993af2e90 No newline at end of file... 2014-05-02 10:04:11 +02:00
Andreas Preikschat
deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat
2ba7fa4f44 head 2014-05-01 18:58:32 +02:00
Andreas Preikschat
3f75a913e2 removed not working tests 2014-05-01 18:57:45 +02:00
Samuel Mehrbrodt
bdf3109aaa Fix SongShowPlus Import for certain cases
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker
eb64c136d0 Deal with empty ccli tag in OpenSong imports 2014-04-30 21:50:57 +01:00
Stewart Becker
a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Stewart Becker
4022cff5e5 Fix some issues I ran into when importing our OpenSong 'database' 2014-04-30 21:39:40 +01:00
Andreas Preikschat
0160c583e9 Fix Renderer broken when two option breaks next to each other
bzr-revno: 2374
2014-04-29 17:57:07 +01:00
Andreas Preikschat
ff1bc31bfc - Fixed bug #1240037
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts

bzr-revno: 2373
2014-04-29 17:55:30 +01:00
Tomas Groth
cc0f0e1eb0 Support for importing ews files (EasyWorship Service files)
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Andreas Preikschat
b73d8b088c head 2014-04-29 13:04:32 +02:00
Tomas Groth
48fe8c5e37 Restructured the tests a bit. 2014-04-26 21:47:11 +02:00
Andreas Preikschat
911864a442 removed useless code 2014-04-26 19:31:59 +02:00
Andreas Preikschat
53c584ede4 removed print 2014-04-26 11:26:20 +02:00
Andreas Preikschat
533710fc5b blank line 2014-04-26 11:02:04 +02:00
Andreas Preikschat
6bdadff334 raise exception when item not in list 2014-04-26 11:01:12 +02:00
Andreas Preikschat
aa899bfde0 fixes 2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt
20f748d608 Allow authors to be tagged by their type (words music etc)
bzr-revno: 2371
2014-04-26 09:42:26 +01:00
Tim Bentley
9e8f0d82de Add icons to see the state of the remote (on / SSL / authentication)
Stop restarting the server as this crashes it and should not be common.

bzr-revno: 2370
2014-04-26 09:38:44 +01:00
Andreas Preikschat
5a2793bc50 head 2014-04-26 10:19:12 +02:00
Stefan Strasser
c2d1589dcb fixed a pep-issue in songs-lib and corrected a comment in a test 2014-04-26 07:07:08 +02:00
Stefan Strasser
1cd7d73d10 fixed bug #1312629 Error on entering invalid character in verse-order
Fixes: https://launchpad.net/bugs/1312629
2014-04-25 22:04:43 +02:00
Tomas Groth
bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Stewart Becker
04d5a40542 Fix PEP8 issues 2014-04-22 22:48:48 +01:00
Stewart Becker
6d63a008f0 Merged in from trunk 2014-04-22 22:46:21 +01:00
Stewart Becker
d39e1fd4a2 Added comments to OepnSong files and stricter line-break tests 2014-04-22 22:43:12 +01:00
Tomas Groth
074ab4b1bb Head 2014-04-22 22:18:58 +02:00
Tomas Groth
7980231273 Skip tests on windows. 2014-04-22 22:13:36 +02:00
Andreas Preikschat
5a3aecf997 fixed bugs in class 2014-04-22 17:06:21 +02:00
Andreas Preikschat
1ae7c32adb fixed import 2014-04-22 12:32:02 +02:00
Andreas Preikschat
70bce87434 head 2014-04-22 12:30:43 +02:00
Andreas Preikschat
6c08a80bfd added test; refactor 2014-04-22 12:29:15 +02:00
Stewart Becker
7deeefafb4 Remove call used only for debugging 2014-04-21 19:52:42 +01:00
Stewart Becker
9a05c7603a Fixed apostrophe format 2014-04-21 19:42:54 +01:00
Stewart Becker
3e1ed273be Show calls to add_verse for debugging 2014-04-21 19:20:06 +01:00
Stewart Becker
57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +01:00
Stewart Becker
e6162e033f Add tests for OpenSongImport, and fixes so that they pass 2014-04-21 16:49:41 +01:00
Jonathan Springer
05171453ea merge trunk 2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt
cc0af8845e PEP8 2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt
031868ae31 trunk 2014-04-21 11:49:17 +02:00
dee8ed2850 Fix an exception raised when loading media players if the configuration is blank 2014-04-21 00:23:26 +02:00
Andreas Preikschat
328b25dbe8 fix: Bug #1146964 Attach button on exception form does not work
bzr-revno: 2368
2014-04-20 22:51:11 +02:00
Jonathan Springer
c8d0efe2ea merge trunk 2014-04-20 16:19:41 -04:00
Tim Bentley
f7ba5ee0e3 head 2014-04-20 21:19:21 +01:00
Samuel Mehrbrodt
cec163085c Fix bug 1247493: OpenSong Importer fails
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
2014-04-20 21:15:21 +01:00
Tomas Groth
4560d39ad9 head 2014-04-20 20:33:55 +02:00
Tomas Groth
a999e59a4f Fixes for merge 2014-04-20 16:36:56 +02:00
Samuel Mehrbrodt
4253cd4f52 Fix Songbook search
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
2014-04-20 16:32:28 +02:00
Andreas Preikschat
79d3e95c32 pep8 fixes 2014-04-20 16:13:09 +02:00
Andreas Preikschat
85c2179102 added test 2014-04-20 16:03:07 +02:00
Tomas Groth
f6231e024a Head 2014-04-20 15:57:12 +02:00
Andreas Preikschat
c691fc55d0 added a test 2014-04-20 15:00:14 +02:00
Tim Bentley
a2c99317c6 fixes 2014-04-19 06:42:45 +01:00
Tim Bentley
f48a3346db fixes 2014-04-19 06:29:00 +01:00
Tim Bentley
af792941af pep8 again 2014-04-19 06:13:46 +01:00
Tim Bentley
5dc35112c3 pep8 again 2014-04-19 06:09:54 +01:00
Samuel Mehrbrodt
9460b39a01 Remove utf8 file 2014-04-17 17:00:28 +02:00
Samuel Mehrbrodt
d3443d12c2 Remove one test for now 2014-04-17 16:32:56 +02:00
Jonathan Springer
ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Samuel Mehrbrodt
5f86811f82 Fix tests 2014-04-16 23:01:57 +02:00
Jonathan Springer
b6e0aa6c2e PEP8 clean up in tests 2014-04-16 16:44:22 -04:00
Samuel Mehrbrodt
9010e05430 add new openlyrics file 2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt
2c6da0603b Fix tests 2014-04-16 22:33:06 +02:00
Jonathan Springer
f7a23737f2 merge trunk 2014-04-16 16:26:24 -04:00
Samuel Mehrbrodt
dd4e2c8d61 More PEP8 2014-04-16 21:59:34 +02:00
Samuel Mehrbrodt
bb1af7ed00 PEP8 2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt
aa5a86fba9 Trunk 2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt
d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
bzr-revno: 2365
2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt
5929b02586 Test: Songbeamer Authors import 2014-04-16 10:25:17 +02:00
Jonathan Springer
cebec89556 merge trunk 2014-04-16 04:00:19 -04:00
Jonathan Springer
ebc4476fdd Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt
c20939215a PDF Fixes
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt
49773de4f6 Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Andreas Preikschat
cb29c78bb0 Print repository name and revision number when using script (especially the revno is interesting for devs)
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names

bzr-revno: 2361
2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt
be4a654298 More tests 2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt
30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt
cd06c994d8 fixed: replacing background with video unblank screen even if it blanked to theme
bzr-revno: 2360
2014-04-15 23:00:41 +02:00
Jonathan Springer
90ddde07d4 Fix bzr tag test to handle being run from a different directory
bzr-revno: 2359
2014-04-15 22:55:21 +02:00
Samuel Mehrbrodt
5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt
e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser
db955cbf96 Some enhancements for songbeamer-import
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Jonathan Springer
721bcc20e2 Reorder imports 2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt
8c18659adb Update verse order when verse names change (OpenLyrics Import)
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Andreas Preikschat
dbd6d74c8d removed not wanted code 2014-04-15 22:30:20 +02:00
Andreas Preikschat
5090a014ae use self.assert and friends 2014-04-15 22:27:32 +02:00
Jonathan Springer
87e1c5d986 Add tests for First Time Wizards web config file 2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt
71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt
4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt
ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Stefan Strasser
5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Jonathan Springer
6c86c9768d Fix typo 2014-04-14 16:01:13 -04:00
Samuel Mehrbrodt
e7af43af4a Trunk 2014-04-14 21:46:02 +02:00
Jonathan Springer
97ecc3442f Fix bzt tag test to handle being run from a different directory 2014-04-14 15:45:41 -04:00
Samuel Mehrbrodt
e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat
0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Andreas Preikschat
8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat
2c8d163b09 fixed assertion message 2014-04-14 20:59:28 +02:00
Andreas Preikschat
877fd135d3 head 2014-04-14 20:53:33 +02:00
Stefan Strasser
4a4f8c060b Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias) 2014-04-14 20:33:34 +02:00
ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox.
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
2014-04-14 19:28:04 +01:00
Jonathan Springer
861f7a8722 Add test to check for proper tags on the current branch.
bzr-revno: 2353
2014-04-14 19:20:48 +01:00
Stefan Strasser
0293815135 Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur 2014-04-13 19:08:38 +02:00
Samuel Mehrbrodt
758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt
e0a85a668b Leading whitespace 2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt
f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat
4f38ae2809 head 2014-04-13 09:36:42 +02:00
Dmitriy Marmyshev
3cf9094e5f Added ability to rename items in ServiceManager.
bzr-revno: 2352
2014-04-12 23:26:09 +02:00
b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
672eed037c HEAD 2014-04-12 21:48:15 +02:00
Andreas Preikschat
487f4279dd fixed blank line 2014-04-12 19:11:32 +02:00
Andreas Preikschat
321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Andreas Preikschat
2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer
991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer
4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat
d16d8066ad - updated vlc.py
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer
307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt
93cd8269f8 Test case 2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt
9da5d290cb Typo 2014-04-10 18:18:25 +02:00
Samuel Mehrbrodt
32f6005c98 Test for OpenLyrics Importer 2014-04-10 09:50:30 +02:00
Tomas Groth
f16a781309 Changed the clipselector gui a bit. 2014-04-09 22:24:19 +02:00
Samuel Mehrbrodt
ed250c400d Test 2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt
31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt
11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt
bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer
25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt
e0c6381762 Fix test 2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt
5b3a58d1d6 Add newline 2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt
129f726d4c Rename method 2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt
791fdba019 Fix test 2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt
1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt
1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt
2b8586bf99 Test 2014-04-08 13:19:12 +02:00
Samuel Mehrbrodt
b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Tomas Groth
aefef04d97 Small fixes. Added checks of start/end times. 2014-04-07 23:08:48 +02:00
Jonathan Springer
d3526c6204 Simplify code per Andreas Preikschat's comment. 2014-04-07 13:22:12 -04:00
Samuel Mehrbrodt
d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer
e19ab7a2c3 Merge trunk 2014-04-06 22:48:24 -04:00
Jonathan Springer
c751a208f9 Change back to using a white list. 2014-04-06 22:47:41 -04:00
Tomas Groth
bc2d45fc30 Head 2014-04-05 15:27:53 +02:00
Tomas Groth
43f18ee2c9 Added some tests. 2014-04-05 09:46:35 +02:00
Tomas Groth
7dc1b8b759 PEP8 fixes 2014-04-05 09:22:24 +02:00
Tomas Groth
648e0b2290 head 2014-04-05 09:06:30 +02:00
8b2c2f9eef fixed a test 2014-04-04 23:12:44 +02:00
5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tomas Groth
232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
d1b867988d missed the test somehow 2014-04-04 22:25:49 +02:00
Tim Bentley
8813490bad fix tests 2014-04-04 21:24:11 +01:00
Tim Bentley
edb38d1255 head 2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f Fixed wrong dll load path.
bzr-revno: 2347
2014-04-04 21:22:12 +01:00
Tomas Groth
7be9613bf0 Head 2014-04-04 19:57:28 +02:00
Tomas Groth
5c405050f1 Added test for ews import. 2014-04-04 19:57:03 +02:00
Tomas Groth
7ef62293f3 Added test 2014-04-03 22:22:10 +02:00
Tim Bentley
151f1017c5 finished 2014-04-02 20:35:09 +01:00
Tim Bentley
806ce25296 head 2014-04-02 19:51:36 +01:00
Tim Bentley
c38c576f94 test fixes 2014-04-02 19:51:21 +01:00
Andreas Preikschat
2a9c85c2a2 fixed a spelling mistake
bzr-revno: 2346
2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt
eece90b2ec Merge trunk 2014-04-02 09:04:27 +02:00
73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Andreas Preikschat
5bc5678078 - added a script to trigger jenkins
bzr-revno: 2345
2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt
a7dc47e80f Test 2014-03-31 21:07:54 +02:00
Andreas Preikschat
c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat
5f0b40fe30 Moved script 2014-03-31 18:27:26 +02:00
Andreas Preikschat
13c053bc5c added jenkins script 2014-03-31 18:08:42 +02:00
Andreas Preikschat
08835e80f8 merged from lp:~googol/openlp/vlc 2014-03-31 18:05:37 +02:00
Andreas Preikschat
729edf1d21 pep8 failure test 2014-03-31 17:44:18 +02:00
Andreas Preikschat
4da90f0c6a comments: updated comments 2014-03-31 17:36:11 +02:00
Andreas Preikschat
3260de7b7c added another test 2014-03-31 17:31:05 +02:00
Andreas Preikschat
9dd5f30254 be a bit more talky 2014-03-31 17:24:31 +02:00
Andreas Preikschat
3f038ad5c5 break 2014-03-31 17:21:41 +02:00
Andreas Preikschat
b391072e9f removed test code 2014-03-31 17:20:17 +02:00
Andreas Preikschat
d77c6fe7c0 added renderer test case 2014-03-31 17:17:40 +02:00
Andreas Preikschat
c64723371a test of ci script 2014-03-31 16:47:43 +02:00
Andreas Preikschat
5a02ab9471 test: splash screen test 2014-03-31 16:07:05 +02:00
Andreas Preikschat
b69f480dc0 head 2014-03-31 14:19:33 +02:00
Tomas Groth
73304d7ec3 Added check to see if given path exists. 2014-03-30 21:32:41 +02:00