Commit Graph

13648 Commits

Author SHA1 Message Date
suutari-olli 87cdde1575 Merging trunk on 15/3/16 2016-03-15 21:14:40 +02:00
suutari-olli 59cb9306c4 Copied resources.py from trunk to revert new changes
I have a feeling this might not work as intended....
2016-03-15 19:13:35 +02:00
suutari-olli a78565568f Pep8 fixes
To do:
Test(s)
2016-03-15 12:30:37 +02:00
suutari-olli d61ded487e In this Merge:
- Min. search lenght no longer counts spaces.
- Bolded part of "Empty or too short" error message
- Modified some comments 

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Listing search results when typing for Text search
2016-03-09 02:25:07 +02:00
suutari-olli 6de4a5c923 In this commit:
- Replace '. ' with ' ' in Reference search, so for an example Gen. 1 works
- Modified related error messages

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
2016-03-09 00:46:47 +02:00
suutari-olli 432177fd2d In this commit:
- Added: self.application.set_normal_cursor() to "Web bible" and "no search results" for combined.

 To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Ignore '.' in Reference search for smoother searching experience + Remove mention about it in error and add ending to uistrings.py
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
2016-03-08 03:34:42 +02:00
suutari-olli 07c519084a - Moved empty/short search messages and parts of scripture error to uistrings.py
- Improved some Error messages
- Improved some comments
2016-03-08 02:34:31 +02:00
suutari-olli 9b9c33123e In this commit:
- Fixed (packed) the new icon
- Improved some error messages

To do
- Write tests

Possible other changes/features that may be added later.
- Ignore '.' in Reference search for smoother searching experience
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
2016-03-07 20:27:37 +02:00
suutari-olli 3c70500c23 Fixes in this commit:
- Fix for some dual triggering errors.
- Searches with only spaces now trigger error since they make OLP unresponsive and may crash
- Removed old "Empty" search message, integrated it to the new one.
- Added some comments
- Remodelled/Added nice error messages + needed code to support it
- Fixed the issue where Bible book name prediction comes for pure Text search.
- Fixed "No passage found" in 2nd bible by using self.main_window.information_message

To DO:
- If web bible is enabled combined text search triggers double error, fix it.
- Pack the new icon
- Double check spelling etc...
- Write tests
2016-03-07 08:03:41 +02:00
suutari-olli 0ac56e5a19 - It works!
- Added text prediction for book names
- New script for reference_combined
- Also on previous: Added mininium search lengt of 3 characters for text to prevent short keywords from crashing OLP.
- Added new icon to code but still using reference icon since it requires packing in order to work.

To DO:
a) New icon, pack it | How?
b) Added stupid error message if nothing is found, make it less stupid.
c) Add example verses to "Reference not found" error. ( and Use this as base for b) 

d) Possibly work on text prediction for Text based search but probably leave it for an another branch.
2016-03-06 23:45:51 +02:00
suutari-olli b1223927a0 - Combined search is now working, own "combined" function for scripture reference search.
- Book name prediction as typing is not yet working
- Icon does not appear correctly (If used) Now using Reference icon, even thou combined icon was added.
- Renamed to "Combined search"
2016-03-06 22:35:05 +02:00
chris@minkus.me.uk 3f7cb577b4 Fix for bug #1000729. Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search, based on the existing 'Author' search.
bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1000729
2016-03-05 20:48:27 +00:00
suutari-olli 2255f05505 Starting work on combined Bible quick search,
added combined search type. (Copy from reference)
2016-03-04 05:33:57 +02:00
second@tgc.dk 0afada2129 Another attempt to fully fix bug 1531319.
bzr-revno: 2625
2016-02-29 21:57:10 +01:00
Tomas Groth 5809a2d6f4 Added test 2016-02-29 20:29:32 +01:00
Ken Roberts ec5a362ea5 - Fix projector manager receiving an invalid class response on initial connection
- Fix string encoding to ascii when sending request to projector

--------------------------------
lp:~alisonken1/openlp/bug-1550891 (revision 2624)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1301/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1223/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1162/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/997/...

bzr-revno: 2624
Fixes: https://launchpad.net/bugs/1550891
2016-02-28 20:41:25 +00:00
suutari.olli@gmail.com b490772f8b This branch fixes the issue where Blank to desktop,
black and theme won't work if Live screen has stolen focus.

Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.

