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
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
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
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
Tim Bentley
fc5c6561e7
Minor tweeks
2017-05-30 14:55:39 +01:00
Philip Ridout
48ca33092a
PEP
2017-05-26 14:44:28 +01:00
Philip Ridout
78f38780ce
head
2017-05-26 14:30:54 +01:00
Tim Bentley
a775f0ddb8
remove extra file
2017-05-24 21:09:54 +01:00
Tim Bentley
2faf588c99
clean up files
2017-05-24 21:04:48 +01:00
Tim Bentley
7c1fffdf41
clean up pep8
2017-05-24 21:01:46 +01:00
Tim Bentley
3b7852b569
clean up pep8
2017-05-24 20:55:30 +01:00
Tim Bentley
32668193c6
fix up tests
2017-05-24 20:31:48 +01:00
Tim Bentley
6fe9dfeb04
Head
2017-05-23 06:00:42 +01:00
Tim Bentley
b7001116da
start to fix tests
2017-05-23 05:59:35 +01:00
Phill
533bef159a
Add a custom widget for editing and selecting paths. Implemented in OpenLP, with the exception of the import wizards, as I have other plans for refactoring these!
...
lp:~phill-ridout/openlp/path_edit (revision 2737)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2009/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1919/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1235/
[SUCCESS] https://ci.openl ...
bzr-revno: 2742
2017-05-23 05:58:49 +01:00
Philip Ridout
c3677857e8
More all file filters
2017-05-22 20:56:54 +01:00
Gary Talent
549ec886a5
Add support for importing EasyWorship 6 databases
...
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07:00
Philip Ridout
234ba34a5b
Head
2017-05-22 19:27:40 +01:00
Philip Ridout
47b640004e
Added some extra params to the constructor
2017-05-22 19:22:43 +01:00
Philip Ridout
f4227c93b2
Changed the allfiles filter from *.* to *
2017-05-22 17:32:24 +01:00
8ee2c0b549
-- Update test data for Class 2 tests
...
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test
--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci ...
bzr-revno: 2740
2017-05-22 17:26:45 +01:00
2b9b227e3d
-- Add pjlink version 1 old database for testing db upgrade
...
No code changes at this time.
(resubmit was due to trying to add updated test data before tests were updated)
--------------------------------
lp:~alisonken1/openlp/pjlink2-c-resources (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2019/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1929/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1864/
[SUCCESS] https://ci.openlp.io/job/Branch ...
bzr-revno: 2739
2017-05-22 17:26:07 +01:00
Phill
cf4a39732b
Fix the depreciated code, and refactor it.
...
lp:~phill-ridout/openlp/import-depreciations (revision 2736)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2013/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1923/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1859/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1239/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1097/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/226/
[FA...
bzr-revno: 2738
2017-05-22 17:25:44 +01:00
Tim Bentley
cad03b9abd
fix tests
2017-05-21 17:06:40 +01:00
Tim Bentley
7fbeb10207
text fixes
2017-05-21 17:02:02 +01:00
Tim Bentley
0387286a93
fix up import functionality
2017-05-21 16:30:02 +01:00
Tim Bentley
fa89be414c
Clean up theme export
2017-05-21 08:11:36 +01:00
cb5c0f82a3
PJlink class 2 updates C
2017-05-19 22:51:58 -07:00
5c161eb541
Added old pjlink1 database to test resources
2017-05-19 09:22:52 -07:00
81be8f5093
- Added PJLINK_DEFAULT_CODES to pjink1 imports
...
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on
--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...
bzr-revno: 2737
2017-05-17 21:35:43 +01:00
503c6e3f69
Initial PJLink class 2 updates
...
- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO
--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...
bzr-revno: 2736
2017-05-17 21:34:14 +01:00
Tomas Groth
eec5542474
Added support for chords in Chord Pro format (using brackets), with support for chord transposing and 3 different notations.
...
Added support for import of song in ChordPro file format
Added support for importing chords and verseorder from songbeamer.
Add support for export and import of chords in openlyrics
Added support for importing chords from opensong.
Added support for importing chords from videopsalm.
Added support for printing chords.
bzr-revno: 2735
2017-05-17 21:30:47 +01:00
24a6dffd1d
Added test data for upcoming PJLink2 changes. No code changes here.
...
--------------------------------
lp:~alisonken1/openlp/pjlink2-resource-data (revision 2733)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1980/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1890/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1831/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1212/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1077/
[SUCCESS] ht...
bzr-revno: 2734
2017-05-17 21:29:12 +01:00
Tomas Groth
5988f1c56a
Fixed an issue and added a test.
2017-05-17 22:06:45 +02:00
23047ae354
Remove extraneous TODO
2017-05-15 09:32:20 -07:00
Philip Ridout
eedfd0dd34
pep
2017-05-15 11:24:28 +01:00
Philip Ridout
16d2bd96f0
head
2017-05-15 11:15:32 +01:00
Philip Ridout
be9d9c45ff
Reworked the extension_loader function
2017-05-15 11:09:59 +01:00
Philip Ridout
70019b570b
Update and refactor dynamic import code
2017-05-14 11:11:10 +01:00
Philip Ridout
cc705e1958
HEAD
2017-05-14 08:15:29 +01:00
ed144657bc
PJLink class 2 updates 2
2017-05-13 02:00:29 -07:00
Tim Bentley
08a58844c6
fix editing theme load and save
2017-05-13 09:37:38 +01:00
