Commit Graph

14081 Commits

Author SHA1 Message Date
Tomas Groth
611c970eb0 More work on chords 2016-07-25 22:07:07 +02:00
Tomas Groth
530f119938 Various improvements for chords on the mainview. 2016-07-21 22:37:25 +02:00
Tomas Groth
c10f71db3a Started work on chords on maindisplay. 2016-07-20 22:43:46 +02:00
Tomas Groth
138e2deb1f Add support for export and import of chords in openlyrics 2016-06-27 23:16:49 +02:00
Tomas Groth
d92d46e06c Fix a formatting error 2016-06-17 12:05:25 +02:00
Tomas Groth
0c2b68ac54 merge trunk 2016-06-14 23:12:54 +02:00
f052cf99d9 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...

bzr-revno: 2676
2016-06-14 22:07:18 +01:00
f20499b1af Convert htmlbuilder.py to use Template() strings for css
- Changed strings to use Template() instead of format() for css building
- Fix htmlbuilder strings tests
- Cleanup template variables and fix tests to match
- bug 1590386 - string format error in editbibledialog.py
- bug 1590475 - string format error in mediaitem.py
- Function call error in firsttimeform.py (missed label text variable)

--------------------------------
lp:~alisonken1/openlp/strings-templates2 (revision 2679)
[SUCCESS] ...

bzr-revno: 2675
Fixes: https://launchpad.net/bugs/1590386, https://launchpad.net/bugs/1590475
2016-06-14 22:05:51 +01:00
aedcecc7ff String format oops 2016-06-08 19:57:21 -07:00
e222a11390 String format oops 2016-06-08 13:41:21 -07:00
b84dbb15a2 Oops in string format 2016-06-08 13:26:01 -07:00
Tomas Groth
f696698b3e pep8 fixes 2016-06-08 21:58:30 +02:00
Tomas Groth
df82628c01 Fix merge issue 2016-06-08 21:34:29 +02:00
Tomas Groth
2fe7a9d127 trunk 2016-06-08 21:27:52 +02:00
Tomas Groth
805b7a83eb Small fixes 2016-06-08 21:06:04 +02:00
Tomas Groth
fe8aa2a9e3 Make transposing work for lyrics with verse tags. 2016-06-07 22:53:56 +02:00
Tomas Groth
3d98d60d59 Implement chord transposing in the lyrics editor. 2016-06-07 22:21:21 +02:00
Tomas Groth
0ee555cd84 Some code formatting. 2016-06-07 22:13:21 +02:00
828741ec84 Remove testing verbosity flag 2016-06-07 06:21:07 -07:00
5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
Tomas Groth
ca2b466cfd Connected transpose buttons to methods. 2016-06-06 22:18:26 +02:00
2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
Tomas Groth
75e9291603 Added transpose buttons to song lyric editor - not functional yet. 2016-06-05 22:31:23 +02:00
Tomas Groth
82d5c6dcb2 Make chords.js a bit more readable. 2016-06-05 22:30:22 +02:00
ian@knightly.xyz
d690366595 Adds automatic functionality to the max-height for non-text items feature, and sets this as the default value.
Advanced tab spin box replaced with combo box.

Test coverage expanded on other functions in listpreviewwidget and pep8 errors fixed.
Fixed test naming.
Merged with trunk as of 2016-06-02_10:30.

lp:~knightrider0xd/openlp/non-text-item-height-default (revision 2674)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1584/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1...

bzr-revno: 2674
2016-06-05 15:09:57 +01:00
Tomas Groth
e51ffd9759 Removed resizing buttons and reuse the stage.css 2016-06-02 15:54:44 +02:00
Tomas Groth
5f36fcbf39 Added chord settings to the song tab. 2016-06-02 15:53:30 +02:00
Ian Knight
47da0a1c8b Fixed PEP8 Errors 2016-06-02 20:02:34 +09:30
Ian Knight
179bc00fc9 Updated from trunk 2016-06-02 19:57:30 +09:30
0355b6f221 Make all our tests nose2 compatible. They still all work with nose1 (and now a few methods that weren't actually tests don't run).
bzr-revno: 2673
2016-06-02 05:59:13 +01:00
Ian Knight
83e11710f2 fixed test naming issue 2016-06-02 10:45:41 +09:30
ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Ian Knight
3627976132 fixed pep8 error 2016-06-01 13:51:44 +09:30
Ian Knight
7599429065 Merge from trunk 2016-06-01 13:45:43 +09:30
672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
65f108de90 Fix formatting issues. See https://code.launchpad.net/~knightrider0xd/openlp/non-text-item-height-default/+merge/295318/comments/758254
bzr-revno: 2672
2016-05-31 17:43:07 +01:00
5a6c4f90a1 Fix formatting problems 2016-05-31 18:10:31 +02:00
41dcf85cbe "Convert strings to python3 in plugins part 4
- Convert strings in plugins/songusage
- Convert missed string in projector/pjlink1
- Updated projectorpjlink1 test

--------------------------------
lp:~alisonken1/openlp/strings-plugins4 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1578/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1489/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1427/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_F..."

bzr-revno: 2671
2016-05-31 17:36:28 +02:00
1782cd8274 "Convert strings from python2 to python3 in plugins part 3
- Convert strings in plugins/remote
- Convert strings in plugins/songs
- Update projectordb test
- Fix oops in format tag - missed escaping brace(s)

--------------------------------
lp:~alisonken1/openlp/strings-plugins3 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1576/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1425/
[SUCCESS]..."

bzr-revno: 2670
2016-05-31 16:56:23 +02:00
tim.bentley@gmail.com
e841e0fbdc "Fix formatting tags
Move SpellTextEdit as missed
Add working flags API's to registry


lp:~trb143/openlp/may_fixes (revision 2673)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1574/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1485/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1202/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/792/
[SUCCESS] https://ci.o..."

bzr-revno: 2669
2016-05-31 16:03:48 +02:00
Tomas Groth
d9510625eb Started implementing support for multiple notations, for now english, german and neo-latin is supported. 2016-05-28 23:53:49 +02:00
Tomas Groth
13dd532269 Moved chords to a new web view. 2016-05-28 23:11:59 +02:00
c27b676c8c pep8 2016-05-27 22:55:54 -07:00
546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
96333b3f08 Oops in foramt - missed escaping brace(s) 2016-05-27 01:29:31 -07:00
9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth
374e40e242 Only show stage chords controls if enabled in settings. 2016-05-27 08:45:23 +02:00
Tomas Groth
12c2b5e578 Removed leftovers from merge with trunk 2016-05-27 08:41:38 +02:00