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

9098 Commits

Author SHA1 Message Date
Tim Bentley 5d740a7706 Removep 
bzr commit -mRemovep
 2014-01-11 22:05:38 +00:00
Tim Bentley b5c2659506 Clean up Song Usage 2014-01-11 22:01:41 +00:00
Tim Bentley 68d8f58b5c Clean up Alerts 2014-01-11 21:46:20 +00:00
Tim Bentley 743ad7b44a Clean up inits 2014-01-11 21:29:01 +00:00
Tim Bentley 7fe95731f9 Fix up Main display 2014-01-11 17:52:01 +00:00
Tomas Groth e958c04659 Make the PdfController reload backend if setting changes. 2014-01-06 12:06:22 +00:00
Tomas Groth d02377f74f Moved PS script into separate file. 2014-01-06 10:51:53 +00:00
Tim Bentley 3a5c15a29a Migrate renderer - cleanup 2014-01-05 17:12:42 +00:00
Tim Bentley 360d9883b4 Migrate renderer 2014-01-05 17:09:51 +00:00
Tim Bentley 8038388110 head 2014-01-04 20:58:46 +00:00
Tim Bentley 60d4009261 start off 2014-01-04 20:58:18 +00:00
Tim Bentley 2dd4a9c542 Add config to service file 2014-01-04 16:33:20 +00:00
Tim Bentley 5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tim Bentley d8ec08e020 Cleaned up Theme and Service Managers Now working the same way. 
Fixed up tests for both classes
PEP8 changes for Alerts and Custom + various other bits in passing.

bzr-revno: 2323
 2014-01-03 21:36:27 +00:00
Tomas Groth b242343d59 Added some docstring documentation. 2014-01-01 15:31:06 +00:00
Tim Bentley 8c71c96222 Fixes for Custom 2014-01-01 10:56:23 +00:00
Tim Bentley db6ba7c780 fix alerts more 2014-01-01 09:57:06 +00:00
Tim Bentley 2755aad4c6 More PEP 8 changes 2014-01-01 09:33:07 +00:00
Raoul Snyman e2fcd3e8cb - Fixed up an import issue 
- Removed old code no longer necessary (from 1.9.4)
- PEP8
 2014-01-01 00:56:02 +02:00
Raoul Snyman 1cf3140073 Reworked SongSelect branch after a major refactor in trunk. 
To recap:
- Added a standalone CCLI SongSelect importer
- Add icons to the import and export menu items
- Move Theme import and export up with Settings
 2014-01-01 00:27:27 +02:00
Tim Bentley 259b2b074f Fix widget 2013-12-31 21:02:35 +00:00
Tim Bentley 51178b2ede Fix tests 2013-12-31 20:29:03 +00:00
Tomas Groth f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Tomas Groth 3cc69cc9fd Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8. 2013-12-31 12:15:18 +00:00
Tim Bentley e49beeb2c4 More tests 2013-12-31 07:27:07 +00:00
Tim Bentley c8a3b33044 Start to fix ServiceManager and extent tests 2013-12-30 19:50:34 +00:00
Andreas Preikschat 80c6c371df FIX: renamed qt method 
bzr-revno: 2322
 2013-12-30 12:13:40 +01:00
