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

2042 Commits

Author SHA1 Message Date
Philip Ridout e91b87da8c Start on osis importer. Some further improvements of other importers 2016-08-28 22:03:04 +01:00
Philip Ridout 9b41814511 Merge from yet-more-refactors 2016-08-27 14:33:21 +01:00
Olli Suutari 46a7c92a90 - Merged trunk 2016-08-25 22:27:55 +03:00
Philip Ridout 28d94b7d10 moved some static methods to module level 2016-08-21 21:36:59 +01:00
Philip Ridout 894b4fbf10 revert changes to http.py due to circular references 2016-08-20 21:00:50 +01:00
Olli Suutari 4733aa2169 - Removed modifications to test_mainwindow. 2016-08-20 22:17:00 +03:00
Olli Suutari 8224e39a2c - Added test 2016-08-20 22:14:15 +03:00
Olli Suutari 685c01ec25 - Renamed test title from x_test to test_x 2016-08-20 21:59:31 +03:00
Philip Ridout 7c77d7e8bd Refactor of OpenSong Bible importer + 100% test coverage 2016-08-20 19:12:42 +01:00
Olli Suutari b5c4cb1f85 - pep8 fix (2x blank line) 2016-08-20 01:53:20 +03:00
Olli Suutari 345978286b - Added a test. 2016-08-20 01:49:51 +03:00
Philip Ridout 46b6d041cd Opensong refactors and tests 2016-08-18 07:31:36 +01:00
Philip Ridout 6ab2686b09 Modify CSV Importer and test to give 100% coverage! 2016-08-16 21:36:21 +01:00
Philip Ridout 9d5829e3a5 head 2016-08-16 19:49:47 +01:00
Raoul Snyman b657d255cc Remove blank line 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 22:58:27 +02:00
Raoul Snyman 693c18a23a Add some tests for the MediaShout importer 2016-08-14 22:48:36 +02:00
Philip Ridout f08d0c28a5 further bible refactors 2016-08-14 11:00:27 +01:00
Raoul Snyman c2b05e3454 Fix bug #1547964 by ignoring the exception (it's harmless) 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 10:24:17 +02:00
Raoul Snyman 14b351f2ae HEAD 
Fixes: https://launchpad.net/bugs/1608194
 2016-08-13 16:57:38 +02:00
Raoul Snyman 2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
Raoul Snyman 879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Philip Ridout 2416009860 HEAD 2016-08-12 20:16:12 +01:00
raoul@snyman.info c79917502b Update slot signatures to comply with PyQt5.6's stricter checks. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2693
 2016-08-12 18:28:34 +01:00
phill.ridout@gmail.com a503c1a0f9 Some more bible refactors. Mainly focusing on xml parsing and the csv importer 
lp:~phill-ridout/openlp/more-bible-refactors (revision 2699)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1708/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1619/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1319/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/909/
[SUCCESS] htt...

bzr-revno: 2692
 2016-08-12 18:26:54 +01:00
Raoul Snyman f92302a41e HEAD 2016-08-12 12:30:07 +02:00
Raoul Snyman c9ff88ebfc Removed a log line I never wrote and move a variable for a test I need it in 2016-08-12 12:24:54 +02:00
Philip Ridout 83b30799ca finished up with tests 2016-08-11 20:34:55 +01:00
Philip Ridout 0617f71134 split out web bible importers 2016-08-11 20:03:58 +01:00
Philip Ridout 5ac5c6cd68 split the web bible importers out io their own files 2016-08-11 20:02:29 +01:00
Philip Ridout 226432a3c3 head 2016-08-11 18:38:20 +01:00
Olli Suutari 50131ba202 - Merged trunk and resolved conflict that was created by ui-messages-part-1 branch. 2016-08-10 21:50:40 +03:00
suutari.olli@gmail.com ae81497fe3 This branch includes various UI string changes, such as: 
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2688
 2016-08-10 19:31:33 +01:00
