Commit Graph

16636 Commits

Author SHA1 Message Date
suutari-olli 87cdde1575 Merging trunk on 15/3/16 2016-03-15 21:14:40 +02:00
suutari-olli 4a6b5b7cc4 In this merge:
- Moved setting for controlling unblanking behaviour to General options tab.
- Removed it from  advanced tab
- Changed default setting to "no"
- Looped playback (once or to end) is now linked to this setting
- Unblanking slides on click -.- no longer unblanks display when sending new items live if
  "Unblank display when sending new item to live" is not enabled. -.-
- Doubleclicking preview -.- ^^
- Improved some comments

To do:
Test(s)?
2016-03-15 20:37:55 +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 ddae0b4247 Removed duplicate: self.on_hide_display(True)
(Was trying to create/test a test but failed and forgot to take it away)
2016-03-15 16:11:24 +02:00
suutari-olli a78565568f Pep8 fixes
To do:
Test(s)
2016-03-15 12:30:37 +02:00
suutari-olli 0c23135304 - Removed Whites space before (self, item) on row 789, how did it get there in the first place? 2016-03-15 11:39:54 +02:00
suutari-olli 546ed56823 - If display is blanked when song in Live is edited, now re-blanks display after updating the song. (Improved fix)
- Improved un-blanking when starting Loop, pressing "Stop loop" no longer unblanks display.
- Improved comment(s)

To do:
- Write test(s)
2016-03-14 04:11:13 +02:00
Tomas Groth e908799240 Fix slide order change when splitting custom slides. Fixes bug 1554748.
Fixes: https://launchpad.net/bugs/1554748
2016-03-13 22:55:47 +01:00
Tomas Groth faa434d937 pep8 fixes 2016-03-13 19:37:08 +01:00
Tomas Groth 1dfad12edc Fix EasyWorship import issues with missing verses and traceback on unknown chars.
Fixes: https://launchpad.net/bugs/1553922, https://launchpad.net/bugs/1547234
2016-03-12 22:25:39 +01:00
Tomas Groth 4b57a2bae6 Fix weird test bug. 2016-03-12 22:23:06 +01:00
Tomas Groth 4cea5e8b43 Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fixes: https://launchpad.net/bugs/1554428
2016-03-12 22:22:21 +01:00
Tomas Groth e9e5976d22 Finished first test. 2016-03-11 22:56:07 +01:00
Tomas Groth 51ffb92d40 Started work on tests 2016-03-09 22:44:15 +01: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
Tomas Groth 98eb50e9b2 Made the anchor/tag detection more generic. 2016-03-08 22:43:10 +01:00
Tim Bentley 0c2c869dbf Fix more bugs 2016-03-08 17:49:57 +00: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
Tomas Groth e67ad21740 Getting closer... 2016-03-07 23:27:28 +01:00
Tim Bentley 4e39f71f4e remove crash systemplayer 2016-03-07 21:55:13 +00:00
Tim Bentley 7308a97c29 remove crash 2016-03-07 21:52:09 +00: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 Hill 7971daacdc merge w/ trunk 2016-03-06 09:02:38 +00: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
Ian Knight 68460f5e3f Added smart scaling when manually resized, integrated with settings dialog, fixed some pep8 errors 2016-03-06 03:11:32 +10:30
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
Ken Roberts 544319ba92 Add projector: status_change_test 2016-03-03 10:19:42 -08:00
Ken Roberts 4a74c9ce68 Projector - String standards 2016-03-03 09:53:29 -08:00
suutari-olli 43df6739b0 Now including fix for bug:
https://bugs.launchpad.net/openlp/+bug/1531691
2016-03-03 04:49:04 +02:00
suutari-olli 87b9ae3600 Added "Unblank display when changing slide in Live" to advanced tab.
Added automatic unblanking when starting loopped playback.

Now, only the tests remain!
2016-03-03 02:07:52 +02:00
suutari-olli 770843e0c6 This branch adds the functionality of un-blanking display from:
blank to desktop, black and theme by clicking slides in "Live" panel.

This also adds this functionality for:
- Starting loops
- Go to verse x
- Next/Previous verse
2016-03-03 00:49:49 +02:00
Tomas Groth a66fcff441 trunk 2016-02-29 22:36:12 +01:00
Tomas Groth d28ca7500e Beginning of an OPS Pro importer 2016-02-29 22:35:53 +01: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
Ian Knight 1e94cd92e9 Split auto-scroll & height cap features to new branch 2016-02-29 15:31:05 +10:30
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
Tim Bentley af51d10fad fix up some tests 2016-02-27 14:03:52 +00: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
Tim Bentley 071dfa6299 remove prints 2016-02-26 18:17:39 +00:00