Commit Graph

14386 Commits

Author SHA1 Message Date
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 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
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 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
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
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 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 ba3b2396e7 - Merged trunk on 16.9.16 2016-09-16 22:54:25 +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
Olli Suutari 191845b70c - Added param: to Lock toggle button 2016-09-15 10:41:54 +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 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 2dd770ea11 PEP fixes 2016-09-09 22:47:29 +01: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
Olli Suutari 359dded22a - Fixed the test 2016-09-09 10:51:19 +03:00
Philip Ridout 4a71bda0d1 More BibleImport tests 2016-09-05 21:27:14 +01: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
Philip Ridout 80cdc35433 Move already refactored imorters over to using the log methods in OpenLPMixin 2016-09-04 17:15:57 +01:00
Olli Suutari aecd6b8858 Fixed 1 strong tag 2016-09-02 19:54:00 +03:00
Olli Suutari 4a57caf084 - Removed the old "escape item" test. 2016-09-02 19:24:57 +03:00
Olli Suutari e4e46d40f5 - Setting migration for escape item
- Renamed shortcut descriptions for blanks
2016-09-02 19:19:28 +03:00
Olli Suutari 2fcd292969 - Renamed some code 2016-09-02 18:52:44 +03:00
Olli Suutari 2c4dbda42f - The new method now also stops loops. 2016-09-02 18:41:16 +03:00
Olli Suutari 4f48cb5df2 - fixed the "blank only" button visibility 2016-09-02 18:34:39 +03:00
Olli Suutari 875481d2d9 - A working only blank to desktop 2016-09-02 18:22:29 +03:00
Philip Ridout 6fc1467c5a PEP fixes 2016-09-02 15:32:14 +01:00
Philip Ridout 14187f4884 Mostly refactors of OSIS + tests 2016-09-02 15:23:20 +01:00
Philip Ridout 628027ffc8 Moved validate_xml in to bible import and improved operation. More tests 2016-08-29 17:11:09 +01:00
Philip Ridout e91b87da8c Start on osis importer. Some further improvements of other importers 2016-08-28 22:03:04 +01:00
Philip Ridout 9b41814511 Merge from yet-more-refactors 2016-08-27 14:33:21 +01:00
Philip Ridout 71dcd2079c HEAD 2016-08-27 14:27:12 +01:00
Olli Suutari 46a7c92a90 - Merged trunk 2016-08-25 22:27:55 +03:00
Olli Suutari 7fba73843b - Added the missing </strong> tag to expection form. (bug 1616441) 2016-08-25 22:24:59 +03:00
Philip Ridout 28d94b7d10 moved some static methods to module level 2016-08-21 21:36:59 +01:00
raoul@snyman.info 690d5e770a Fix bug #1547964 by ignoring the exception (it's harmless)
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots (revision 2697)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1657/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1595/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-...

bzr-revno: 2695
2016-08-21 20:33:46 +02:00
Philip Ridout dcd8d6f6b5 Remove upgrade code not needed since 2.2 2016-08-21 12:04:18 +01:00
Philip Ridout 3c29427866 Added some doc strings which I missed 2016-08-21 08:39:40 +01:00
Philip Ridout aefcd48cc3 reverted changes to bibles http.py 2016-08-20 21:32:25 +01:00
Philip Ridout 894b4fbf10 revert changes to http.py due to circular references 2016-08-20 21:00:50 +01:00
Olli Suutari 4733aa2169 - Removed modifications to test_mainwindow. 2016-08-20 22:17:00 +03:00