Commit Graph

10905 Commits

Author SHA1 Message Date
Tim Bentley c6c7931323 head 2016-08-14 10:23:12 +01:00
Raoul Snyman 14b351f2ae HEAD
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
Raoul Snyman fbd9b330a3 Fix another pep8 issues 2016-08-13 16:50:15 +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
Tim Bentley f38ad2cc14 move startup code 2016-08-13 06:18:46 +01:00
Tim Bentley 7f22d9c223 add files http_endpoint 2016-08-13 06:03:12 +01:00
Tim Bentley 43a539db64 remove http_endpoint 2016-08-13 06:02:54 +01:00
Tim Bentley fa19108885 tidy up media 2016-08-12 20:16:39 +01:00
Tim Bentley eceaf90a64 pep8 2016-08-12 20:03:35 +01:00
Tim Bentley f2d936c3d3 pep8 2016-08-12 19:59:45 +01:00
Tim Bentley 225160be24 Head 2016-08-12 19:21:30 +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
Tim Bentley 304032cd7d Merge and fix mess 2016-08-12 06:15:56 +01:00
suutari.olli@gmail.com 6f5495bcbf 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: 2691
2016-08-12 00:12:50 +02:00
Tim Bentley 0da295f834 move core endpoint definitions 2016-08-10 22:19:00 +01:00
Tim Bentley e31f3b8603 left old code 2016-08-10 22:07:36 +01:00
Tim Bentley 098697a2cc more endpoint moves 2016-08-10 21:52:27 +01:00
Philip Ridout d5f5a33680 Stylistic changes 2016-08-10 20:08:09 +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
Ken Roberts c35a2d1430 String conversions with templates part 1
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
2016-08-10 19:29:21 +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 f1b25ef503 Moved importers in to dedicated directory 2016-08-09 21:45:25 +01:00
Philip Ridout 74607afbfc Add OpenLPMixin to bible importer 2016-08-09 20:32:29 +01:00
Philip Ridout 27731dbbbc Removed old bible upgrade form 2016-08-09 20:14:52 +01:00
Philip Ridout b502c0b79d Moved get file encoding from lib to common 2016-08-09 07:24:04 +01:00
Tim Bentley 80f927f5d6 Tidy up code more 2016-08-08 22:01:09 +01:00
Philip Ridout b65b05de70 PEP fixes 2016-08-08 21:08:07 +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 ff56739f35 String format error 2016-08-07 14:08:03 -07: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
Philip Ridout 97dbc85918 move chardet function in to core 2016-08-07 20:29:35 +01:00
Tim Bentley 3593e21033 Add media endpoints 2016-08-07 20:08:29 +01:00
Tim Bentley cade36a332 Head 2016-08-07 19:37:15 +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
Philip Ridout 1abcff7519 PEP fixes 2016-08-07 12:20:53 +01:00
Philip Ridout 2d9db0a0bd one of these days i may remember to add files to bzr when i create them 2016-08-07 11:29:58 +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 61b591f555 pep8 2016-08-05 12:57:25 -07: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