Andreas Preikschat 8975fec06e added comment 2013-12-29 21:18:22 +01:00
Tim Bentley 27d651a129 Fix comment 2013-12-29 20:13:58 +00:00
Andreas Preikschat 4c145071af fixed method rename 2013-12-29 21:13:41 +01:00
Tim Bentley f187d86d1e Fix comment 2013-12-29 20:13:40 +00:00
Tim Bentley 8b109a8593 Fix comment 2013-12-29 20:09:41 +00:00
Tomas Groth 84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tomas Groth 7dd3417217 Added tests for the PdfController. 2013-12-29 19:46:04 +00:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tomas Groth 82aaf11860 Fixes for the presentation setting tab 2013-12-28 18:36:33 +00:00
Tomas Groth 47ea300786 Merged with trunk 2013-12-27 17:47:40 +00:00
Tomas Groth 685258b744 Made presenting PDF from the servicemanager work 2013-12-27 17:44:12 +00:00
Tim Bentley 1d9ab33f9f Fix array tag 2013-12-26 20:19:47 +00:00
Tim Bentley 55bb0cd80f Theme wizard and fixes 2013-12-26 17:36:00 +00:00
Tim Bentley 35c5577cb7 More fixes 2013-12-26 08:56:53 +00:00
Tim Bentley 301eb06ce6 Redo ServiceManager 2013-12-24 21:24:52 +00:00
Tim Bentley ccde045e60 More fixes 2013-12-24 20:45:29 +00:00
Tim Bentley da08356f1c yet more clean ups 2013-12-24 15:55:01 +00:00
Tim Bentley 508d050b4c Head 2013-12-24 11:32:56 +00:00
Tim Bentley 80e818bd15 more cleanups 2013-12-24 11:32:38 +00:00
Tim Bentley fdfb2b1294 Done in error 2013-12-24 09:24:32 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley 85da26684c Mediamanager and DND classes 2013-12-24 07:19:57 +00:00
Tim Bentley 7e18ced2c4 Custom cleanup 2013-12-24 07:02:47 +00:00
Tim Bentley b2bee17211 Few minnor fixes 2013-12-24 06:15:41 +00:00
Tim Bentley af006d087a Mainwidow cleanup 2013-12-23 20:43:35 +00:00
Tim Bentley 49dab79ce9 ThemeManager conversion 2013-12-23 07:03:56 +00:00
Tim Bentley a5ca17246f Fix on_slide_select bugs 2013-12-21 08:46:30 +00:00
Raoul Snyman 3204a4db72 - Specify OpenLP as the user agent when querying SF.net 
- Fix another test
- Update tests for get_web_page
 2013-12-20 21:25:42 +02:00
Tim Bentley d4ce5489ad updates and fix up slidecontroller 2013-12-19 20:17:06 +00:00
Raoul Snyman 06d08f61a6 Fix bug #1211049: Add a list of valid user agents and a method to return an appropriate user agent for the current platform 
Fixes: https://launchpad.net/bugs/1211049
 2013-12-18 23:44:00 +02:00
Tim Bentley e9a7850bc8 Add registry mixin and code cleanups 2013-12-15 16:50:09 +00:00
Tim Bentley e93b825ab4 Clean up PluginManager and complete logging 2013-12-14 08:12:41 +00:00
Tim Bentley d684359e59 Clean up exceptions used in error 2013-12-13 19:44:17 +00:00
Tim Bentley 84e90e01d1 new files 2013-12-13 18:42:26 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Jonathan Springer 79a2a5b1db Merge trunk 2013-12-09 07:19:36 -05:00
Jonathan Springer 2a262e4ef6 pass all keyboard events to shortcut dialog 2013-12-08 21:05:52 -05:00
Samuel Mehrbrodt 7e484086dc Merge trunk 2013-12-07 18:35:06 +01:00
Tim Bentley d0a9423982 Head 2013-12-06 19:00:55 +00:00
Tim Bentley f32409b5a5 format changes 2013-12-06 19:00:37 +00:00
Philip Ridout 0883eb8a5d Fixes #1184869 Ensures that there is text in the anchor tag 
bzr-revno: 2315
 2013-12-06 18:57:21 +00:00
Philip Ridout ec87ced59b Fixes Bug 1209515 by sub classing QFileDialog and reimplementing getOpenFileNames and attempting to urlunquote and file paths which do not exist 
bzr-revno: 2314
 2013-12-06 18:56:03 +00:00
Felipe Polo-Wood e9848a2653 Fix the Http router return values 
bzr-revno: 2313
 2013-12-01 20:58:09 +00:00
Tomas Groth ffa3cd32b3 Merged with trunk to resolve conflicts. 2013-11-20 22:42:48 +01:00
Philip Ridout f5573502f3 HEAD 2013-11-16 21:24:18 +00:00
Philip Ridout 81c2f1a4b3 updated tests 2013-11-16 21:04:16 +00:00
Philip Ridout c41842125d HEAD 2013-11-16 20:32:50 +00:00
Philip Ridout 20ae5d13b0 some final cleanups 2013-11-16 10:16:06 +00:00
Philip Ridout 4c8f817269 HEAD 2013-11-16 10:07:38 +00:00
Philip Ridout cc3cdf7126 added some tests for PresentationController 2013-11-16 10:05:41 +00:00
Felipe Polo-Wood e56414e22c Fixed OS specific string 
Coding standard fixes
 2013-11-14 15:33:46 -05:00
Samuel Mehrbrodt dd1d08749e Fix SongBeamer Import and add Testcase 
bzr-revno: 2311
 2013-11-14 21:12:52 +02:00
Arjan Schrijver 27395fcaf6 Rename 'Thurdsday' to 'Thursday' 
bzr-revno: 2310
 2013-11-14 21:07:11 +02:00
