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

3054 Commits

Author SHA1 Message Date
Phill Ridout 9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
Ken Roberts d50029c636 Merge trunk 2017-11-14 16:19:49 -08:00
Ken Roberts 3d4ed035e9 PJLink2-L updates 2017-11-10 03:59:38 -08:00
Phill Ridout 536a187fb9 PEP8 2017-11-09 20:39:17 +00:00
Raoul Snyman 6718be4cff HEAD 2017-11-03 15:31:48 -07:00
Phill Ridout 94dd107abe Changed merged errors 
Fixes: https://launchpad.net/bugs/1400415
 2017-11-03 20:55:41 +00:00
Phill Ridout 960ddedc6f make tidy text part of core.\nRemove redundant (since py3) re.UNICODE flag 
Fixes: https://launchpad.net/bugs/1727517
 2017-10-28 11:04:09 +01:00
Phill Ridout fe5430e157 HEAD 2017-10-27 22:11:29 +01:00
Raoul Snyman d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
Raoul Snyman 53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
Raoul Snyman 15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
Raoul Snyman bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
Philip Ridout 779e95b523 Fix for samuel_m issue and bug #1672229 2017-10-08 18:33:03 +01:00
Raoul Snyman b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Raoul Snyman 26c78b374a HEAD 2017-10-04 23:28:57 -07:00
Raoul Snyman 640ebf8c3c Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken. 2017-10-04 00:44:08 -07:00
Tim Bentley b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley d77f0127e8 head 2017-09-29 19:42:15 +01:00
Philip Ridout 1cfb152395 some WebEngine fixes 2017-09-29 19:06:04 +01:00
Philip Ridout 6780a44496 fixes 2017-09-29 18:31:35 +01:00
Tomas Groth 359362126a merge trunk 2017-09-26 20:43:35 +02:00
Philip Ridout 69fca430b5 HEAD 2017-09-26 17:42:54 +01:00
Philip Ridout 10b13872e5 Modify themes to work with pathlib 2017-09-26 17:39:13 +01:00
Raoul Snyman 4bb031b22e HEAD 2017-09-25 12:55:33 -07:00
Tomas Groth 1481f747f1 merge trunk 2017-09-25 21:41:55 +02:00
Tomas Groth 3094b053ff Various adjustments, main window starts now, still no canvas. 2017-09-25 20:59:43 +02:00
Philip Ridout 047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
Raoul Snyman 50511c4953 HEAD 2017-09-22 21:04:41 -07:00
Phill 35e9300be2 More pathlib changes, focused mainly on the presentation plugin 
Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/pathlib5 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2193/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2096/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1983/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1353/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/...

bzr-revno: 2768
 2017-09-22 20:53:59 -07:00
Ken Roberts 3e05a64874 PJlink2 update K 2017-09-22 05:03:28 -07:00
Philip Ridout b440584cb5 Moved the patched shuilils to the path module 2017-09-20 21:44:57 +01:00
Tomas Groth 3923601202 Initial copy of new renderer into the source tree plus some rearranged files. Nothing working or running yet. 2017-09-19 21:52:24 +02:00
Philip Ridout d801ca9b09 Test patched which method 2017-09-18 07:20:06 +01:00
Philip Ridout 7f98003d54 test fixes 2017-09-17 20:43:15 +01:00
Philip Ridout 8ed5903ced Moved most of the presentation plugin over to pathlib 2017-09-15 20:01:09 +01:00
Raoul Snyman 1e06f472c6 HEAD 2017-09-08 22:23:37 -07:00
Raoul Snyman a6324b6b7f Refactor version check threading 2017-09-08 22:19:22 -07:00
Philip Ridout 9cb2b2e3c2 Pathlib changes 2017-09-05 21:48:55 +01:00
Tim Bentley 7abef1df22 fix lables and render bug 2017-08-27 18:13:14 +01:00
Tim Bentley b546f3cecb Head 2017-08-27 17:26:06 +01:00
Philip Ridout 8f9cb4a090 Modify setting upgrade code to provide versioned updates. Upgrade settings to use JSON encoded Path objects 2017-08-26 16:06:11 +01:00
Philip Ridout f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Phill cd158b63fd Part 3, converted some more utility methods 
Fixed the problem TGC was having.

