Commit Graph

1978 Commits

Author SHA1 Message Date
b657d255cc Remove blank line
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 22:58:27 +02:00
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
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
14b351f2ae HEAD
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
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
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
f92302a41e HEAD 2016-08-12 12:30:07 +02:00
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
0fc598fab5 HEAD 2016-08-10 11:13:45 +02:00
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
a89495063e merge trunk 2016-08-07 13:52:42 -07:00
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
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
0dcae022bc some pep8 fixes 2016-07-24 22:49:00 +02:00
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
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
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
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
785257020d Fix some linting issues 2016-07-17 21:46:06 +02:00
65fe62d69f Fix some linting issues 2016-07-17 21:33:10 +02:00
97d6586462 Fixed another part of the permission denied error 2016-07-17 21:12:00 +02:00
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
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
f7532b7896 pep8 2016-06-25 07:41:06 -07:00
d3a2dd399a Fix missing format key, updated test 2016-06-25 04:39:57 -07:00
de754e2cb1 Convert exceptionform._create_report to return dict 2016-06-24 05:39:47 -07:00
8806a06ab9 Test cleanups 2016-06-17 19:45:02 -07:00
7cc56af2bb bugfix 1593883 pjlink authenticatino test 2016-06-17 19:02:53 -07:00
aaba690c97 Fix call to wrong signal on error 2016-06-17 16:05:26 -07:00
c64df391aa bug 1593882 fix 2016-06-17 15:46:21 -07:00
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
018f6f8af5 Fix spelling 2016-06-16 08:07:34 -07:00
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
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
828741ec84 Remove testing verbosity flag 2016-06-07 06:21:07 -07:00
5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
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
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
ed7ea01f43 Tests fixes and updates 2016-06-03 22:38:51 -07:00
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
ec8ace4929 Fixed up some issues and refactored a method that wasn't actually a test. 2016-06-02 01:14:58 +02:00