Raoul Snyman 0fc598fab5 HEAD 2016-08-10 11:13:45 +02:00
Raoul Snyman 51f3a0f406 Fix some slot signatures that were the incorrect type 2016-08-10 11:07:49 +02:00
Olli Suutari fc3b2f021e - Merged trunk on 10/8/16. 2016-08-10 00:37:59 +03:00
Philip Ridout 9d43344a92 pep fixes 2016-08-09 21:56:04 +01:00
Philip Ridout 4866dce071 test fixes 2016-08-09 21:49:52 +01:00
Philip Ridout f1b25ef503 Moved importers in to dedicated directory 2016-08-09 21:45:25 +01:00
Philip Ridout b502c0b79d Moved get file encoding from lib to common 2016-08-09 07:24:04 +01:00
Philip Ridout a0882bd523 Refactor csv importer 2016-08-08 21:02:18 +01:00
Philip Ridout a78c3d67e7 head 2016-08-08 19:11:32 +01:00
Philip Ridout e9ec672756 improved encoding detection code. Tests added 2016-08-08 19:09:33 +01:00
Ken Roberts a89495063e merge trunk 2016-08-07 13:52:42 -07:00
Ken Roberts 1ff94a74a3 Qt5 updates for projector/signal mismatches 2016-08-07 13:51:35 -07: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
Philip Ridout 1abcff7519 PEP fixes 2016-08-07 12:20:53 +01:00
Philip Ridout a4d6120bd4 Refactor xml parsing and language detection out in to a bible importer class 2016-08-07 11:15:43 +01:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Philip Ridout 8257dbb282 HEAD 2016-08-03 21:27:05 +01:00
Philip Ridout d9d740ad8b Style fixes 2016-08-03 21:10:41 +01:00
Philip Ridout db00a3980f Missed tests 2016-08-03 20:56:53 +01:00
Philip Ridout 60767c8ce4 Fixes bug #917164. A start on refactoring bibles 2016-08-03 18:26:10 +01:00
suutari-olli 7eac4d5e38 - Merged trunk on 2.8.16 2016-08-02 23:18:26 +03:00
Tomas Groth 82faa1da5e Change pylint test so it works with nose2 2016-08-02 21:32:36 +02:00
Tomas Groth 7ca7ae9c07 Ignore distutils errors 2016-08-01 20:49:01 +02:00
Tomas Groth 76be31fee1 Only run pylint tests if specified. 2016-08-01 20:00:58 +02:00
Tomas Groth 189b2dd400 Improve pylint testing, fixed a few issues. 2016-08-01 19:42:29 +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 449b46ab3d merge trunk 2016-07-27 21:01:57 +02:00
Raoul Snyman 0dcae022bc some pep8 fixes 2016-07-24 22:49:00 +02:00
Raoul Snyman ea455d9b32 Write some tests 2016-07-24 22:41:27 +02:00
suutari-olli aa1cd8fa91 - Merged trunk on 24.7.16 
- Added superflys startup traceback fix to my code
- Resolved conflicts
 2016-07-24 23:20:25 +03:00
Tomas Groth 031ae9ebc1 Use BibleGateway standard site instead of the legacy site. Fixes bug 1562384. 
Fixes: https://launchpad.net/bugs/1562384
 2016-07-24 21:49:29 +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
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
Ken Roberts 0150291e4d "- Convert calls to md5_hash and qmd5_hash to use UTF-8 for non-ascii characters 
- Fixed test to verify UTF-8 returns valid ASCII hash
- Switch back to qmd5_hash to stay within the Qt framework

--------------------------------
lp:~alisonken1/openlp/projector-cleanups (revision 2679)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1646/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1495/
[SUCCESS] https://ci.o..."

bzr-revno: 2680
 2016-07-21 23:29:58 +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
