Commit Graph

13563 Commits

Author SHA1 Message Date
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
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
s.mehrbrodt@gmail.com
ddfed93fbe "* Fix importing older song dbs by migrating them first
* Fix comparing songs without title

lp:~sam92/openlp/bug-1533081 (revision 2615)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/
Stopping after failure"

bzr-revno: 2609
Fixes: https://launchpad.net/bugs/1533081, https://launchpad.net/bugs/1534306
2016-01-16 22:13:41 +02:00
f588b82976 Fix up the tests for Windows by retrying deleting the databases.
bzr-revno: 2608
2016-01-15 21:37:53 +01:00
478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00
e1ed3ab163 Use rmtree in the retry mechanism 2016-01-15 20:10:09 +02:00
b11b88f4eb Add a retry mechanism 2016-01-15 19:58:21 +02:00
d7b9e2cbe5 Try deleting the file itself after telling Python to do garbage collection 2016-01-15 19:50:57 +02:00
402917024b Another go at this 2016-01-15 19:11:02 +02:00
second@tgc.dk
4ecd2085ed Fix taking screenshots while using powerpoint or impress.
Fix traceback when expanding and collapsing songs.
In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted.
Fix crash when sending Pdf live.
Pep8 fixes

bzr-revno: 2607
Fixes: https://launchpad.net/bugs/1532169, https://launchpad.net/bugs/1532938
2016-01-14 21:53:17 +00:00
11b7bfd22d See if waiting a second helps 2016-01-14 22:31:37 +02:00
9e8fe903a7 attempt to fix some tests in windows 2016-01-14 22:25:58 +02:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth
b1660c0525 Added test 2016-01-13 21:56:55 +01:00
Tomas Groth
6f9056c935 trunk 2016-01-12 22:36:32 +01:00
Tomas Groth
3f3078c33a Fix traceback when expanding and collapsing songs.
Fixes: https://launchpad.net/bugs/1532169
2016-01-12 22:29:20 +01:00
Tomas Groth
e3d7e436f1 In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted. 2016-01-12 21:17:15 +01:00
Tomas Groth
cf7630d3e3 Fix crash when sending Pdf live. 2016-01-12 21:14:04 +01:00
Tim Bentley
fb8ee9a546 Fix search
bzr-revno: 2606
2016-01-12 18:45:04 +00:00
Tim Bentley
31d6f931e5 head 2016-01-11 21:58:21 +00:00
Tim Bentley
3f0025a013 add tests 2016-01-11 21:57:45 +00:00
simon.hanna@serve-me.info
98258bc753 Reenable the stylesheet
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00:00
Tomas Groth
c8fd1b8338 Fix taking screenshots while using powerpoint or impress.
Fixes: https://launchpad.net/bugs/1532938
2016-01-11 22:13:57 +01:00
Tim Bentley
2218ecbcd7 head 2016-01-11 21:12:03 +00:00
Tim Bentley
50df2e6258 fix json 2016-01-11 21:04:24 +00:00
springermac@gmail.com
e6959992f9 Fix Mac OS X display flags test
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

bzr-revno: 2604
2016-01-11 21:27:11 +01:00
simon.hanna@serve-me.info
dc42dd1198 Make some methods static where possible
Move some methods out of their classes where it makes sense

Add .coveragerc so that local html reports can be generated

fix pep8 errors

bzr-revno: 2603
2016-01-11 17:22:47 +00:00
Jonathan Springer
fc2efb7343 Fix Mac OS X display flags test 2016-01-10 22:27:28 -05:00
Jonathan Springer
c07503f5dc Fix import 2016-01-10 17:10:50 -05:00
Jonathan Springer
263a7b2c62 Fix macosx_display_windows_flags_state test 2016-01-10 17:10:05 -05:00
Jonathan Springer
a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna
09faa0cb87 Add a test 2016-01-10 21:06:41 +01:00
Simon Hanna
9d8c757d0d Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma 2016-01-10 19:01:36 +01:00
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna
e172e2aeb2 Revert Changes 2016-01-10 17:00:05 +01:00
0e8dc032da Release 2.3.2
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
simon.hanna@serve-me.info
764eebcda6 Fix SongImport
Ignore Case for versetags when importing Songbeamer files

The issue with importing songs was because the SongFormat list was reordered, but the ordering wasn't passed through to get_format_list()
This error should not happen again, added a testcase just to be sure

bzr-revno: 2601
2016-01-10 07:23:31 +00:00
Simon Hanna
0f1d6718bd Add tests for ignored case 2016-01-10 01:34:53 +01:00
Simon Hanna
9525453679 Ignore case when matching verse tags during SongBeamerImport 2016-01-10 01:22:31 +01:00
Simon Hanna
70e1f3926b Add test for fix 2016-01-10 01:18:27 +01:00
Simon Hanna
076cc57d39 Fix Song import 2016-01-10 01:17:58 +01:00