raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,819 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

2806 Commits

Author SHA1 Message Date
Ken Roberts 1ff94a74a3 Qt5 updates for projector/signal mismatches 2016-08-07 13:51:35 -07:00
Philip Ridout 97dbc85918 move chardet function in to core 2016-08-07 20:29:35 +01:00
suutari.olli@gmail.com fb105f2e0b This branch introduces following improvements to Quick Bible search: 
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
  (E.g. added actual example verses to Reference error)
- 3 New settings for controllin...

bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
 2016-08-07 19:33:46 +01:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Ken Roberts b41b4a5918 Fix some todo notes 2016-08-05 12:18:47 -07:00
Tomas Groth c473212107 Added pylint test to jenkins script, and fixed a format error. 2016-08-02 20:57:10 +02:00
suutari-olli 1298b629f1 - Merged trunk on 31.7.16 2016-07-31 14:58:54 +03:00
suutari-olli 0923ca6a40 - Merged trunk on 28.7.16 2016-07-28 22:57:21 +03:00
Tomas Groth b781fa6169 some cleanups, comments and a test. 2016-07-26 21:02:35 +02:00
Tomas Groth de54ec2715 merge trunk 2016-07-25 22:48:30 +02:00
Tomas Groth 611c970eb0 More work on chords 2016-07-25 22:07:07 +02:00
suutari-olli b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
Raoul Snyman e231398010 HEAD 2016-07-24 14:25:46 +02:00
Raoul Snyman ebefc03674 Fix the disappearance of a variable :-) 2016-07-23 23:41:24 +02:00
second@tgc.dk c426b8c1a2 "Added a test using pylint to test the code for the most serious issues. 
Added pylintrc for finding more potential issues with pylint (not used in the test).
Made some fixes as suggested by pylint."

bzr-revno: 2681
 2016-07-21 23:32:25 +02:00
Tomas Groth 530f119938 Various improvements for chords on the mainview. 2016-07-21 22:37:25 +02:00
Tomas Groth c10f71db3a Started work on chords on maindisplay. 2016-07-20 22:43:46 +02:00
Raoul Snyman 98f5a5c856 Fix another slot signature 2016-07-19 22:22:37 +02:00
Raoul Snyman a8b72ed876 Fix up the types in the signals and slots - PyQt 5.6 is stricter about them now. 2016-07-18 23:36:16 +02:00
suutari-olli 4874f6a218 - Reduced comments 
- Removed unrequired reg_value from test.
 2016-07-16 19:51:08 +03:00
suutari-olli 1c133398e2 Merged trunk on 14.7.16 2016-07-14 21:03:57 +03:00
Ken Roberts de3f4046b7 Convert md5sum calls to utf-8 for non-ascii pins 2016-07-08 12:19:08 -07:00
Tomas Groth 1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth 99e6ab6657 Fix various issues as suggested by pylint 2016-07-05 22:31:29 +02:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
suutari-olli 22ff4247ad - Merged trunk on 27.6.16 2016-06-27 02:23:50 +03:00
suutari-olli 68b4d62502 - Turned the two new hidden settings into registry flags 2016-06-27 02:14:24 +03:00
Ken Roberts 8806a06ab9 Test cleanups 2016-06-17 19:45:02 -07:00
Ken Roberts 7e8eb21510 Pep8 and notes about hashing 2016-06-17 16:54:04 -07:00
Ken Roberts d1ff2385ae bug 1593883 fix - switch from qmd5_hash to md5_hash 2016-06-17 16:48:32 -07:00
Ken Roberts aaba690c97 Fix call to wrong signal on error 2016-06-17 16:05:26 -07:00
Ken Roberts c64df391aa bug 1593882 fix 2016-06-17 15:46:21 -07:00
Ken Roberts 76ffe35621 bug 1593882 - fix authenticated connection but bin not set 2016-06-17 15:06:55 -07:00
Ken Roberts c8754c86aa Merge trunk fix conflict 2016-06-16 18:08:21 -07:00
Ken Roberts 7a8b519b8c Add test for renderer change to template string 2016-06-16 07:44:32 -07:00
Ken Roberts b627736e5e Convert renderer string to Template() 2016-06-15 08:05:05 -07:00
Tomas Groth 0c2b68ac54 merge trunk 2016-06-14 23:12:54 +02:00
suutari-olli c249eb1f20 merged trunk on 14.6.16 2016-06-14 01:02:56 +03:00
suutari-olli 65ffd10cdf - Improved the "Too short search" item functionality. 
- Improved some comments.
 2016-06-13 01:02:24 +03:00