Superflys fix included (https://bin.snyman.info/mmm5sqj8)

lp:~phill-ridout/openlp/pathlib3 (revision 2764)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2175/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2079/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1966/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1336/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_C...

bzr-revno: 2762
 2017-08-24 21:26:25 -07:00
Theodore Frederick ae62538a02 Adds option to ignore aspect ratio and stretch image. 
bzr-revno: 2761
 2017-08-23 21:21:11 +01:00
Philip Ridout 6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00
Ken Roberts 46f88e418a More minor code cleanups 
- Renamed get_shutter_status to get_av_mute_status (checks shutter and audio)
- Renamed shutter/audio mute test
- Update socket read to get 1K bytes in buffer
- Updated get_status for valid input
- Updated process_sver check valid length
- Update change_status to not use NETWORK_SENDING as a connection status check
- Added read check for packet length > allowed max
- Added test for process_inf1
- Added test for process_inf2
- Added test for process_info
- Added test ...

bzr-revno: 2760
 2017-08-23 20:46:30 +01:00
Ken Roberts 6d353dc8e1 Fix deprecated log calls 2017-08-12 13:38:50 -07:00
Philip Ridout b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Ken Roberts f30d7f20d3 PJLink update I - minor code cleanups and new tests 2017-08-12 02:48:38 -07:00
Tim Bentley 63a5c3bd91 head 2017-08-11 21:47:52 +01:00
Phill 081c5fe7a0 Definitely ready for merging, unless, of course you guys find some more issues! 
Part 2

Changed the pathedit widget over to using pathlib
Added a 'patched' file dialog
Added a few utility methods

lp:~phill-ridout/openlp/pathlib2 (revision 2763)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2125/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2033/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1938/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis...

bzr-revno: 2758
 2017-08-11 21:31:09 +01:00
Ken Roberts e7ec732f1e Projector code cleanups "H" and new tests 2017-08-11 04:04:33 -07:00
Tim Bentley 7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00
Philip Ridout 8eb207b67c Head 2017-08-07 21:51:50 +01:00
Philip Ridout e6faf233ed Merge fixes 2017-08-07 21:50:01 +01:00
Ken Roberts df47a4b6eb Code cleanups 2017-08-06 16:33:53 -07:00
Ken Roberts 864fd291a0 PJLink2 update G - restructuring 2017-08-06 00:23:26 -07:00
Philip Ridout 03bcc194ea Update the path edit component to use the pathlib module. Add a few utility methods 2017-08-04 18:40:57 +01:00
Tim Bentley c2321e7c10 Merge head 2017-08-03 18:54:40 +01:00
Philip Ridout e787896931 test fixes 2017-08-02 07:09:38 +01:00
Philip Ridout 63bd98372a Move applocation over to using pathlib 2017-08-01 21:59:41 +01:00
Ken Roberts 08848a14e7 Added calls to new functions 2017-07-20 08:31:50 -07:00
Ken Roberts f333d8d7a0 Ooops - removed commented code no longer needed 2017-07-12 06:01:46 -07:00
Ken Roberts e277c804f9 Cleanups part 3 2017-07-07 16:43:50 -07:00
Ken Roberts d072dd4063 Drop future import comments 2017-06-28 20:19:13 -07:00
Ken Roberts 44fb799c7a noqa cleanlups 2017-06-28 19:58:08 -07:00
Tim Bentley 77aea3e27a head 2017-06-25 18:04:07 +01:00
Ken Roberts 0e2019faf2 PJLink update F 2017-06-24 19:21:07 -07:00
Ken Roberts bd3bedcaf4 -- Fix docstring for pjlink2 db upgrade 
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...

bzr-revno: 2751
 2017-06-22 17:54:33 +01:00
Ken Roberts d4d556e39d Minor cleanups on kwargs 2017-06-16 17:25:06 -07:00
Samuel Mehrbrodt 51e644711d Remove blank lines 2017-06-12 22:53:08 +02:00
Samuel Mehrbrodt 885a1bad01 Merge trunk 2017-06-12 20:04:49 +02:00
Tim Bentley da51b046b2 Head 2017-06-09 16:56:40 +01:00
Ken Roberts 79ad031272 Fix missing sqlalchemy exception import 2017-06-09 07:04:52 -07:00
Ken Roberts 208c1b022f Test for db upgrade skip 2017-06-09 06:45:18 -07:00
Ken Roberts 4b22def91d More db fixes 2017-06-09 05:12:39 -07:00
Philip Ridout c0f2a9a777 HEAD 2017-06-09 07:06:49 +01:00
Azaziah 80d30bf272 Fixed bugs: 
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...

bzr-revno: 2749
 2017-06-08 19:17:14 +01:00
Tim Bentley 1c4f335f23 head without some chords stuff! 2017-06-06 21:58:12 +01:00
Olli Suutari d247cf2388 Fixed bug: https://bugs.launchpad.net/openlp/+bug/1694732 2017-06-04 17:03:41 +03:00
Olli Suutari 3e70173be4 Renamed "last search type" to "last used search type" 2017-06-04 12:52:15 +03:00
Samuel Mehrbrodt 66c9f8eb82 made use of pystache for footer generation being configurable in song settings 
- removed now obsolete and via template better configurable options to display "songbook", "written by" and "copyright" information in footer
- added explanation box for so far used settings as pystache placeholders
- added songs configuration setting for template including reset button
- added default template replacing currently existing configuration as best as possible (should be backwards compatible or at least be adaptable to correspond to former settings)
- adjusted tests to new and removed functionality

Fixes: https://launchpad.net/bugs/1695620
 2017-06-04 01:31:47 +02:00
Ken Roberts 9f8433a18e Merge trunk 2017-06-01 15:36:38 -07:00
Ken Roberts 0fc49e3df1 Translations and more minor cleanups 2017-06-01 15:35:57 -07:00
Philip Ridout 2915a8f0e7 Head 2017-06-01 07:18:47 +01:00
Ken Roberts 80369c8b0b pylint fixes - minor cleanups 2017-05-30 16:26:37 -07:00
Philip Ridout a4ffbce6c3 HEAD 2017-05-30 19:50:39 +01:00
Philip Ridout a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Ken Roberts 3ea37800b7 Fix db.Manager upgrade/PJlink2 update D 2017-05-27 11:21:24 -07:00
Tim Bentley 3b7852b569 clean up pep8 2017-05-24 20:55:30 +01:00
Tim Bentley 32668193c6 fix up tests 2017-05-24 20:31:48 +01:00
Tim Bentley 6fe9dfeb04 Head 2017-05-23 06:00:42 +01:00
Philip Ridout 234ba34a5b Head 2017-05-22 19:27:40 +01:00
Ken Roberts 8ee2c0b549 -- Update test data for Class 2 tests 
-- Update Projector() db class with new data
-- Update test_projectordb tests
-- Rename PJLink1 class to PJLink
-- Fix/update power on/off tests (Qt error not caught properly during test)
-- Remove skip from projector constants test

--------------------------------
lp:~alisonken1/openlp/pjlink2-c (revision 2739)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2020/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1930/
[SUCCESS] https://ci...

bzr-revno: 2740
 2017-05-22 17:26:45 +01:00
Phill cf4a39732b Fix the depreciated code, and refactor it. 
lp:~phill-ridout/openlp/import-depreciations (revision 2736)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2013/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1923/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1859/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1239/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1097/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/226/
[FA...

bzr-revno: 2738
 2017-05-22 17:25:44 +01:00
Tim Bentley cad03b9abd fix tests 2017-05-21 17:06:40 +01:00
Ken Roberts cb5c0f82a3 PJlink class 2 updates C 2017-05-19 22:51:58 -07:00
Ken Roberts 81be8f5093 - Added PJLINK_DEFAULT_CODES to pjink1 imports 
- Refactor command class checks and methods
- Update PJLink1.get_data for UTF-8
- Added method to clear busy flags and send received data signals
- Added class check on command reply data v. stated projector class compatibility
- Added test for PJLink1.socket_abort
- Added test for PJLink1.poll_loop
- Fix regression in test_projector_process_power_on

--------------------------------
lp:~alisonken1/openlp/pjlink2-b (revision 2735)
[SUCCESS] https...

bzr-revno: 2737
 2017-05-17 21:35:43 +01:00
Ken Roberts 503c6e3f69 Initial PJLink class 2 updates 
- Converted PJLINK_DEFAULT_CODES from a static dictionary to dynamically-built dictionary
- Added _not_implemented method to be able to list future methods while updating
- Added class list to hold future method functionality
- Added class list for UDP commands
- Added test for building PJLINK_DEFAULT_CODES dictionary
- Added test for _not_implemented method
- Removed extraneous TODO

--------------------------------
lp:~alisonken1/openlp/pjlink2-a (revision 27...

bzr-revno: 2736
 2017-05-17 21:34:14 +01:00
Tomas Groth 5988f1c56a Fixed an issue and added a test. 2017-05-17 22:06:45 +02:00
Ken Roberts 23047ae354 Remove extraneous TODO 2017-05-15 09:32:20 -07:00
Philip Ridout be9d9c45ff Reworked the extension_loader function 2017-05-15 11:09:59 +01:00
Philip Ridout 70019b570b Update and refactor dynamic import code 2017-05-14 11:11:10 +01:00
Ken Roberts ed144657bc PJLink class 2 updates 2 2017-05-13 02:00:29 -07:00
Tim Bentley 48a87780d4 theme clean up 2017-05-13 08:47:22 +01:00
Philip Ridout 353b2b3067 Implement a custom widget for editing paths 2017-05-12 22:05:50 +01:00
Ken Roberts a5335adbc4 Initial PJLink class 2 updates 2017-05-12 02:51:56 -07:00
Tomas Groth 7f64106acb Fix a traceback when serviceitem type isn't set 2017-05-05 20:47:19 +02:00
Theodore Frederick a4d7ed13cc Add Option to Ignore Aspect Ratio and Stretch Images 2017-04-30 04:26:32 -05:00
Theodore Frederick a09a8f3edd Stretch Images When Ignore Aspect Ratio Setting is True 2017-04-30 04:05:28 -05:00
Theodore Frederick 2c149d9e60 Stretch Images When Ignore Aspect Ratio Setting is True 2017-04-30 04:00:31 -05:00
Theodore Frederick 1abf02af6c Updated resize_image to Optionally Ignore Aspect Ratio 2017-04-30 03:47:01 -05:00
Tomas Groth bdfac76483 improve db cleanup 2017-04-25 21:36:37 +02:00
Tomas Groth e9e7285b8c remove session instead of close to release file. 2017-04-25 21:18:03 +02:00
Tomas Groth 3b46b8416d Only convert bracket tags to chords on songs when chords are enabled. 2017-04-25 20:46:50 +02:00
Tomas Groth 55f63a0a0f Only convert bracket tags to chords for songs. 2017-04-25 16:41:35 +02:00
Tomas Groth d36d576dc9 Added another chord test. 2017-04-18 21:20:36 +02:00
Tomas Groth 5187b7b945 Added some tests and fixed a bug. 2017-04-11 14:44:28 +02:00
Tomas Groth 9ae1af72c7 Minor adjustsments + a test. 2017-03-17 22:12:29 +01:00
Tomas Groth 31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01:00
Tim Bentley 7a72b2cad4 download and deploy works 2017-03-05 09:23:28 +00:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +00:00
Tomas Groth dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth aac10c5d2c more chord polish... 2017-02-23 22:40:22 +01:00
Tomas Groth cec3cf5f96 More chord polishing. 2017-02-20 22:22:17 +01:00
Tomas Groth 32794d7e97 Reintroduced span-based chord html for main and stage view. 2017-02-19 22:35:40 +01:00
Philip Ridout 162c178d6e HEAD 2017-02-18 07:23:15 +00:00
Tomas Groth 045e12e6c4 Added support for printing chords. 2017-02-02 22:55:05 +01:00
Tomas Groth 111826dd69 Added better support for rendering formatting tags when using chords. 2017-02-02 21:32:35 +01:00
Tomas Groth dda37552d1 More chord-table stuff.. 2017-01-29 22:25:52 +01:00
Tomas Groth c3a953ce1b More work on using tables. 2017-01-28 23:04:16 +01:00
Tomas Groth 02d6a42ac4 fix missing end spaces 2017-01-26 22:14:19 +01:00
Tomas Groth 56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
Tomas Groth 82aa92698e First steps for using tables instead for spans. 2017-01-25 22:08:30 +01:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tomas Groth d1bca6d52a trunk 2016-12-23 10:14:22 +01:00
Tim Bentley 126c5462a0 Head 2016-12-22 15:12:03 +00:00
Tim Bentley 4008ed008f Move url size 2016-12-20 21:20:54 +00:00
Philip Ridout e261d2e1ba Refactors 2016-12-18 15:10:05 +00:00
second@tgc.dk 20ab44be0f Continuation of lp:~suutari-olli/openlp/bug-fixes-2-4-3 
This branch fixes the following bugs:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1513490: List of authors uses localized "and" instead of English
Bug #1624661: Missing DB in unmounted disk results in Traceback 

bzr-revno: 2706
 2016-11-22 21:34:14 +01:00
Tomas Groth b31d5ad08e pep8 fix 2016-11-21 21:56:48 +01:00
phill.ridout@gmail.com f6de30de23 Move the "no results" code in to the list widget. 
lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_...

bzr-revno: 2705
 2016-11-16 00:44:11 +02:00
Tomas Groth bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Philip Ridout 80793f9412 Modified SaveEdit, so that it saves the chosen search type 2016-11-11 21:23:03 +00:00
Philip Ridout 94fca706ff Move no results functionality to the ListWidgetWithDnD 2016-11-10 07:09:04 +00:00
Philip Ridout ec19cc5f07 Modified some resources and added test 2016-10-30 08:29:22 +00:00
Philip Ridout 997cb859d3 Changed some icons to use svg 2016-10-27 18:45:50 +01:00
Olli Suutari aef0941e18 - Modified the def create_separated_list by suggestions of TRB143 2016-10-17 22:42:07 +03:00
Olli Suutari 340b2f3298 - Actually fixed the missing DB bug. 2016-10-17 07:17:33 +03:00
Olli Suutari 0887ca6645 - Removed self from def handle_db_error 2016-10-04 17:21:40 +03:00
Olli Suutari 5d9d76f62d pep8 2016-10-04 17:14:28 +03:00
Olli Suutari 39916d59ed - Attempt to fix jen 2016-10-04 17:09:53 +03:00
Olli Suutari ebdad8519f - Added one missing empty row 2016-10-04 16:31:09 +03:00
Olli Suutari be9c394b63 - For jenkins 2016-10-04 16:27:41 +03:00
Olli Suutari 7ee7ef8846 - Not sure why the db bug is fixed in this branch 2016-10-04 16:07:53 +03:00
Olli Suutari 421555e578 - Improved one comment 2016-10-04 15:27:52 +03:00
Olli Suutari ece524e2a1 - def handle_db_error now uses except FileNotFoundError to handle the missing data path 2016-10-04 15:16:42 +03:00
Olli Suutari 869caa9bf5 - pep8 (one ident) 2016-10-04 10:27:08 +03:00
Olli Suutari 036907eb5e - Changed "&" back to "and" 2016-10-04 03:03:15 +03:00
Olli Suutari 946fb02d57 The def create_separated_list now uses the perfectly made and re-formatted code by the mastermind alisonken1 2016-10-02 21:57:38 +03:00
Olli Suutari c7a682ebfb - The footer now follows proper english grammar rules. 2016-10-02 20:03:59 +03:00
Olli Suutari cff02e6b7a Fixed bug: 1513490 2016-10-02 18:51:16 +03:00
Olli Suutari 4471338a19 - Fixed bug 1624661 2016-10-02 14:31:35 +03:00
Tomas Groth 25c268145a merge trunk 2016-08-18 21:04:44 +02: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
Tim Bentley 304032cd7d Merge and fix mess 2016-08-12 06:15:56 +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
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 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
Philip Ridout 97dbc85918 move chardet function in to core 2016-08-07 20:29:35 +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
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
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01: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