8fcae33516
resolve merge conflics
2016-01-09 08:59:42 -08:00
second@tgc.dk
45b1ca2870
Disable OpenGL in the maindisplay on windows for now, fixes bug.
...
Fix for easyslide importer and added test.
Made song-importer-list sorted, again.
Small cleanup of videopsalm
Made sundayplus importer work with python3. Added tests.
Fix some tests on windows.
Pep8 fixes
bzr-revno: 2595
Fixes: https://launchpad.net/bugs/1531319
2016-01-09 15:39:48 +01:00
Tomas Groth
e16a1916b7
forgot to remove debug print
2016-01-09 14:53:59 +01:00
Tomas Groth
b0813a5f33
Ops, commited too much
2016-01-09 14:34:16 +01:00
Tomas Groth
e9e845035a
pep8 fixes
2016-01-09 10:09:29 +01:00
Tim Bentley
2be048c51c
Translations
...
bzr-revno: 2594
2016-01-09 06:41:06 +00: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
43e273c4ed
Disable OpenGL in the maindisplay on windows for now.
2016-01-08 22:43:43 +01:00
Tomas Groth
b5270b48a9
Fix for easyslide importer and added test.
2016-01-08 22:42:36 +01:00
Tim Bentley
8a9da23b5c
translations
2016-01-08 21:27:37 +00:00
Tim Bentley
3c23336067
Fix broken remote searchs
...
bzr-revno: 2593
2016-01-08 20:10:06 +00:00
Tomas Groth
211f93a921
Made importer list sorted, again.
2016-01-08 20:53:58 +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
af3fc71d4a
Fix tests. Sadly Windows tests are still broken.
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-tests (revision 2596)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1215/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1141/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1080/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/920/
bzr-revno: 2589
Fixes: https://launchpad.net/bugs/1531872
2016-01-08 17:09:06 +00:00
4fd53706c6
We still need a db_url. Thanks interface tests!
2016-01-08 00:18:01 +02: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
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
11876436a1
Fix deletion of custom slides
2016-01-06 00:58:31 +01:00
Simon Hanna
584a0fda0d
Fix the deletion of songs
...
This was left out when migrating to Qt 5
2016-01-05 23:58:04 +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
Tim Bentley
2bbdf51aca
remove extra string
2016-01-05 18:20:47 +00:00
Tim Bentley
3975901e11
Fix search breakage
2016-01-05 18:19:40 +00:00
Samuel Mehrbrodt
75b885961e
Add test for converting verse order to uppercase
2016-01-05 17:11:30 +01:00
Samuel Mehrbrodt
860f596dde
Only trigger this method by user input
...
Else we will have infinite loop by using setText in that method
2016-01-05 17:10:16 +01:00
Samuel Mehrbrodt
0cd2bbff36
Convert lowercase verse order to uppercase automatically
...
Fixes: https://launchpad.net/bugs/1530354
2016-01-05 16:42:07 +01:00
Samuel Mehrbrodt
c47d1bdca4
Select text in search field when it gains focus
...
Fixes: https://launchpad.net/bugs/1530340
2016-01-05 16:32:49 +01:00
Tim Bentley
4e1470dfd1
head
2016-01-04 17:58:10 +00: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
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
simon.hanna@serve-me.info
339a8e9cd6
Show double verses at the end of songs in stageview.
...
They used to be hidden because the function checked to see if there are enough slides remaining. This is a simple off by one error
bzr-revno: 2587
Fixes: https://launchpad.net/bugs/1510572
2015-12-30 20:39:20 +01:00
Simon Hanna
bf9420a781
Update forms to remove the help button in the statusbar
...
Fixes: https://launchpad.net/bugs/1490184
2015-12-30 16:03:35 +01:00
