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

5790 Commits

Author SHA1 Message Date
Stewart Becker d62b92718d Fixed typo 2014-04-19 22:57:49 +01:00
Jonathan Springer e86539888d Fix typo 2014-04-17 20:09:31 -04:00
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Jonathan Springer 85fc53954d More PEP8 fixes 2014-04-16 16:49:24 -04:00
Jonathan Springer aa6b756956 Change how we define which menu items are included in the main menu on Mac OS X 2014-04-16 16:26:49 -04:00
Jonathan Springer ebc4476fdd Fixes first time wizard to use url and paths in web config file 
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
 2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt c20939215a PDF Fixes 
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
 2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt 49773de4f6 Fix transparent theme on OS X 
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
 2014-04-16 05:44:21 +01:00
Samuel Mehrbrodt 30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Jonathan Springer c204967304 Fixes for PEP8 2014-04-15 14:42:08 -04:00
Samuel Mehrbrodt 71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt 82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat a07a97f78b strange pyqt fix 2014-04-14 21:07:01 +02:00
Andreas Preikschat 877fd135d3 head 2014-04-14 20:53:33 +02:00
Jonathan Springer 4a7b76e5ee merge trunk 2014-04-14 14:31:30 -04:00
Raoul Snyman ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox. 
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
 2014-04-14 19:28:04 +01:00
Samuel Mehrbrodt 758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat 49ff37c530 fixed long line; use generator 2014-04-13 09:54:34 +02:00
Jonathan Springer 99d0ed01ab merge trunk 2014-04-12 17:31:38 -04:00
Dmitriy Marmyshev 3cf9094e5f Added ability to rename items in ServiceManager. 
bzr-revno: 2352
 2014-04-12 23:26:09 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 672eed037c HEAD 2014-04-12 21:48:15 +02:00
Jonathan Springer 51e43a9a52 Fix getting urls for first time wirard from config file. 2014-04-12 14:21:15 -04:00
Jonathan Springer 4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry 
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
 2014-04-12 16:40:07 +02:00
Andreas Preikschat d16d8066ad - updated vlc.py 
bzr-revno: 2349
 2014-04-12 16:37:38 +02:00
Jonathan Springer 307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02:00
Samuel Mehrbrodt 1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt 1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt ac05205a1e Trunk 2014-04-08 15:46:08 +02:00
Samuel Mehrbrodt b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Samuel Mehrbrodt d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer 1945b4c380 Remove changes to platform specific code. 2014-04-06 22:07:19 -04:00
Jonathan Springer e5d5af38c2 Move opening of files passed in via command line to function. 2014-04-06 22:03:05 -04:00
Raoul Snyman 4c3e2ac45c Trying to fix pylint 2014-04-06 01:06:37 +02:00
Tomas Groth bc2d45fc30 Head 2014-04-05 15:27:53 +02:00
Raoul Snyman 5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tim Bentley 576ab6e1f9 head 2014-04-04 21:20:00 +01:00
Jonathan Springer bc55bcd7fa Fix argurment to pass correct type. 2014-04-03 08:38:39 -04:00
Tim Bentley 806ce25296 head 2014-04-02 19:51:36 +01:00
Andreas Preikschat 2a9c85c2a2 fixed a spelling mistake 
bzr-revno: 2346
 2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt eece90b2ec Merge trunk 2014-04-02 09:04:27 +02:00
Samuel Mehrbrodt adedb6eaeb Fix setDefaults -> set_defaults 2014-04-02 09:04:12 +02:00
Raoul Snyman 73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Raoul Snyman ce9ca0b44b Updated the look of the Library tabs 2014-04-02 01:29:23 +02:00
Samuel Mehrbrodt d064549eab Icon, indentation 2014-04-01 22:39:13 +02:00
Jonathan Springer d26b34aee0 Modify loading file from the command line to only load files ending with osz, oszl, or otz. 2014-04-01 14:58:22 -04:00
Tim Bentley 3e7370c656 head 2014-04-01 18:33:13 +01:00
Tim Bentley edd1ed849a minor fixes 2014-04-01 18:32:19 +01:00
Jonathan Springer 6ca37531a0 Remove unnecessary platform specific code, remove orphaned and unused registry execute, and fix two functions to register to the registry instead of executing. 2014-04-01 13:07:25 -04:00
Andreas Preikschat 5bc5678078 - added a script to trigger jenkins 
bzr-revno: 2345
 2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt 81a8868a5a Fix merge 2014-03-31 20:49:47 +02:00
