Commit Graph

11163 Commits

Author SHA1 Message Date
Philip Ridout
b0c5b4177b mor PEP fixes 2017-05-06 11:51:54 +01:00
Philip Ridout
4e88913aa0 PEP fixes 2017-05-06 11:45:09 +01:00
Philip Ridout
6492ee9624 merge from test_fixes 2017-05-06 11:19:48 +01:00
Philip Ridout
1100cd5a5b Fix segfault with QFormLayout in BibleImportForm\nAlso fix up a failing test 2017-05-06 10:22:34 +01:00
Philip Ridout
902a2161fb fixes 2017-05-05 22:00:59 +01:00
Tomas Groth
d60ea23de6 Try to fix songbeamer chord imports 2017-05-05 20:48:01 +02:00
Tomas Groth
7f64106acb Fix a traceback when serviceitem type isn't set 2017-05-05 20:47:19 +02:00
Tomas Groth
a39240badf Replace songbeamers flatnote representationwith the actual flatnote sign. 2017-05-01 21:16:39 +02:00
Tomas Groth
bdfac76483 improve db cleanup 2017-04-25 21:36:37 +02:00
Tomas Groth
e9e7285b8c remove session instead of close to release file. 2017-04-25 21:18:03 +02:00
Tomas Groth
3b46b8416d Only convert bracket tags to chords on songs when chords are enabled. 2017-04-25 20:46:50 +02:00
Tomas Groth
55f63a0a0f Only convert bracket tags to chords for songs. 2017-04-25 16:41:35 +02:00
Tomas Groth
536a919675 Hide transpose buttons if chords are disabled, and check for invalid chords on verseedit close. 2017-04-20 22:23:17 +02:00
Tomas Groth
d36d576dc9 Added another chord test. 2017-04-18 21:20:36 +02:00
Tomas Groth
5187b7b945 Added some tests and fixed a bug. 2017-04-11 14:44:28 +02:00
Tomas Groth
c97aaab763 Fix an issue with songbeamer import where chords were pushed a line. 2017-04-11 10:43:45 +02:00
Tomas Groth
111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Philip Ridout
fc9ed3bc2c PEP Fixes 2017-04-03 21:32:13 +01:00
Philip Ridout
a3146d7a2c PEP Fixes 2017-04-03 21:28:16 +01:00
Philip Ridout
eee14a654a Tests and added icon 2017-04-02 21:28:55 +01:00
Gary Talent
80c8e5b71f Cleanup EW6 invalid directory messages. 2017-03-31 23:45:12 -05:00
Gary Talent
2cbf1422d1 Fix error message for invalid EasyWorship 6 database directories.
The old one was copied from the EasyWorship 2009 database importer.
2017-03-31 23:41:01 -05:00
Gary Talent
e07693c95f EW6 Importer: Cleanup array cropping. 2017-03-31 23:26:14 -05:00
Philip Ridout
53b210d9cd Changeged 'combined' bible verses and made a seperate 'saved' list 2017-03-31 19:41:38 +01:00
Gary Talent
5a36232c93 Add option to import EasyWorship 6 database from any level in the database directory tree. 2017-03-30 19:53:31 -05:00
Gary Talent
76000b4e26 EW6 Importer: Replace appended string paths with os.path.join. 2017-03-30 15:48:23 -05:00
Gary Talent
3f56ca482e Remove empty lines from EW6 importer methods. 2017-03-30 14:45:38 -05:00
Gary Talent
b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
fc505c2a13 Fix the author_type import properly
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/...

bzr-revno: 2730
2017-03-28 11:43:40 -07:00
4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
815c32b87f Fix a problem with loading Qt's translation files, bug #1676163
Fixes: https://launchpad.net/bugs/1676163
2017-03-27 17:36:54 -07:00
4183f186ce Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

bzr-revno: 2728
2017-03-24 19:33:45 -07:00
84fdab297f Changed to use plain old SQL 2017-03-22 22:31:51 -07:00
a2a51b95dd Various fixes:
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
2017-03-22 21:43:13 -07:00
Tomas Groth
9ae1af72c7 Minor adjustsments + a test. 2017-03-17 22:12:29 +01:00
Tomas Groth
31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01:00
Simon Hanna
172625b193 Make sure songbeamer songs are decoded correctly 2017-03-13 13:16:12 +01:00
324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tim Bentley
c0eb055041 Remove ssl from build 2017-03-04 10:24:53 +00:00
196a6f95f1 Fix bug #1666005 and bug #1668994
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...

bzr-revno: 2725
2017-03-02 17:58:46 +00:00
3bc6fc0b77 Fix bug #1666005 and bug #1668994 2017-03-01 21:34:24 -07:00
f68336a49f Make the settings dialog as small as possible
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
Tomas Groth
dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth
aac10c5d2c more chord polish... 2017-02-23 22:40:22 +01:00
Tomas Groth
9c299af567 More chord fixes. 2017-02-22 22:01:42 +01:00
Tomas Groth
cec3cf5f96 More chord polishing. 2017-02-20 22:22:17 +01:00
Tomas Groth
32794d7e97 Reintroduced span-based chord html for main and stage view. 2017-02-19 22:35:40 +01:00
Philip Ridout
74382d1466 Added tool tip 2017-02-18 20:22:47 +00:00
Philip Ridout
04c719e807 Dont try to display search results if there are none! 2017-02-18 08:21:19 +00:00
Philip Ridout
1d377e42cb Fixed results not showing when using the search button as apposed to search as type! 2017-02-18 08:10:17 +00:00
Philip Ridout
162c178d6e HEAD 2017-02-18 07:23:15 +00:00
Philip Ridout
f00270d38b Fixes 2017-02-18 06:52:56 +00:00
Tomas Groth
7da6d5c686 Small fix for chord printing 2017-02-13 21:53:37 +01:00
Tomas Groth
045e12e6c4 Added support for printing chords. 2017-02-02 22:55:05 +01:00
Tomas Groth
111826dd69 Added better support for rendering formatting tags when using chords. 2017-02-02 21:32:35 +01:00
Tomas Groth
dda37552d1 More chord-table stuff.. 2017-01-29 22:25:52 +01:00
Tomas Groth
c3a953ce1b More work on using tables. 2017-01-28 23:04:16 +01:00
Tomas Groth
02d6a42ac4 fix missing end spaces 2017-01-26 22:14:19 +01:00
Tomas Groth
56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
Tomas Groth
82aa92698e First steps for using tables instead for spans. 2017-01-25 22:08:30 +01:00
046bfe493f Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/hide-projectors (revision 2719)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1894/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1805/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1744/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1480/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1070/
[SUCCESS] https://ci.openlp.io/...