Raoul Snyman 785257020d Fix some linting issues 2016-07-17 21:46:06 +02:00
Raoul Snyman 65fe62d69f Fix some linting issues 2016-07-17 21:33:10 +02:00
Raoul Snyman 97d6586462 Fixed another part of the permission denied error 2016-07-17 21:12:00 +02:00
Raoul Snyman 3cdd42bfe0 Catch the PermissionError too 2016-07-17 00:20:56 +02:00
suutari-olli 4874f6a218 - Reduced comments 
- Removed unrequired reg_value from test.
 2016-07-16 19:51:08 +03:00
suutari-olli 39cbafd453 Fixed the tests. 2016-07-16 18:41:39 +03:00
suutari-olli 1c133398e2 Merged trunk on 14.7.16 2016-07-14 21:03:57 +03:00
suutari-olli 7b643b06ac - Tried to make the new text work with the registry changes but failed. 
> Test is broken, do not merge!
 2016-07-14 21:02:23 +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 93fc6e0145 Update Crosswalk webpage parser to match new layout. Fixes bug 1599999. 
Fixes: https://launchpad.net/bugs/1599999
 2016-07-07 22:56:50 +02:00
Tomas Groth 8009bfef85 forgot test file 2016-07-07 22:48:52 +02:00
Tomas Groth 69951133fe Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945. 
Fixes: https://launchpad.net/bugs/1594945
 2016-07-07 22:47:57 +02:00
Tomas Groth 1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth 9294aadae9 Changes to pylint test 2016-07-05 22:30:33 +02:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tomas Groth 668f10a14b more pylint 2016-06-28 22:44:50 +02:00
Tomas Groth 04cb827911 Started work on using pylint for code analysing. 2016-06-27 23:19:53 +02:00
suutari-olli 22ff4247ad - Merged trunk on 27.6.16 2016-06-27 02:23:50 +03:00
Ken Roberts f7532b7896 pep8 2016-06-25 07:41:06 -07:00
Ken Roberts d3a2dd399a Fix missing format key, updated test 2016-06-25 04:39:57 -07:00
Ken Roberts de754e2cb1 Convert exceptionform._create_report to return dict 2016-06-24 05:39:47 -07:00
Ken Roberts 8806a06ab9 Test cleanups 2016-06-17 19:45:02 -07:00
Ken Roberts 7cc56af2bb bugfix 1593883 pjlink authenticatino test 2016-06-17 19:02:53 -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 c8754c86aa Merge trunk fix conflict 2016-06-16 18:08:21 -07:00
second@tgc.dk 45d2640159 "Fix various pyodbc related issues. Fixes bug 1590657. 
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152, https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
 2016-06-16 22:12:27 +02:00
Ken Roberts 018f6f8af5 Fix spelling 2016-06-16 08:07:34 -07:00
Ken Roberts 7a8b519b8c Add test for renderer change to template string 2016-06-16 07:44:32 -07:00
suutari-olli 7c74b50318 - Code cleanup (Removed 2 un-required empty rows) 2016-06-15 00:55:37 +03:00
raoul@snyman.info f052cf99d9 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...

bzr-revno: 2676
 2016-06-14 22:07:18 +01:00
suutari-olli db003d7ec6 - Merged trunk on 14.6.16 
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
 2016-06-14 23:54:36 +03:00
Tomas Groth e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
suutari-olli c249eb1f20 merged trunk on 14.6.16 2016-06-14 01:02:56 +03:00
Ken Roberts 828741ec84 Remove testing verbosity flag 2016-06-07 06:21:07 -07:00
Ken Roberts 5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
Raoul Snyman 0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
Ken Roberts 2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
suutari-olli 9990472586 - Merged trunk on 5.6.16 
- Removed some additional error messages from "Search while typing"
  (Count verses not found in both bibles, no Bibles installed)
 2016-06-05 15:15:51 +03:00