suutari-olli 4ec7e5e879 - Added "Search too short for search while typing" message to search results 
!! Need to rename this from: search_results_banana to something smarter.
- Fixed "," breaking OLP if it's the last char in text search.
- "," no longer separates keywords in Text search. 
- Removed mention about separating keywords with "," from the empty search message.
- Started working on not duplicating search results on "Lock search results" > THIS DOES NOT WORK YET.
 2016-06-11 13:10:15 +03:00
Tomas Groth df82628c01 Fix merge issue 2016-06-08 21:34:29 +02:00
Tomas Groth 2fe7a9d127 trunk 2016-06-08 21:27:52 +02:00
Ken Roberts 5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
Ken Roberts 2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
Ken Roberts a4483af5b4 Revert htmlbuilder for now 2016-06-04 01:03:25 -07:00
Ken Roberts 598d715de6 Initial string conversions for variable templates 2016-06-03 17:15:19 -07:00
Ken Roberts 41dcf85cbe "Convert strings to python3 in plugins part 4 
- Convert strings in plugins/songusage
- Convert missed string in projector/pjlink1
- Updated projectorpjlink1 test

--------------------------------
lp:~alisonken1/openlp/strings-plugins4 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1578/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1489/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1427/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_F..."

bzr-revno: 2671
 2016-05-31 17:36:28 +02:00
Ken Roberts 546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
Tim Bentley 1ea5d72d1e fix formatting tags and move SpellText Edit 2016-05-21 06:02:31 +01:00
Ken Roberts 7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
Ken Roberts 306f027b53 Convert strings from python2 to python3 format 
- Strings converted except as noted
- Updated projector pjlink test
- Simplify lines with multiple references to single variable

--------------------------------
lp:~alisonken1/openlp/strings-lib (revision 2665)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1559/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1470/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04a...

bzr-revno: 2664
 2016-05-17 22:22:24 +01:00
Tim Bentley 8cf6b2df3e Service Manager themes are not updated in service items when the settings theme is changed 
bzr-revno: 2663
 2016-05-17 22:19:20 +01:00
Ken Roberts a3df011409 Typo 2016-05-17 06:21:29 -07:00
Ken Roberts 8cc6f1dbcb Fix duplicate tags in strings 2016-05-17 06:15:53 -07:00
ian@knightly.xyz 05e9e5dca0 Fixes bug 1080596 where presentations in the preview pane display live view rather than preview of selected slide. 
In addition, fixes the aspect ratio & quality of thumbnails by saving them in the correct aspect ratio at a higher resolution, and loading them through the image manager.

New test cases implemented, or existing cases modified to test coverage complete for changes.

lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2661
Fixes: https://launchpad.net/bugs/1080596
 2016-05-16 17:26:29 +01:00
Ken Roberts 403df406df Simplify a line with multiple references in format 2016-05-16 07:02:47 -07:00
Ken Roberts 1f5f457786 pep8 2016-05-16 06:44:57 -07:00
Ken Roberts b4329ff781 Revert a few items plus cleanups 2016-05-16 06:41:26 -07:00
Ian Knight a7466f1ea7 Check for Div0 and added unit test cases 2016-05-16 22:05:58 +09:30
Ken Roberts 7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07:00
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text. 
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
 2016-05-12 23:00:54 +02:00
