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
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
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
Tomas Groth
a61430a59f
Fix the tests on Windows too
2016-01-07 23:57:01 +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
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
c7563a5a64
Add documentation to tests
2016-01-03 00:37:22 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