Ken Roberts ed7ea01f43 Tests fixes and updates 2016-06-03 22:38:51 -07:00
Ken Roberts 598d715de6 Initial string conversions for variable templates 2016-06-03 17:15:19 -07:00
Ian Knight 47da0a1c8b Fixed PEP8 Errors 2016-06-02 20:02:34 +09:30
Ian Knight 179bc00fc9 Updated from trunk 2016-06-02 19:57:30 +09:30
Ian Knight 83e11710f2 fixed test naming issue 2016-06-02 10:45:41 +09:30
Raoul Snyman ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00
Raoul Snyman caeb3d3ff7 Found the other tests, Mom! 2016-06-01 23:42:54 +02:00
Ian Knight 3627976132 fixed pep8 error 2016-06-01 13:51:44 +09:30
Ian Knight 7599429065 Merge from trunk 2016-06-01 13:45:43 +09:30
Raoul Snyman 672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
Raoul Snyman 5a6c4f90a1 Fix formatting problems 2016-05-31 18:10:31 +02: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 1782cd8274 "Convert strings from python2 to python3 in plugins part 3 
- Convert strings in plugins/remote
- Convert strings in plugins/songs
- Update projectordb test
- Fix oops in format tag - missed escaping brace(s)

--------------------------------
lp:~alisonken1/openlp/strings-plugins3 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1576/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1425/
[SUCCESS]..."

bzr-revno: 2670
 2016-05-31 16:56:23 +02:00
Ken Roberts c27b676c8c pep8 2016-05-27 22:55:54 -07:00
Ken Roberts 546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
Ken Roberts 9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth 11e7ff5621 trunk 2016-05-26 15:09:03 +02:00
Tomas Groth fd4cfd1eaa Fix traceback during songshowplus import. Fixes bug 1585489. 
Fixes: https://launchpad.net/bugs/1585489
 2016-05-25 09:04:41 +02:00
Tim Bentley 32ef88f807 Fix set_value and adjust tests 2016-05-24 17:28:11 +01:00
Tim Bentley c13b922148 head 2016-05-24 17:18:45 +01:00
Ken Roberts 473772c505 Convert strings in plugins part 2 
- Convert strings in custom
- Convert strings in images
- Convert strings in media
- Convert strings in presentations
- Update projector-pjlink test

--------------------------------
lp:~alisonken1/openlp/strings-plugins2 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1482/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1420/
[SUCCESS] https://ci.openlp.io/jo...

bzr-revno: 2668
 2016-05-24 17:18:25 +01:00
Ken Roberts 801f508a72 Convert strings in plugins part 2 2016-05-21 11:19:18 -07:00
Ken Roberts d52cebdfca Update strings in alerts and bible plugins to python3 2016-05-21 01:31:24 -07:00
Tim Bentley d0f6d21774 Add Working flags 2016-05-21 06:24:05 +01:00
suutari-olli dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
Ken Roberts 7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
Ian Knight e09e867ad1 Pep8 Errors 2016-05-20 23:07:23 +09:30
Ian Knight 2c1c7810b9 Improved test coverage. 2016-05-20 22:57:52 +09:30
Ian Knight 812c124528 Added test case for Auto option. 2016-05-20 22:06:59 +09:30
suutari-olli 165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
Tim Bentley 8507d3e263 fixes 2016-05-18 18:25:16 +01:00
Tim Bentley fd33d9a0c5 fixes 2016-05-18 18:16:40 +01:00
Tim Bentley 7c1e922f10 pep8 2016-05-18 18:06:25 +01: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
Simon Hanna f3e1194956 Add comments to test 2016-05-17 21:35:25 +02:00
Simon Hanna 6bbf783a2e Add test 2016-05-17 21:31:56 +02: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
Ian Knight a7466f1ea7 Check for Div0 and added unit test cases 2016-05-16 22:05:58 +09:30
suutari-olli 334d16d81c - Noticed this had a conflict, fixed it, improved comments 2016-05-15 22:41:13 +03:00
Ken Roberts 7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07:00
Ken Roberts 07468f0093 Fix oops 2016-05-15 10:32:04 -07:00