Tomas Groth 3acd18c102 Mostly code cleanup of PDF support code. 2013-11-14 17:42:21 +01:00
Andreas Preikschat 1b89900336 head 2013-11-14 10:05:59 +01:00
Felipe Polo-Wood 45bcbe9272 Moved the file_types to module level so they get processed once 2013-11-10 19:13:03 -05:00
Felipe Polo-Wood 20a1a2ad70 Fixed router so response and headers are sent correctly 
Fixed tests so they run on Windows
Added unit test for new method get_content_type
 2013-11-08 13:26:27 -05:00
Philip Ridout 61da0e8ad9 Some refactoring 2013-11-07 20:35:02 +00:00
Philip Ridout bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Philip Ridout 4345608759 fixed issue with not all PPTS not loading correctly using PPTViewer 2013-11-01 19:30:26 +00:00
Raoul Snyman d09747a33a Fixed the problems with the exception form. Not sure how to test it though... 2013-10-30 22:34:23 +02:00
Philip Ridout a69b2d86ef More uneeded str's 2013-10-28 21:23:17 +00:00
Philip Ridout f374c58d39 Tidying up some uneeded str() 2013-10-28 21:15:16 +00:00
Arjan Schrijver f838a49509 fixed bug #1245269 'Thursday is called Thurdsday' 
Fixes: https://launchpad.net/bugs/1245269
 2013-10-27 21:19:19 +01:00
Samuel Mehrbrodt abdc3937ef Small test for PresentationController Constructor 2013-10-27 13:39:13 +01:00
Dmitriy Marmyshev 70144c0da4 Trunk & fixes 2013-10-27 02:53:32 +04:00
Dmitriy Marmyshev e657a99d0b Trunk 2013-10-24 21:09:31 +04:00
Tim Bentley 63d65da6c1 Head 2013-10-23 20:26:03 +01:00
Tim Bentley b1873016c9 Move and tests 2013-10-23 20:25:46 +01:00
Tim Bentley 1022661160 Theme cleanup start and major class restructure 
bzr-revno: 2307
 2013-10-23 19:49:39 +01:00
Samuel Mehrbrodt 43f99b81eb This variable has been renamed. 2013-10-22 17:37:56 +02:00
s.mehrbrodt@gmail.com02 c5ded493cf Merge from trunk 2013-10-22 10:42:56 +02:00
Philip Ridout 76fd5b3da0 Fixed up pptviewcontroller to work with the unicode changes to the c library 2013-10-20 21:49:39 +01:00
Philip Ridout f6c3881d03 Unicodified C Library 2013-10-20 21:42:40 +01:00
Philip Ridout 051fa9db8f Changed logging to UTF-8 2013-10-20 21:34:46 +01:00
Tim Bentley ba0808f551 Fix up json 2013-10-18 19:10:47 +01:00
Tim Bentley 0f183af84d Missed file 2013-10-15 20:17:53 +01:00
Tim Bentley b9e2a2cdc1 Missed imports 2013-10-13 22:07:28 +01:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley a013d17bdd fix tests and add basic test 2013-10-13 18:02:12 +01:00
Tim Bentley b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley 257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Andreas Preikschat f0be2ecc17 head + conflict 2013-10-11 11:48:35 +02:00
s.mehrbrodt@gmail.com02 c471fc79ba Add Songbeamer Import test 2013-10-07 00:07:49 +02:00
Philip Ridout 9ded4fee45 Fix decoding for SongShowPlus imports 
bzr-revno: 2304
 2013-10-05 06:30:00 +01:00