This was achieved by adding 3 lines of code, one for each method under the definition of methods available in this screen mode.

I also explained this in a comment I inserted to the code.

Since the only way to screw this seems to be by removing these additions,
a test for the...

bzr-revno: 2623
2016-02-28 20:33:19 +00:00
Ken Roberts 7c23941f35 Fix sending unicode string when expecting ascii (binary) data 2016-02-28 04:35:15 -08:00
Ken Roberts 9774618d37 Bugfix 1550891 - non-standard class reply from projector 2016-02-28 02:26:38 -08:00
suutari-olli e548518331 Added 2nd empty row after last test in class. 2016-02-27 16:25:31 +02:00
suutari-olli e3c4f53dc4 Seems like I added one empty row at some point...
Removing it...
2016-02-27 00:03:32 +02:00
suutari-olli 6ef2cc8b59 Added test, fixed comment. 2016-02-26 23:28:01 +02:00
Tomas Groth 7c43ae6b88 Another attempt to fully fix bug 1531319,
Fixes: https://launchpad.net/bugs/1531319
2016-02-20 22:42:31 +01:00
Chris Hill 57200fa84e merge with trunk 2016-02-19 20:28:39 +00:00
second@tgc.dk 1c9713ef4e Removed songs used in tests that is not in public domain.
bzr-revno: 2622
2016-02-15 23:29:26 +01:00
Tomas Groth 034344ae48 Add missing import. 2016-02-15 22:11:38 +01:00
Tomas Groth 4c883c8cf0 Remove songs used in tests that is not in public domain. 2016-02-15 21:49:23 +01:00
Chris Hill 41d627e3f9 natural sort lower case 2016-02-13 16:57:09 +00:00
Chris Hill 3eecea213d merge with trunk 2016-02-13 16:40:16 +00:00
Raoul Snyman 271a35581c Release 2.4
bzr-revno: 2621
2016-02-13 16:41:12 +02:00
Tim Bentley 81ec2236fc Translations 1302
bzr-revno: 2620
2016-02-13 14:32:51 +00:00
Tim Bentley 45fa840c7e trans1302 2016-02-13 13:00:05 +00:00
second@tgc.dk 77a937836a Fix for force-updating display on windows when using themes without transitions.
Pep8 fix + a test.

bzr-revno: 2619
2016-02-12 21:52:09 +01:00
Tomas Groth e99fe71ca2 Added test 2016-02-12 21:23:18 +01:00
Tomas Groth 510e109ff5 trunk 2016-02-12 20:59:32 +01:00
raoul@snyman.info 3676cef69f "Fix the toggle song usage menu item not working
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1544263 (revision 2618)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1279/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1203/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1142/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/978/
Stopping after failure"

bzr-revno: 2618
Fixes: https://launchpad.net/bugs/1544263
2016-02-12 21:46:29 +02:00
Tomas Groth b90dbbc303 pep8 fix 2016-02-12 20:46:04 +01:00
Raoul Snyman dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Tomas Groth fdb53f919f Fix for force-updating display on windows when using themes without transitions. 2016-02-09 22:01:20 +01:00
Chris Hill 76e7faf1aa Remove _try_int function - spurious 2016-02-07 09:27:28 +00:00
Raoul Snyman a172183a4e Release 2.3.3
bzr-revno: 2617
2016-02-06 23:12:06 +02:00
second@tgc.dk 8d083af742 More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
Tomas Groth 17d6f13ac0 More workarounds for bug 1531319.
Fixes: https://launchpad.net/bugs/1531319
2016-02-06 20:43:54 +01:00
Chris Hill f23e2dfb46 update from trunk, works in 2.4 2016-02-06 17:50:58 +00:00
Tim Bentley 7d722b66cf Translations
bzr-revno: 2615
2016-02-06 12:55:13 +00:00
Tim Bentley e2abc6402f trans0602 2016-02-06 11:11:28 +00:00
Tomas Groth aa8af06f79 If presetation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508.
Fixes: https://launchpad.net/bugs/1490508
2016-02-05 21:11:36 +01:00
raoul@snyman.info 4a5f77f884 "Fixed a problem with the shortcuts.
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi..."

bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
2016-02-05 22:04:00 +02:00
raoul@snyman.info 022261dbd1 "Fix up some warnings we get about BeautifulSoup's parser."
bzr-revno: 2613
2016-02-05 21:55:30 +02:00