Samuel Mehrbrodt 8b7bbb4761 Merge trunk 2014-03-31 20:48:10 +02:00
Andreas Preikschat 3db984a846 clean up: simplify code 2014-03-31 19:32:49 +02:00
Andreas Preikschat 5227924846 fix: removed stray print 2014-03-31 19:29:14 +02:00
Andreas Preikschat c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat b69f480dc0 head 2014-03-31 14:19:33 +02:00
Andreas Preikschat 93ff301840 cleanup: remove local variable 2014-03-31 14:13:50 +02:00
Samuel Mehrbrodt ad9717ea42 Add support for author types to OpenLyrics import and export 2014-03-30 23:42:46 +02:00
Samuel Mehrbrodt 69c32d91a4 Merge trunk 2014-03-30 19:13:26 +02:00
Tomas Groth bfbfcd5b15 Head 2014-03-30 13:26:13 +02:00
Raoul Snyman 6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run 
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
 2014-03-30 13:02:25 +02:00
Andreas Preikschat 7787e1a845 head 2014-03-28 21:38:38 +01:00
Samuel Mehrbrodt 71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Tomas Groth 19558e7a03 head 2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt bf32fe164a Test 2014-03-26 13:06:48 +01:00
Samuel Mehrbrodt a4829c62ba Add missing arguments for debug mode 
Fixes: https://launchpad.net/bugs/1296574
 2014-03-26 12:26:16 +01:00
Andreas Preikschat 7a1825a79a tests 2014-03-23 11:49:03 +01:00
Andreas Preikschat 47ad40aaac removed white spaces 2014-03-22 20:19:08 +01:00
Andreas Preikschat d5b421aa70 updated vlc.py 2014-03-22 20:18:27 +01:00
Andreas Preikschat 91adff326d head 2014-03-22 20:18:04 +01:00
Andreas Preikschat ad1970f27e fixed spelling 2014-03-22 10:53:55 +01:00
Tomas Groth 852ec00fd7 Head 2014-03-20 21:11:18 +01:00
Tim Bentley 5d9533947d Final set of PEP8 cleanups 2014-03-20 19:10:31 +00:00
Tomas Groth 6e46fd6a2a Revert wrong changes to settings.py 2014-03-19 19:16:03 +01:00
Tomas Groth 991661b169 Head 2014-03-19 18:49:46 +01:00
Raoul Snyman 35e3564655 Tests! 2014-03-18 23:03:53 +02:00
Tim Bentley 30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tomas Groth 258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tim Bentley a3b1a599b2 fix bugs 2014-03-17 19:14:22 +00:00
Tim Bentley 9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tomas Groth 5b1c6d82c9 Head 2014-03-17 19:44:34 +01:00
Tim Bentley 6c80ba1c7d Full migration 2014-03-17 07:29:29 +00:00
Tim Bentley 22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley 0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley 9cf3428542 Head 2014-03-15 06:25:35 +00:00
Tim Bentley d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Tim Bentley 68a020709a head 2014-03-13 20:24:33 +00:00
Tim Bentley ea99cbb08d use decorator 2014-03-13 20:20:42 +00:00
Tim Bentley 5e6f97d74e fix order and comment 2014-03-13 20:08:47 +00:00
Tomas Groth ecc1ffbd4c Fix tests. 
To avoid segfaults reuse QApplication instance.
Also use ICU when getting locale sort key.

bzr-revno: 2331
 2014-03-13 00:07:23 +02:00
