Commit Graph

14409 Commits

Author SHA1 Message Date
Philip Ridout
9f90b89076 PEP fixes 2016-11-11 21:28:11 +00:00
Philip Ridout
80793f9412 Modified SaveEdit, so that it saves the chosen search type 2016-11-11 21:23:03 +00:00
phill.ridout@gmail.com
389fb391df Regenerated resources for my earlier resource clean up merge77
lp:~phill-ridout/openlp/bug1623711-part2 (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1813/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1662/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1416/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1006/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2703
2016-11-05 14:16:40 +02:00
Philip Ridout
3d07ec5a09 Regen resources 2016-11-02 19:24:33 +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
phill.ridout@gmail.com
f92dbeeb7a Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.


Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests...

bzr-revno: 2701
2016-11-01 21:00:24 +00:00
Philip Ridout
053da160a3 Diverged branches? 2016-11-01 19:22:39 +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
a2e36b447f Ran said script 2016-10-27 18:49:44 +01:00
Philip Ridout
a9c482e788 Added a script to automatically clean up the resources folder 2016-10-27 18:48:18 +01:00
Philip Ridout
997cb859d3 Changed some icons to use svg 2016-10-27 18:45:50 +01:00
tim.bentley@gmail.com
a4d623a3c0 My dad needed a report of all the songs on their database, they had 1800.
Made this into a reporting option and cleaned up the menu.
Fixed some errors spotted as well

Fixed issues and comments
1800 songs takes about 3 secs to run on my i7

lp:~trb143/openlp/reporting (revision 2701)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1801/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1712/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1650/
[SUCCESS] https://ci....

bzr-revno: 2700
2016-10-26 19:10:24 +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
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
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
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
Tim Bentley
8f94d10c8d add tests 2016-09-08 06:06:36 +01: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
Tim Bentley
b3f397901a remove extra file 2016-09-03 08:15:40 +01:00
Tim Bentley
8bfb0e4759 fix typos 2016-09-03 08:14:08 +01:00