Samuel Mehrbrodt
af57ef066b
Only save footer template if it has been changed
2017-06-13 10:24:55 +02:00
Samuel Mehrbrodt
33e3bcd1d5
Adjust display of available placeholders to mako syntax
2017-06-13 10:17:05 +02:00
Samuel Mehrbrodt
51e644711d
Remove blank lines
2017-06-12 22:53:08 +02:00
Samuel Mehrbrodt
f5f4226891
PEP8 fixes
2017-06-12 20:09:50 +02:00
Samuel Mehrbrodt
885a1bad01
Merge trunk
2017-06-12 20:04:49 +02:00
Samuel Mehrbrodt
5fbcbb3047
Fix test
2017-06-12 20:04:17 +02:00
Samuel Mehrbrodt
a1e1092b10
Use Mako instead of Pystache
2017-06-12 19:43:24 +02:00
Phill
1c720ff101
I've TODOne some of the TODO's. As well as some other clean ups
...
lp:~phill-ridout/openlp/TODOne (revision 2745)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2077/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1987/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1903/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1281/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1131/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/2 ...
bzr-revno: 2750
2017-06-09 16:55:12 +01:00
Philip Ridout
c0f2a9a777
HEAD
2017-06-09 07:06:49 +01:00
Azaziah
80d30bf272
Fixed bugs:
...
Bug #1639860 : Close button is disabled in numerous windows
Bug #1652559 : Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272 : Linked audio "next" button results in traceback
Bug #1678292 : Space after Bible book name auto-completion is missing
Bug #1694732 : wizard sub title does not wrap
Bug #1695268 : Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...
bzr-revno: 2749
2017-06-08 19:17:14 +01:00
Johannes Thomas Meyer
e37ef1b74b
added SongBook name and Song Number to "Entire Song" Search
...
lp:~samothjtm/openlp/bug-1695587 (revision 2748)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2076/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1986/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1902/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1280/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1130/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/259 ...
bzr-revno: 2748
2017-06-08 10:46:14 -07:00
faea1424d8
-- Added openlp.core.lib.projector.upgrade for db version 1
...
-- Added test class for projector DB upgrade
-- Remove duplicate TEST_DB entry in tests.resources.projector.data
-- Updated TestProjectorDB to use a temporary directory for test db
-- Fix main db update procedure version check (default to version 0 if no version set)
-- Added extra information to projector info popup
-- Restructure valid command dictionary
-- Pep8 in plugins/songusage, plugins/presentations, and core/ui/lib/pathedit....
bzr-revno: 2747
2017-06-08 18:09:55 +01:00
Philip Ridout
e248668d1b
HEAD
2017-06-06 22:20:01 +01:00
Johannes Thomas Meyer
0850351237
implemented fix suggestions
2017-06-05 23:41:29 +02:00
Olli Suutari
48c6810f0c
- Added a test for checking that next calls the next playlist item
2017-06-05 21:22:14 +03:00
Olli Suutari
798f3738b8
Value of old last used Bible search type is no longer transferred to settings since it's invalid and gets replaced on boot anyways.
2017-06-05 09:05:54 +03:00
Olli Suutari
a703294db2
- Fixed over idented line on def closeEvent(self, event):
...
- Added a comment explaing the ' ' in Bible book name auto completion.
2017-06-05 08:53:47 +03:00
Olli Suutari
db86f45bd7
Expanded the test_reference_matched_full to include results with dots after numbers, eg. 1. Kings
2017-06-05 05:58:38 +03:00
Olli Suutari
dae544abc1
Improved the regex to check dot after book number and after book name.
2017-06-05 00:22:13 +03:00
Olli Suutari
dd603f6486
Fixed the issue where books with "." can't be used in reference search.
2017-06-04 23:40:18 +03: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
