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

1671 Commits

Author SHA1 Message Date
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
Raoul Snyman 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
Ken Roberts 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
raoul@snyman.info 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
Raoul Snyman 9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00
Raoul Snyman a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Ken Roberts bcbb523375 pep8 2016-01-09 09:46:20 -08:00
Ken Roberts f8d353efcb Rename test method 2016-01-09 09:43:38 -08:00
Ken Roberts 94df2d2d86 Fix test for pjlink ticket 921817 2016-01-09 09:21:20 -08:00
Ken Roberts 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
Raoul Snyman 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
Raoul Snyman 7853706479 Apparently BibleServer.com has removed that Bible. Use another one instead. 2016-01-07 23:38:13 +02:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Ken Roberts 2edb32ac7f pep8 fix 2016-01-03 00:32:43 -08:00
Ken Roberts f0a5e2eddb fix extraneous docstring notes in pjlink1 test 2016-01-03 00:18:58 -08:00
Ken Roberts 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
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
Raoul Snyman 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
Raoul Snyman 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