Ian Knight 55002518ef Added Functional Tests, cleaned PEP8 errors 2016-05-06 04:27:32 +09:30
Ian Knight bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Ian Knight a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
Tim Bentley c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
Ken Roberts d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
Ken Roberts 591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Ken Roberts c1222dc2bb Convert strings to python3 in __init__ files 2016-04-22 17:40:59 -07:00
Tim Bentley bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley 34f00cda92 dnd and files 2016-04-17 20:09:46 +01:00
Tim Bentley b2147045b2 colorbutton2 2016-04-17 20:06:17 +01:00
Tim Bentley 6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
Ken Roberts f6cb085b0d "- Update string format to Python3 style 
- Added projector lamp values test

Convert string format from Python2 
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

bzr-revno: 2645
 2016-04-17 17:33:08 +02:00
suutari-olli bf3cad050c Turned the new setting into question. 2016-04-17 04:52:45 +03:00
suutari-olli 69af91edef - Fixed bug 1462420 - Double clicking Preview adds item to Service countless times 
(Added hidden setting for controlling this, it is set to True once double clicking
  has added item to Service and gets reset to False once new item is sent to preview.
 2016-04-17 04:13:39 +03:00
Ken Roberts 37bae16307 String formatting 2016-04-16 14:32:56 -07:00
Ken Roberts d92757af97 Convert strings to format() method 2016-04-16 01:08:45 -07:00
Tim Bentley a41d86cb7c Head 2016-04-06 06:08:44 +01:00
Tim Bentley 6729ea9d19 move file 2016-04-05 19:33:50 +01:00
Tim Bentley b7da0be71e move method 2016-04-05 18:10:51 +01:00
Tim Bentley dffba47b44 move version checker 2016-04-04 20:53:54 +01:00
Ken Roberts 6bca1fc455 Fix decode() string error in about text - fix qt try/except error in projector 2016-04-01 20:04:15 -07:00
Tim Bentley ba6d66497c actions 2016-03-31 17:34:22 +01:00
Tim Bentley d11cb1d622 Only set tab_visited when the tab is visited and not on loading 2016-03-29 17:55:33 +01:00
Tomas Groth 1f9478208e trunk 2016-03-20 21:37:05 +01: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
Tim Bentley 30dc055532 Video backgrounds work 2016-02-14 17:53:16 +00:00
Tim Bentley ea40173f9b new start 2016-02-13 13:13:00 +00:00
Tim Bentley 81c9f5f1ca more simplifications 2016-01-24 10:13:33 +00:00
Tomas Groth fb04813088 remove debug prints 2016-01-23 13:38:08 +01:00
Tim Bentley 4aebe441e7 cleanups 2016-01-23 12:11:34 +00:00
Tim Bentley 06ed550c8f head and Mediainfo 2016-01-23 10:09:36 +00:00
Tomas Groth e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01: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
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
Ken Roberts 8fcae33516 resolve merge conflics 2016-01-09 08:59:42 -08:00
Simon Hanna afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman 4fd53706c6 We still need a db_url. Thanks interface tests! 2016-01-08 00:18:01 +02:00
Simon Hanna d5780b9f78 update functions that were previously methods to drop the '_' 
rename _child to to_str because of name conflicts
 2016-01-07 14:10:31 +01:00
Raoul Snyman b1febaa452 Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied. 2016-01-06 22:02:39 +02:00
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Simon Hanna c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +01:00
Tomas Groth 8991d2ca62 trunk 2016-01-03 18:02:23 +01:00
Tomas Groth dec1aa6720 Started on chords support 2016-01-03 18:01:44 +01:00
Ken Roberts a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Tim Bentley 9c2b472ee8 prints 2016-01-01 20:39:26 +00:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Ken Roberts f864a24f9a Fix typo in pin code hashing 2015-12-29 06:01:22 -08:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley 6b60573740 UI changes 2015-10-16 17:30:13 +01:00
Tim Bentley 742e0c912b Plug item 2015-10-16 17:26:01 +01:00
Tim Bentley 21743e4472 fix length 2015-09-10 21:35:14 +01:00
Jonathan Springer eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Tomas Groth bdecfbf3e9 Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703. 
Fixes: https://launchpad.net/bugs/1463703
 2015-06-10 17:14:23 +02:00
Tomas Groth 6f5a139329 Normalize file path to OS standard after drag-and-drop. Fixes bug 1440571. 
Fixes: https://launchpad.net/bugs/1440571
 2015-04-07 23:20:30 +01:00
Tomas Groth 335c804e8f Fix support for special characters in theme names. Fixes bug 1438563. 
Fixes: https://launchpad.net/bugs/1438563
 2015-04-02 10:04:56 +01:00
Raoul Snyman 54c23cc7bd Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click 
Fixes: https://launchpad.net/bugs/1419300
 2015-03-07 00:18:51 +02:00
Phill Ridout a6dfbdcf71 fix upgrade_db 2015-02-18 21:13:12 +00:00
Tomas Groth 7c0386b7c0 Fixes for mysql as db backend 
bzr-revno: 2504
 2015-02-17 19:50:18 +00:00
Tim Bentley 870b69b497 Remove cache for http authentication 
bzr-revno: 2503
 2015-02-17 19:49:16 +00:00
Philip Ridout f7cb420a31 Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog. 
Also added a ValidationError exception class, to tidy up the unzip code slightly

bzr-revno: 2501
 2015-02-17 05:51:24 +00:00
Philip Ridout 16758d1b80 Fixes bug1073931 "Corrupted databases stop OpenLP from starting" 
Checks if the database session is available before trying to use it.
Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256

bzr-revno: 2500
 2015-02-17 05:47:19 +00:00
Tomas Groth aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888. 
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
 2015-02-14 15:11:11 +00:00
Tim Bentley 58f10d3b6b Fix cache for http authentication 2015-02-14 09:12:35 +00:00
Phill Ridout 6ca70bbc5c New line at end of file 2015-02-13 23:27:25 +00:00
Phill Ridout 2eb58a56bd PEP fixes 2015-02-13 23:21:57 +00:00
Phill Ridout af2467ed93 Check for theme version. Implement a custom exception 
Fixes: https://launchpad.net/bugs/1419691
 2015-02-13 21:47:06 +00:00
Phill Ridout e35a1d7763 head 2015-02-12 21:35:26 +00:00
Phill Ridout b427e216f1 small fixes 2015-02-12 21:24:39 +00:00
Tomas Groth 8c8fbe45b2 Fixes to make mysql db work 2015-02-11 20:56:13 +00:00
Ken Roberts a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
Tomas Groth 7287759ba5 Fixed a string 2015-02-03 23:41:30 +00:00
Ken Roberts b02d44416a Allow md5check to use non-ascii encoding, added md5_filecheck 2015-02-02 10:00:39 -08:00
Phill Ridout 4c36bba911 head 2015-02-01 21:40:59 +00:00
Phill Ridout 6d2b1d958e Better handle failed downloads 2015-01-31 21:52:02 +00:00
Tim Bentley 6f76c164e0 fix delete 2015-01-30 21:15:03 +00:00
Philip Ridout 5390ed5bac Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail 
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)

Also added code to remove the old thumbnails.

bzr-revno: 2487
 2015-01-24 18:24:51 +00:00
Philip Ridout c43823a2b0 Fixes the copyright headers 
bzr-revno: 2484
 2015-01-22 19:46:04 +00:00
Phill Ridout 051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout 75dff3d2be HEAD 2015-01-22 17:31:00 +00:00
Phill Ridout 7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Phill Ridout 4d749a89ac Presentation fixes 2015-01-20 21:56:05 +00:00
Ken Roberts 745a3e3ef8 Remove translations from error code number strings 2015-01-19 14:36:53 -08:00
Raoul Snyman de213b0f66 Copyright cleanup time, 
bzr-revno: 2479
 2015-01-19 08:34:29 +00:00