Tim Bentley bd7d412cc9 Head 2013-10-04 20:28:09 +01:00
Tim Bentley 2fe31991e2 Fixes 2013-10-04 20:27:53 +01:00
Tomas Groth a45dfd2d1b Made branch work with python3. 2013-10-04 21:06:31 +02:00
Tomas Groth bc3f2d3422 Merge with python3 changes. 2013-10-03 22:17:44 +02:00
Raoul Snyman 1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
Tim Bentley c240068a6e head 2013-09-28 21:55:42 +01:00
Tim Bentley d630b1525c fix reload 2013-09-28 21:55:25 +01:00
Tim Bentley a1b47f08ad fix ref 2013-09-28 21:43:00 +01:00
s.mehrbrodt@gmail.com fb6336484b Rename variable 2013-09-28 22:24:05 +02:00
Tim Bentley 6533fb5bb0 Fix mime types for JSON 2013-09-28 06:10:44 +01:00
Tim Bentley c05928c3d3 Fix main ui routes 2013-09-27 21:37:42 +01:00
Tim Bentley 8f47af1732 Head 2013-09-26 22:06:57 +01:00
s.mehrbrodt@gmail.com c78a2a1103 Open Songbeamer Files in binary mode to detect the encoding 2013-09-26 18:18:04 +02:00
s.mehrbrodt@gmail.com 9dbb2e12b0 Remove now unused imports 2013-09-26 17:08:27 +02:00
s.mehrbrodt@gmail.com 285508fd2d Fix Import for SongBeamer files 2013-09-26 17:05:10 +02:00
Tim Bentley 870a232e4b Fix mime types add json debugging 2013-09-19 18:05:07 +01:00
Philip Ridout 9631c570b8 HEAD 2013-09-18 21:20:24 +01:00
Dmitriy Marmyshev 1ff6f5fe20 Removes border, but not affects to OSX border and shadow 2013-09-18 10:48:25 +04:00
Dmitriy Marmyshev 3910a582c0 fixed replacing background with video unblank screen even if it blanked to theme. 
Fixes: https://launchpad.net/bugs/1225763
 2013-09-18 08:50:07 +04:00
Oliver Wieland f4ab0b23b8 Add a Checkbox at the Bibles settings tab to show or hide the verse numbers 
bzr-revno: 2299
 2013-09-17 23:06:27 +02:00
Dmitriy Marmyshev 5d648f80c6 fixed transparent display for OS X 
Fixes: https://launchpad.net/bugs/1117098
 2013-09-17 20:23:45 +04:00
Oliver Wieland dc03e288f8 minor changes in event handler 2013-09-16 18:30:59 +02:00
Philip Ridout 52781b9628 more Py3 fixes 2013-09-15 20:42:29 +01:00
Philip Ridout 9f5bd87a50 Py3 Fixes 2013-09-15 20:27:40 +01:00
Philip Ridout a06469fea0 head 2013-09-15 19:36:58 +01:00
Tim Bentley 4d1ba13128 minor fixes 2013-09-15 07:37:43 +01:00
Philip Ridout f725f8a92b filter returns an itterator in Py3 (as apposed to a list in Py2) 2013-09-14 23:22:05 +01:00
Tim Bentley 539ed55777 More cleanups 2013-09-14 22:00:58 +01:00
Tim Bentley b868ecc57d remove reminances of cherrypy 2013-09-14 20:16:14 +01:00
Tim Bentley 2531513ec5 basic working model 2013-09-14 19:46:49 +01:00
Tim Bentley cca76a90bd pass data to functions 2013-09-14 08:22:01 +01:00
Jeffrey Smith 2511332a9e Fix strip_rtf to handle CJK encodings 
bzr-revno: 2297
 2013-09-13 17:13:12 +02:00
Jeffrey Smith 1ef5d00d45 Fix various tests and broken code revealed by tests. 
bzr-revno: 2296
 2013-09-13 17:11:27 +02:00
Tim Bentley 448da916e9 Readonly works - next comes updates 2013-09-12 17:46:57 +01:00
Tim Bentley d0813eddac Start to remove CherryPy 2013-09-11 22:06:17 +01:00
Tim Bentley 5295697677 fix error message 2013-09-11 20:00:30 +01:00
Oliver Wieland 00cb7b8adf fixes wrong url on the remotes tab 
separates determination of the local ip address for easier testing

bzr-revno: 2295
 2013-09-11 16:41:59 +02:00
Andreas Preikschat 4999ecb6e6 last test 2013-09-11 16:22:28 +02:00
Andreas Preikschat f24f3a751f more tests 2013-09-11 15:51:49 +02:00
Andreas Preikschat fea4893f40 removed pritn 2013-09-11 15:30:59 +02:00
Andreas Preikschat 0677e389c1 doc 2013-09-11 15:00:34 +02:00
Jeffrey S. Smith 30618ad60c Explain a complex regex used by strip_rtf 2013-09-10 15:36:46 -05:00
Dmitriy Marmyshev b1adce782e Fixed unicode 2013-09-11 00:29:45 +04:00
Jeffrey S. Smith 334cef478d Fix various tests and broken code revealed by tests 2013-09-09 16:10:40 -05:00
Oliver Wieland e584907718 replaced constant value with enum 2013-09-09 18:32:13 +02:00
Tim Bentley 71f74a53c2 Rename class 2013-09-08 22:13:15 +01:00
Oliver Wieland 86c37481ab doc string added 2013-09-08 21:24:53 +02:00
Oliver Wieland c0d19ec840 rename variable 2013-09-08 18:40:48 +02:00
Oliver Wieland 2aeaa24871 remotetab.py: separate get ip address for metter testing 
test_remotetab.py:tests for get_ip_address
 2013-09-08 18:16:18 +02:00
