Jonathan Springer
f0d528954d
merge trunk
2017-06-04 14:22:58 -04:00
Olli Suutari
8f5b28026a
Renamed another wizzard test + comment.
2017-06-04 18:23:30 +03:00
Olli Suutari
191f9c64d8
Renamed test: def test_on_import_click_no_import_wizzard_attr(self):
...
to: def test_on_import_click_no_import_wizard_attr(self):
2017-06-04 18:22:23 +03:00
Olli Suutari
3918027ff1
- Fixed 2 tests
2017-06-04 18:21:25 +03:00
Olli Suutari
5270b1a716
Fixed the new trailing space added by previous pep fix
2017-06-04 17:46:04 +03:00
Olli Suutari
89856d78b2
two pep8 fixes
2017-06-04 17:30:10 +03:00
Johannes Thomas Meyer
12b540064d
merge trunk
2017-06-04 16:18:14 +02:00
Olli Suutari
d247cf2388
Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732
2017-06-04 17:03:41 +03:00
Samuel Mehrbrodt
ac2f92f8ac
Merge trunk
2017-06-04 15:44:20 +02:00
Samuel Mehrbrodt
f89d7992fa
PEP8 fixes, cleanup, added two more placeholders for footer template, added last_or_penultimate flag in list
2017-06-04 15:42:21 +02:00
Olli Suutari
731ce0c338
Increased the size of the songmaintancedialogue form for better visual user interface.
2017-06-04 16:20:59 +03:00
Samuel Mehrbrodt
21d1311914
corrected placeholder tags in explanation
2017-06-04 15:10:50 +02:00
Johannes Thomas Meyer
eadabee85e
added a placeholder to show the ccli number of a song
2017-06-04 15:10:01 +02:00
Olli Suutari
c135028b46
Fixed bug https://bugs.launchpad.net/openlp/+bug/1666272
...
By renaming: self.playerlist.next() to self.playlist.next()
in maindisplay.py derf next(self)
2017-06-04 15:26:50 +03:00
Olli Suutari
f8b32578f4
Fixed 32 missing "x" buttons for closing windows and forms. (Left it unavailable for bug report.)
2017-06-04 15:14:23 +03:00
Olli Suutari
3ae8caceb0
Added "last search type" to obsolete settings list.
2017-06-04 14:19:19 +03:00
Olli Suutari
c14398b912
Fixed bug: https://bugs.launchpad.net/openlp/+bug/1652559
2017-06-04 13:43:41 +03:00
Olli Suutari
7a27a4adbe
Fixed bug #1678292
2017-06-04 13:13:10 +03:00
Olli Suutari
3e70173be4
Renamed "last search type" to "last used search type"
2017-06-04 12:52:15 +03:00
Phill
8ee5c892ad
Fixed some bible media item tests and one render test. The 02-Functional tests now pass, but we get a seg fault on the interface-tests
...
lp:~phill-ridout/openlp/test-fixes (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2054/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1964/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1888/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1267/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Co ...
bzr-revno: 2746
2017-06-04 08:29:31 +02:00
Johannes Thomas Meyer
0f3d86f0d1
added a placeholder to show the topics of a song
...
- and included the empty-description for lists always
2017-06-04 02:53:33 +02:00
Johannes Thomas Meyer
88642395ee
added a placeholder to show the alternate title of a song
...
Fixes: https://launchpad.net/bugs/1694430
2017-06-04 02:42:41 +02:00
Samuel Mehrbrodt
66c9f8eb82
made use of pystache for footer generation being configurable in song settings
...
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality
Fixes: https://launchpad.net/bugs/1695620
2017-06-04 01:31:47 +02:00
Philip Ridout
114a2a12a8
fixed some seg faults
2017-06-04 00:27:19 +01:00
Philip Ridout
a3d95acabd
and one renderer test
2017-06-03 23:52:11 +01:00
Philip Ridout
34f8f11efd
Bible tests fixed
2017-06-03 23:34:19 +01:00
Johannes Thomas Meyer
e6d4857c81
added SongBook name, Song Number and Alternative Title to Entire Search
...
Fixes: https://launchpad.net/bugs/1695587
2017-06-03 12:44:28 +02:00
9f8433a18e
Merge trunk
2017-06-01 15:36:38 -07:00
0fc49e3df1
Translations and more minor cleanups
2017-06-01 15:35:57 -07:00
Philip Ridout
2915a8f0e7
Head
2017-06-01 07:18:47 +01:00
Philip Ridout
5b4bff29fe
Logging clean ups
2017-05-31 20:29:43 +01:00
699e6f9088
HEAD
2017-05-30 23:20:53 -07:00
80369c8b0b
pylint fixes - minor cleanups
2017-05-30 16:26:37 -07:00
Tomas Groth
81492013ed
Fixed songshowplus encoding issue.
...
Fixed issue where enable-chord settings was not setup correctly for tests.
bzr-revno: 2745
2017-05-30 22:50:26 +02:00
Tim Bentley
21af845791
Finally got round to finishing the Theme clean up from 2,2!
...
Themes now save to JSON and read XML or JSON so fully compatible with 2.4.
Add this to your merge proposal:
--------------------------------
lp:~trb143/openlp/themecleanup (revision 2743)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2036/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1946/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analy ...
bzr-revno: 2744
2017-05-30 22:48:41 +02:00
Phill
392de6bcde
Merged in trunk
...
Adds more flexibility to 'locking' bible verses.
fixes #1625681 "If Bible search results are locked, duplicated results are listed"
lp:~phill-ridout/openlp/saved_bible_verses (revision 2746)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2030/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1940/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1871/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1251/
[SUCCESS] https://ci.openlp.io ...
bzr-revno: 2743
2017-05-30 22:45:16 +02:00
Tomas Groth
1dc0b0a4b5
pep8 fixes
2017-05-30 22:15:20 +02:00
Tomas Groth
ad55a8d254
Fix issue where enable-chord settings was not setup correctly for tests.
2017-05-30 22:06:27 +02:00
Tomas Groth
4a3e4e1ad4
Fix songshowplus encoding issue.
2017-05-30 22:05:18 +02:00
Philip Ridout
8b71ff765c
PEP
2017-05-30 20:54:30 +01:00
Philip Ridout
c0915fa8b6
PEP
2017-05-30 20:51:23 +01:00
Philip Ridout
b2f5f2e9e2
test fixes
2017-05-30 20:40:01 +01:00
Philip Ridout
a4ffbce6c3
HEAD
2017-05-30 19:50:39 +01:00
Philip Ridout
a24d5f8f15
TODO's TODOne, and a few other cleanups
2017-05-30 19:42:35 +01:00
Tim Bentley
fc5c6561e7
Minor tweeks
2017-05-30 14:55:39 +01:00
Jonathan Springer
49a074b95e
Fix systemplayer get_info test
2017-05-29 13:31:56 -04:00
Jonathan Springer
db334bfa11
Update systemplayer update_ui test for changes
2017-05-29 13:30:19 -04:00
Jonathan Springer
238475845f
Fix maindisplay macOS window flags test for changes
2017-05-29 13:26:42 -04:00
Jonathan Springer
9d43c19a03
Fix transparent display on macOS
2017-05-29 12:33:22 -04:00
Jonathan Springer
fdcb8ae0c7
Use media controller methods to pause and play media when hiding, blanking, and unblanking display to keep UI in sync with media state.
2017-05-29 12:31:14 -04:00