Commit Graph

1574 Commits

Author SHA1 Message Date
Tomas Groth
825a703cd0 pep8 fixes 2016-08-19 17:05:44 +02:00
Tomas Groth
c463c46cf6 Fixed various bugs in the songbeamer chord import, and added a test. 2016-08-19 16:51:23 +02:00
Tomas Groth
25c268145a merge trunk 2016-08-18 21:04:44 +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
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
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
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
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
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
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
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
suutari-olli
b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03: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
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