Commit Graph

13450 Commits

Author SHA1 Message Date
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
Tim Bentley 3c23336067 Fix broken remote searchs
bzr-revno: 2593
2016-01-08 20:10:06 +00: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
raoul@snyman.info 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
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman 4fd53706c6 We still need a db_url. Thanks interface tests! 2016-01-08 00:18:01 +02: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 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 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
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
Simon Hanna c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +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 4206d11228 Make methods static where possible 2016-01-04 01:18:01 +01:00
Simon Hanna 12f71b3eec Add coveragerc 2016-01-04 01:01:23 +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
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
Simon Hanna 39e48b9fed Show double verses at the end of songs in stageview
Fixes: https://launchpad.net/bugs/1510572
2015-12-30 01:09:11 +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
second@tgc.dk 0d66ccdae4 "Only import vlc in one place. Make it work with PyInstaller.
Added bit-install-hint for VLC
Pep8 fixes

"

bzr-revno: 2583
2015-12-27 23:15:24 +02:00
andreaspreikschat@openlp.org a433e1eb28 The .desktop file was missing a comment. The comment might be displayed (depending on your DE/VW).
bzr-revno: 2582
2015-12-26 23:15:32 +01:00
andreaspreikschat@openlp.org d234d15abe I updated vlc.py from upstream since it last has been update in 2014.
bzr-revno: 2581
2015-12-26 23:13:05 +01:00