Andreas Preikschat 3ab4eb36d0 head 2013-09-08 12:30:49 +02:00
Oliver Wieland 5406a44d59 fixes wrong url on the remotes tab 2013-09-08 11:29:36 +02:00
Jeffrey S. Smith 53ac150337 Fix strip_rtf to handle CJK encodings 2013-09-07 22:50:51 -05:00
Philip Ridout 3499f1ee65 missed some instances of unicode 2013-09-07 17:37:40 +00:00
Jeffrey S. Smith a23022d84f Fix EasyWorship importer and its tests for py3 2013-09-07 12:33:36 -05:00
Philip Ridout 44ead21598 HEAD 2013-09-07 17:25:35 +00:00
Philip Ridout 87e7fcdbda added fallback to retieve_windows encoding 2013-09-07 17:18:31 +00:00
Tim Bentley ee6490dc23 Fix missing () 2013-09-07 08:52:52 +01:00
Oliver Wieland 331bd1e9d4 Do not add a space on the front of each verse when no verse number is displayed 2013-09-07 07:30:08 +02:00
Andreas Preikschat ff27607f9b head 2013-09-06 00:41:24 +02:00
Dmitriy Marmyshev df56435f44 fixes 2013-09-05 11:23:59 +04:00
Dmitriy Marmyshev 473d10cf79 styling. 2013-09-04 09:40:20 +04:00
Dmitriy Marmyshev 44e5f5bf62 Trunk & fixes 2013-09-04 09:05:15 +04:00
Dmitriy Marmyshev 2900e756fd fix 2013-09-04 07:51:53 +04:00
Tim Bentley e98657d704 Fix up controller tests 2013-09-02 21:59:19 +01:00
Tim Bentley 8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Tim Bentley 6c2c5e8e80 to python 3 2013-09-01 07:31:09 +01:00
Tim Bentley 6282b4fcb6 Tests and fixed 2013-09-01 07:21:29 +01:00
Tim Bentley ede6adeb48 Tests added 2013-09-01 07:16:27 +01:00
Oliver Wieland 99a07ad91e added tests 2013-08-31 22:04:36 +02:00
Oliver Wieland 7020177531 ready for python 3 2013-08-31 21:59:13 +02:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Tim Bentley e4ba5cb72a add test files and ui validation sort of works 2013-08-31 18:20:43 +01:00
Andreas Preikschat ccf5d6535b head 2013-08-31 17:23:46 +02:00
Tim Bentley 7b82de9206 Head 2289 2013-08-31 12:43:21 +01:00
Tim Bentley dceaaa6996 ore changes 2013-08-31 12:43:05 +01:00
Tim Bentley aebe2d80df Remove last traces of pickle and clean up the tests 
bzr-revno: 2289
 2013-08-31 12:40:59 +01:00
Raoul Snyman 4a86d55a00 Fix song edit form to clear previous used fields 
bzr-revno: 2288
 2013-08-31 09:56:21 +01:00
Philip Ridout f48284a4e0 Fix Opensong import missing lines 
bzr-revno: 2287
 2013-08-31 09:54:47 +01:00
Tim Bentley b3ab68b0f5 Validation in progress 2013-08-31 09:52:44 +01:00
Tim Bentley e1f153f4f4 Fix text 2013-08-29 17:40:07 +01:00
Oliver Wieland 0a0d7dca84 biblestab.py: minor changes in naming objects 
mediaitem.py: rearrange code for better readability
 2013-08-26 19:14:52 +02:00
Tim Bentley eb1703bcc9 fix up edit code 2013-08-26 09:11:20 +01:00
Tim Bentley ba111776ed Remove pickle from the code now 2.0.2 is in 2013-08-25 19:31:15 +01:00
Tim Bentley 676b9133d1 formatting tags 2013-08-25 14:29:00 +01:00
Philip Ridout 49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +00:00
Oliver Wieland b591a091fd Added doc string 2013-08-22 20:56:11 +02:00
Andreas Preikschat 9b0b88718d head 2013-08-22 20:47:08 +02:00