bzr-revno: 2720
2017-01-24 20:59:12 -07:00
Tim Bentley
8486205ee5 head 2017-01-23 19:28:41 +00:00
Tim Bentley
aa3eebfad3 updated translations 2017-01-23 18:25:41 +00:00
32328cfe6a Hide the Projectors manager by default so that it doesn't confuse people 2017-01-22 11:12:41 -07:00
second@tgc.dk
df668fde84 Clean search lyrics for formatting tags. Fixes bug #1655988.
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.

bzr-revno: 2718
2017-01-20 21:42:01 +00:00
suutari.olli@gmail.com
eaacfe0ab8 In this branch:
- Added "Full License" field for Bibles (1623631)
- Added a setting for controlling visibility of "Written by:" (1557579)
- Added placeholder texts for Bible metadata fields
- Re-organized uistrings to alphabetical order

bzr-revno: 2716
2017-01-20 21:57:54 +01:00
Tomas Groth
b12c414732 Clean search lyrics for formatting tags. 2017-01-15 22:12:55 +01:00
Tomas Groth
02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Tomas Groth
706d52ad5d Improve the songbeamer encoding detection. 2017-01-12 22:04:53 +01:00
Tomas Groth
32d3c0038e Handle a few videopsalm quirks 2017-01-12 22:03:06 +01:00
Tim Bentley
ad788f5ee7 Fix up date in about form 2017-01-11 20:03:04 +00:00
Olli Suutari
1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley
a7ff760425 Missed about form 2016-12-31 11:14:00 +00:00
Tim Bentley
74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Olli Suutari
a9520ced68 - Merged trunk on 23.12.16 2016-12-23 22:16:24 +02:00
Tomas Groth
d1bca6d52a trunk 2016-12-23 10:14:22 +01:00
Tim Bentley
0643ecdd10 Remove extra self 2016-12-21 12:46:35 +00:00
Tim Bentley
7323b3797d missed one 2016-12-21 10:20:35 +00:00
Tim Bentley
7bd645bc72 pep8 2016-12-21 10:00:14 +00:00
Tim Bentley
8570fb5e8c Fix tests 2016-12-21 09:41:57 +00:00
Tim Bentley
a368a1d695 Move urg_get_file 2016-12-20 21:59:40 +00:00
Tim Bentley
95e70465de Add files 2016-12-20 21:21:17 +00:00
Tim Bentley
4008ed008f Move url size 2016-12-20 21:20:54 +00:00
Philip Ridout
849bbd2c51 Pep fixes 2016-12-18 18:42:28 +00:00
Philip Ridout
b8404dedf8 misc 2016-12-18 15:38:35 +00:00
Philip Ridout
3f9526caf4 Refactors 2016-12-18 15:33:51 +00:00
Philip Ridout
09227c3bfc Refactors 2016-12-18 15:10:30 +00:00
Philip Ridout
e261d2e1ba Refactors 2016-12-18 15:10:05 +00:00
Philip Ridout
aa6d0d07e3 Refactors 2016-12-18 14:22:05 +00:00
Philip Ridout
2612977c06 Refactors 2016-12-18 13:54:25 +00:00
Philip Ridout
f687f77226 openlp/plugins/bibles/lib/__init__.py 2016-12-18 13:49:34 +00:00
Philip Ridout
46732c1f2c bibleplugin.py 2016-12-18 13:47:48 +00:00
Philip Ridout
f9d01e414a settings.py 2016-12-18 13:35:03 +00:00
Olli Suutari
8eb35e3591 - Changed one pair of " to '
- Changed the code for checking Bible meta exists
- Changed the default value for the new setting to "True"
2016-12-18 08:06:10 +02:00
739f083286 Fix segfault on click on a spinner on macOS
Fix spurious traceback on some platforms or configurations of media players
Make the tab style affect only the media library tabs, not everything else too
Hide the splash screen when the backup dialog shows and when the exception form shows


Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/mac-niggles (revision 2713)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1873/
[SUCCESS] https://ci.openlp.io/job/B...

bzr-revno: 2711
2016-12-17 07:19:15 +00:00
95eb290226 Make the tab style affect only the media library tabs, not everything else too 2016-12-15 22:36:04 +02:00
d7ea8e4386 HEAD 2016-12-15 19:58:23 +02:00
47ab1ce1a7 Hide the splash screen when the backup dialog shows and when the exception form shows 2016-12-15 19:45:46 +02:00
3639785151 Fix bug #1642684 by rather just setting the edit text to a blank string
Fixes: https://launchpad.net/bugs/1642684
2016-12-15 16:11:42 +02:00