Tim Bentley 31ee1b43a6 first view 2014-03-12 17:41:52 +00:00
Tim Bentley e78dac1edf Head 2014-03-11 20:17:18 +00:00
Tomas Groth 5ac6f853d0 Changed get_locale_key to only use ICU if available. 2014-03-11 20:38:47 +01:00
Tim Bentley a74567b9f6 Bible database tests 2014-03-11 19:01:09 +00:00
Raoul Snyman b35de747ab Move HistoryComboBox to openlp.core.common 2014-03-11 20:58:49 +02:00
Tomas Groth b831ebd48e Use ICU for locale sort key 2014-03-10 20:53:11 +01:00
Tomas Groth 3988aacfbd Made it possible to save and load optical clip to servicefile. Also some pep8 and general cleanup. 2014-03-08 21:14:04 +00:00
Tomas Groth e6f23324ba Merged with trunk 2014-03-04 22:50:24 +00:00
Tomas Groth 67acb9d824 Implemented DVD clip selection and playback, still needs a lot of cleanups. 2014-03-04 22:33:50 +00:00
Raoul Snyman c607661aee HEAD 2014-03-04 23:51:54 +02:00
Tim Bentley 43f156d9fe Update Songs forms 2014-03-04 18:49:30 +00:00
Raoul Snyman 831f2f3b69 HEAD 2014-02-27 23:39:44 +02:00
Tomas Groth 52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tim Bentley 7f58348c8c fix up pintservice form 2014-02-23 15:41:09 +00:00
Tim Bentley 3d556a9790 Head 2014-02-23 15:02:53 +00:00
Tomas Groth e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01:00
Philip Ridout 150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Rafael Lerm 83e20b79b6 Changed string that caused crash on startup. Corrected bug 1269929 2014-01-16 18:34:37 -02:00
Tim Bentley bc3081fd18 Remove redundent method 2014-01-13 17:31:46 +00:00
Tim Bentley ca47293345 Fix up help link 2014-01-13 17:29:31 +00:00
Tim Bentley 5d740a7706 Removep 
bzr commit -mRemovep
 2014-01-11 22:05:38 +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
Felipe Polo-Wood d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05: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
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 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
Felipe Polo-Wood b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Andreas Preikschat 80c6c371df FIX: renamed qt method 
bzr-revno: 2322
 2013-12-30 12:13:40 +01:00
Felipe Polo-Wood 1a83a0a557 Merge head 2013-12-30 03:53:51 -05:00
Felipe Polo-Wood b993b0d4a8 Style changes 2013-12-30 03:35:05 -05: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
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Felipe Polo-Wood 1ef910463c Merge head 2013-12-28 12:06:29 -05: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 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 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
Tim Bentley d0a9423982 Head 2013-12-06 19:00:55 +00:00
Felipe Polo-Wood b85b09c92c Merge back to trunk 2013-12-02 11:14:09 -05:00
Felipe Polo-Wood 04abbd97d0 implemented caching thru the ImageManager 
Styling issues
Merge with fix-router changes
 2013-11-22 13:21:07 -05: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 4c8f817269 HEAD 2013-11-16 10:07:38 +00:00
Arjan Schrijver 27395fcaf6 Rename 'Thurdsday' to 'Thursday' 
bzr-revno: 2310
 2013-11-14 21:07:11 +02:00
Andreas Preikschat 1b89900336 head 2013-11-14 10:05:59 +01:00
Felipe Polo-Wood 6c3253c7c0 Added caching for thumbnail images 2013-11-07 15:13:15 -05:00
Philip Ridout bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Felipe Polo-Wood 1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04:00
Felipe Polo-Wood fecd56106d Removed extra line 
Made PowerpontController class compatible with Linux
 2013-10-31 22:53:52 -04:00
Felipe Polo-Wood e958e17889 - Added settings dialog at the client (with choice for thumbnail) 
- Fixed problem Presentations at remote getting out of sync
 2013-10-31 16:54:38 -04: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
Felipe Polo-Wood 6d464dec4b Added resizing capabilities to the thumbnails 
Fixed a problem with setting the presentation slides from the remote
 2013-10-29 11:38:28 -04:00
Philip Ridout a69b2d86ef More uneeded str's 2013-10-28 21:23:17 +00:00
Felipe Polo-Wood 9a07d6887b style fixes 2013-10-28 11:16:22 -04:00
Felipe Polo-Wood 1aae38cb8e Merging 2013-10-27 23:40:38 -04:00
Felipe Polo-Wood b9850e6e68 bunch of cosmetic changes 2013-10-27 22:33:28 -04: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
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
Philip Ridout 051fa9db8f Changed logging to UTF-8 2013-10-20 21:34:46 +01:00
Felipe Polo-Wood dd1f556a8e Fixed formatting issues 
Added three test classes for the presentation controllers 
Fixed issue that failed load for ImpressDocument
 2013-10-19 19:15:46 -04:00