Commit Graph

11163 Commits

Author SHA1 Message Date
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
4a222d1310 HEAD 2016-12-13 08:41:59 +02:00
97dfafba4e Make the tabs in the media library prettier 2016-12-13 08:04:27 +02:00
19a00b44e0 Update the version number to 2.5.0 just for any dev builds that might happen 2016-12-13 00:16:23 +02:00
79934596ac Fix the problem with the Library/Media Manager icons not showing up. 2016-12-13 00:14:45 +02:00
d2e2985229 Add an importer for WordProject bibles, and fix some annoying GUI quirks in wizards.
http://forums.openlp.org/discussion/3340/wordproject-format

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/wordproject-importer (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1848/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1759/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1697/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2708
2016-12-04 07:53:18 +00:00
Olli Suutari
8ae1c1f276 - Removed 1 "å" that had slipped in to the code. 2016-12-04 05:21:56 +02:00
Olli Suutari
01029c8d65 - Added a test for checking hidden "Written by" text. 2016-12-04 05:08:56 +02:00
Olli Suutari
f45ee8ac17 - Turned the one try statement into multiple so the existing data could be loaded if some fields were missing. 2016-12-04 01:19:08 +02:00
Olli Suutari
f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
955fdc50ac Fix bug #1645867 by setting an application attribute related to OpenGL
Fixes: https://launchpad.net/bugs/1645867, https://launchpad.net/bugs/1591749
2016-11-29 23:57:27 +02:00
ccdc88c4cb Change the name of the help menu to try to fix the double-help-menu problem 2016-11-29 17:44:32 +02:00
ef7f0b1389 Fix pep8 2016-11-25 16:21:27 +02:00
846476c4ad Stop wizards from resizing themselves based on the contents of comboboxes 2016-11-25 15:58:33 +02:00
826bfd02dd Add a WordProject Bible importer 2016-11-24 23:48:51 +02:00
second@tgc.dk
20ab44be0f Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3
This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback 

bzr-revno: 2706
2016-11-22 21:34:14 +01:00
Tomas Groth
b31d5ad08e pep8 fix 2016-11-21 21:56:48 +01:00
Tomas Groth
5e600f4417 Change the text for missing data path text. 2016-11-21 21:21:31 +01:00
Tomas Groth
f83d9ad520 Insert real button label in text to make sure it shows correct text. 2016-11-20 21:24:11 +01:00
Tomas Groth
467d29374d Remove chords from printing. 2016-11-16 20:39:23 +01:00
phill.ridout@gmail.com
f6de30de23 Move the "no results" code in to the list widget.
lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_...

bzr-revno: 2705
2016-11-16 00:44:11 +02:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Philip Ridout
9133c078c7 Pep againbzr pushbzr push 2016-11-12 11:50:06 +00:00
Philip Ridout
f031df3637 Fixed Tests 2016-11-12 11:19:52 +00:00
Philip Ridout
6a3982bab9 Moved over to using UiStrings 2016-11-12 10:00:36 +00:00
Philip Ridout
906f9af54b removed TODO comment 2016-11-12 08:34:55 +00:00
Philip Ridout
80793f9412 Modified SaveEdit, so that it saves the chosen search type 2016-11-11 21:23:03 +00:00
Philip Ridout
426cd13fd0 fix if statment 2016-11-11 19:19:59 +00:00
Philip Ridout
94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
phill.ridout@gmail.com
09fb235999 lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2702
2016-11-01 21:01:29 +00:00
Philip Ridout
87fede54dc Fixes #1623711* 2016-11-01 19:17:57 +00:00
Philip Ridout
ec19cc5f07 Modified some resources and added test 2016-10-30 08:29:22 +00:00
Philip Ridout
7db45b7ce6 Found some more appropiate sized images. Removed some duplicates 2016-10-27 21:37:33 +01:00
Philip Ridout
997cb859d3 Changed some icons to use svg 2016-10-27 18:45:50 +01:00
Tim Bentley
f56a86f377 Fix titles 2016-10-26 19:02:57 +01:00
Tim Bentley
885d70307e Fix song bug with formatting 2016-10-25 21:34:48 +01:00
Tim Bentley
e6571644dd head 2016-10-23 20:24:53 +01:00
7acfe1dbfd Add new branding to OpenLP for when we get to 2.6 2016-10-23 20:28:30 +02:00
Olli Suutari
aef0941e18 - Modified the def create_separated_list by suggestions of TRB143 2016-10-17 22:42:07 +03:00
Olli Suutari
a7b4d001c7 - Merged trunk and fixed conflict. 2016-10-17 20:40:45 +03:00
suutari.olli@gmail.com
ed647f2828 Fixed the issue where web bible's result in traceback in "Search while typing"
(by removing one miss-placed line)

This branch also fixes the issue where the new "Clear Bible search results" and 
"Lock button" give focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1775/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

bzr-revno: 2698
2016-10-17 17:36:09 +01:00
Olli Suutari
b3d537eec8 - Merged trunk on 17/10/16 2016-10-17 07:29:35 +03:00
Olli Suutari
98b51a1db8 - Code cleanup 2016-10-17 07:29:08 +03:00
Olli Suutari
340b2f3298 - Actually fixed the missing DB bug. 2016-10-17 07:17:33 +03:00
Olli Suutari
0887ca6645 - Removed self from def handle_db_error 2016-10-04 17:21:40 +03:00
Olli Suutari
5d9d76f62d pep8 2016-10-04 17:14:28 +03:00
Olli Suutari
39916d59ed - Attempt to fix jen 2016-10-04 17:09:53 +03:00
Olli Suutari
3c733ddd20 - Merged trunk on 4.10.16 2016-10-04 16:39:14 +03:00
Olli Suutari
ebdad8519f - Added one missing empty row 2016-10-04 16:31:09 +03:00
Olli Suutari
be9c394b63 - For jenkins 2016-10-04 16:27:41 +03:00
Olli Suutari
7ee7ef8846 - Not sure why the db bug is fixed in this branch 2016-10-04 16:07:53 +03:00
Olli Suutari
421555e578 - Improved one comment 2016-10-04 15:27:52 +03:00
Olli Suutari
ece524e2a1 - def handle_db_error now uses except FileNotFoundError to handle the missing data path 2016-10-04 15:16:42 +03:00
Olli Suutari
ce4d8224a2 -redid some mistakenly removed text changes 2016-10-04 10:37:08 +03:00
Olli Suutari
869caa9bf5 - pep8 (one ident) 2016-10-04 10:27:08 +03:00
Olli Suutari
036907eb5e - Changed "&" back to "and" 2016-10-04 03:03:15 +03:00
Olli Suutari
946fb02d57 The def create_separated_list now uses the perfectly made and re-formatted code by the mastermind alisonken1 2016-10-02 21:57:38 +03:00
Olli Suutari
c7a682ebfb - The footer now follows proper english grammar rules. 2016-10-02 20:03:59 +03:00
Olli Suutari
cff02e6b7a Fixed bug: 1513490 2016-10-02 18:51:16 +03:00
Olli Suutari
4471338a19 - Fixed bug 1624661 2016-10-02 14:31:35 +03:00
Olli Suutari
238397fa3c - Made a better fix for giving OpenLP focus, it now works more than once. 2016-09-30 05:57:44 +03:00
Olli Suutari
8dbd79dba0 - cleanup.. The drag&drop focus solution only works for the 1st drag&drop... Why? 2016-09-30 05:36:32 +03:00
Olli Suutari
337edf039f Fixed bug 1487788 2016-09-30 05:26:04 +03:00
Olli Suutari
d716f62d57 - reverted some other changes made while trying to find the fix 2016-09-30 04:11:41 +03:00
Olli Suutari
141c07d42a Fixed bug 1512040 2016-09-30 04:06:51 +03:00
Tomas Groth
88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Tomas Groth
1406224a8f Added support for import of ChordPro 2016-09-25 11:30:00 +02:00
Tomas Groth
453bd53657 Fix the tidy_text method to not insert linefeeds, which is not allowed in XML. 2016-09-23 23:46:43 +02:00
Gary Talent
ebbfd39dbd Add validity checking to EasyWorship 6 importer. 2016-09-22 01:19:46 -05:00
Tim Bentley
6586104f6e minor updates 2016-09-21 20:04:02 +01:00
Gary Talent
08416db1d3 Fix unicode skip issue with the strip_rtf function.
Add doc comment to EasyWorship6 import method.
2016-09-20 22:10:28 -05:00
Tim Bentley
c8dad716cc Review Comments 2016-09-19 19:51:48 +01:00
Olli Suutari
2f8a5ba906 - Fixed the test 2016-09-18 23:15:33 +03:00
Tomas Groth
4754d1eb8b Try to fix a mediashout import issue by replacing the line tab char with 2 linebreaks. 2016-09-18 17:28:55 +02:00
Tomas Groth
3a3ca8d933 Fix fetching bible texts from CrossWalk. 2016-09-18 16:54:55 +02:00
Gary Talent
5435dfc5cc Add test for EasyWorship 6 importer. 2016-09-16 23:39:40 -05:00
Olli Suutari
9222ccdcc5 - pep8 2016-09-17 01:32:12 +03:00
Olli Suutari
2edf579ec3 - Added the placeholder texts to uistrings
- Added placeholder texts for Bible importer & Edit.
2016-09-17 01:24:27 +03:00
Olli Suutari
09da152372 - Added a test for toggle lock button
- Removed give focus to Select bookname on Select tab, may be confusing.
2016-09-17 00:43:30 +03:00
Olli Suutari
173e7c78ea - Fixed the multiline text input for Bible importer 2016-09-16 23:48:56 +03:00
Olli Suutari
ba3b2396e7 - Merged trunk on 16.9.16 2016-09-16 22:54:25 +03:00
Olli Suutari
aa76cf5b2c - Merged trunk on 16.9.16 2016-09-16 22:51:54 +03:00
Olli Suutari
1838fca41e - Commit for merging trunk < Has some unfinished ui strings in Bible edit form. 2016-09-16 22:47:29 +03:00
Olli Suutari
289deb4694 Changed the settings title from: "Songs mode" to "Song related settings" 2016-09-15 22:06:01 +03:00
Olli Suutari
093f379b6a - Added a new setting for controlling visibility of the "Written by:"
(By default disabled)
2016-09-15 22:03:17 +03:00
Olli Suutari
a6f043ff20 - Wishlish fix: Make the song-footer text "Written by" optional 2016-09-15 21:32:25 +03:00
Olli Suutari
191845b70c - Added param: to Lock toggle button 2016-09-15 10:41:54 +03:00
Olli Suutari
25631152ad The import saves the value if we use QLineEdit instead of QPlainTextEdit... But why? 2016-09-15 03:22:36 +03:00
Olli Suutari
7ba2bb6d82 - Fixed the missing field traceback
- Created the field for import
  (This does not work, why?)
2016-09-15 02:53:04 +03:00
Olli Suutari
a034532d19 - Fixed a bug where web bible's trigger traceback in search while typing. 2016-09-15 02:17:17 +03:00
Olli Suutari
0c93d6b032 - Created a working "Full license" field for Bible editor.
Problem: If metadata does not already have full_license field = traceback.
2016-09-15 01:20:33 +03:00
Olli Suutari
1fae73014e - Removed one unrequired code line 2016-09-12 15:11:59 +03:00
Olli Suutari
7ea3105857 - Fixed some .forma tags to .format 2016-09-12 14:41:38 +03:00
Philip Ridout
29bc21d807 Doc string 2016-09-09 22:36:10 +01:00
Olli Suutari
639c01dfe2 - Merged trunk on 9.9.16 2016-09-09 10:58:15 +03:00
Olli Suutari
a99bd8603f - Combined some <strong> tags in expection dialogue.
- Added new line to the end of the test.
2016-09-09 10:57:11 +03:00
Tim Bentley
8f94d10c8d add tests 2016-09-08 06:06:36 +01:00
Gary Talent
b5f08bf54c Add support for importing EasyWorship6 databases 2016-09-07 00:15:37 -05:00
Philip Ridout
9a049929fc Missed an attribute 2016-09-05 19:02:47 +01:00
Philip Ridout
223b198dc8 Moved some import related stuff out of the db module 2016-09-04 22:16:43 +01:00