Commit Graph

14581 Commits

Author SHA1 Message Date
7acfe1dbfd Add new branding to OpenLP for when we get to 2.6 2016-10-23 20:28:30 +02:00
suutari.olli@gmail.com
bbf93bdf7c - Replaced Escape item with "Show desktop"
(Same as blank to desktop,  but does not unblank).
- Combined Offline & Online help buttons into "User Manual" button,
  which launches the appropriate help based on OS. (Offline for Win/Mac)
- Improved blank to modes shortcut descriptions.
- Setting migration for old help/escape help keys.

- Fixed bugs:
https://bugs.launchpad.net/openlp/+bug/805082
https://bugs.launchpad.net/openlp/+bug/1612187
https://bugs.launchpad.net/openlp/+bug/1616441
https...

bzr-revno: 2699
2016-10-18 18:04:50 +01: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
second@tgc.dk
5d24b2c473 Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char.

bzr-revno: 2697
2016-10-04 17:41:43 +01: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
97d828af43 - Added pip's fix for sword test 2016-10-04 16:48:54 +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
e46174d653 - Added the SWORD importer test fix by phill to this branch 2016-10-04 12:06:17 +03:00
Olli Suutari
400595adf5 - Fixed tests for creating creator lists 2016-10-04 11:43:52 +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
453bd53657 Fix the tidy_text method to not insert linefeeds, which is not allowed in XML. 2016-09-23 23:46:43 +02:00
Tim Bentley
6586104f6e minor updates 2016-09-21 20:04:02 +01: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
32cfacff7e Skip MediaShout import testing on non-win platforms. 2016-09-18 17:47:59 +02: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
Olli Suutari
ff2e1d1ea7 - The checking for not_called_once does not work apparently, fails in jenkins but passes in nosetests. 2016-09-18 02:07:24 +03:00
Olli Suutari
190baf19d5 - Added two new tests for lock button toggle. 2016-09-18 01:53:47 +03: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
phill.ridout@gmail.com
60707265e3 Some more bible refactors
lp:~phill-ridout/openlp/even-more-refactors (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1769/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1680/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1618/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1374/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/964/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1032/
[...

bzr-revno: 2696
2016-09-15 20:57:34 +01:00