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

1059 Commits

Author SHA1 Message Date
Tomas Groth bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02: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
Samuel Mehrbrodt a4829c62ba Add missing arguments for debug mode 
Fixes: https://launchpad.net/bugs/1296574
 2014-03-26 12:26:16 +01:00
Tim Bentley 5d9533947d Final set of PEP8 cleanups 2014-03-20 19:10:31 +00:00
Tomas Groth 258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tim Bentley 5e6f97d74e fix order and comment 2014-03-13 20:08:47 +00:00
Tim Bentley 31ee1b43a6 first view 2014-03-12 17:41:52 +00:00
Tomas Groth 52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tomas Groth e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01: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 5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tomas Groth f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Felipe Polo-Wood b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Felipe Polo-Wood 1a83a0a557 Merge head 2013-12-30 03:53:51 -05: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
Tomas Groth 685258b744 Made presenting PDF from the servicemanager work 2013-12-27 17:44:12 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley b2bee17211 Few minnor fixes 2013-12-24 06:15:41 +00:00
Tim Bentley a5ca17246f Fix on_slide_select bugs 2013-12-21 08:46:30 +00:00
Tim Bentley d4ce5489ad updates and fix up slidecontroller 2013-12-19 20:17:06 +00:00
Tim Bentley e9a7850bc8 Add registry mixin and code cleanups 2013-12-15 16:50:09 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00: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
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
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
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
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat 025e031d76 updated constructor 2013-07-18 16:34:33 +02:00
Andreas Preikschat 5fb36b5ef7 updated constructor 2013-07-18 16:32:23 +02:00
Andreas Preikschat 829d68cdd8 fixed attribute error 2013-07-05 20:39:31 +02:00
Andreas Preikschat 15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Andreas Preikschat 62c5908d85 python3 division in slidecontroller 2013-06-18 11:09:54 +02:00
Andreas Preikschat 39d691d2eb fix 2013-06-16 18:46:44 +02:00
Andreas Preikschat 5cce4c9443 head 2013-06-16 18:40:47 +02:00
Tim Bentley e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann 4106ecd71e Remove superfluous comment. 2013-06-15 12:56:09 +02:00
Patrick Zimmermann d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Tim Bentley 6e5588b7cf Update settings and minor cleanups 2013-06-03 19:47:25 +01:00
Tim Bentley 9160832e0a fix error 2013-06-03 19:03:45 +01:00
Andreas Preikschat 1f80f6c830 renames 2013-06-01 20:35:00 +02:00
Tim Bentley 1113044955 Add basic Live display to remote 2013-05-19 20:56:48 +01:00
Patrick Zimmermann 154c82f5ea Rename a method and remove a non needed registry var. 2013-04-27 12:00:27 +02:00
Andreas Preikschat 8f994b2895 - fixed short lines 
- renamed attributes and methods

bzr-revno: 2239
 2013-04-23 23:46:07 +02:00
Patrick Zimmermann 145a1aedcb Add some docstrings and rename some methods for clarity. 2013-04-23 19:12:08 +02:00
Patrick Zimmermann 1c2a5b5156 Merge trunk. 2013-04-22 23:02:12 +02:00
Patrick Zimmermann 823e7b1ec0 Change a line back to trunk state. 2013-04-22 22:51:33 +02:00
Tim Bentley 2965271ada and more 2013-04-21 08:26:45 +01:00
Tim Bentley 02b1f7b78b and more 2013-04-21 08:21:29 +01:00
Andreas Preikschat 4063de2700 head 2013-04-20 22:34:46 +02:00
Patrick Zimmermann 1c31940650 Merge trunk. 2013-04-18 23:17:14 +02:00
Patrick Zimmermann 2b9a13ff97 Clean up PreviewWidget interface a little more. 2013-04-18 22:50:02 +02:00
Patrick Zimmermann 25db18d34c Use inheritance instead of composition. Some interface cleanup. 2013-04-18 22:15:44 +02:00
Andreas Preikschat 2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Patrick Zimmermann d687288336 Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item. 2013-04-16 23:42:23 +02:00
Patrick Zimmermann fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Patrick Zimmermann 0dbda9ee21 Accidentially removed image load logic. Readded. 2013-04-15 19:26:18 +02:00
Patrick Zimmermann 3609d2e0e1 Switch over to PreviewListWidget class. Untested. 2013-04-15 19:12:47 +02:00
Tim Bentley 2345d59e6f Head 2013-04-08 17:53:26 +01:00
Andreas Preikschat 07d6fa63c5 introduced constant 2013-04-05 15:41:42 +02:00
Andreas Preikschat 42f52cc300 Separate blank buttons don't hide on resizing (bug #1164925) 
Fixes: https://launchpad.net/bugs/1164925
 2013-04-05 12:50:10 +02:00
Tim Bentley 4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley 401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley b9a5ee28a9 Fix missing string converstion 2013-03-26 07:34:42 +00:00
Tim Bentley a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Tim Bentley fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley 8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley 0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Tim Bentley 1c76353cba head 2013-03-15 08:40:16 +00:00
Tim Bentley 9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Tim Bentley 5c79832bcc More updates to authentication 2013-03-11 21:00:00 +00:00
Tim Bentley c62dab074e Basic Authentication now working 2013-03-08 19:15:49 +00:00
Tim Bentley 6bf07f9dce Head 2013-03-08 16:35:10 +00:00
Tim Bentley 2464bef944 Head + conflicts 2013-03-07 18:22:38 +00:00
Andreas Preikschat 7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat 6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat 33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Andreas Preikschat c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Tim Bentley f1aadde13c Initial Cherrypy implementation 2013-03-06 21:53:29 +00:00
Tim Bentley 4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Tim Bentley 5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley 188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Tim Bentley 83fe10361a For minor fixes 2013-03-01 17:29:09 +00:00
Andreas Preikschat 25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +01:00
Andreas Preikschat 31f28a7570 fixed same short lines 2013-02-24 19:13:50 +01:00
Tim Bentley 0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Andreas Preikschat db2b4ccd61 head + conflicts 2013-02-21 22:26:24 +01:00
Tim Bentley 2516417ee5 fix conflict 2013-02-21 19:16:05 +00:00
Tim Bentley ffb10c0149 More cleanups of slide controller and friends 2013-02-20 20:43:20 +00:00
Tim Bentley ad7d78ff26 More cleanups 2013-02-20 19:31:51 +00:00
Andreas Preikschat 38c2c2db5e make diff more readable 2013-02-19 10:33:07 +01:00
Andreas Preikschat 53f93d6342 r2187 + conflicts 2013-02-19 10:16:54 +01:00
Andreas Preikschat 781da422b6 started to remove forgotten shortcut kwargs 2013-02-19 10:13:49 +01:00
Andreas Preikschat a20f309824 r2181 2013-02-16 13:44:47 +01:00
Tim Bentley bd0ff619a9 Clean up settings and alerts 2013-02-14 21:31:17 +00:00
Andreas Preikschat 6eba926a70 improved hide menu behaviour 2013-02-10 20:08:37 +01:00
Andreas Preikschat 8bb88f3c9f fixed bug 1112587 
Fixes: https://launchpad.net/bugs/1112587
 2013-02-10 13:29:42 +01:00
Tim Bentley cae39247d9 Final cleanup of variables 2013-02-07 11:33:47 +00:00
Tim Bentley c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Andreas Preikschat b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat 9aa7cf7b29 r2169 + conflict 2013-02-04 22:07:38 +01:00
Tim Bentley b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Tim Bentley 27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman 922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Raoul Snyman b0d96aa932 HEAD 2013-02-02 20:43:34 +02:00
Raoul Snyman c891edc40c Last of the dialogs 2013-02-01 23:34:23 +02:00
Andreas Preikschat 9d2fc38717 r2164 + conflict 2013-01-31 20:22:56 +01:00
Dmitriy Marmyshev 235d1c8b79 Make slide controller buttons width aware 
bzr-revno: 2163
 2013-01-31 19:06:53 +00:00
Andreas Preikschat 9bc317532c r2162 + conflict 2013-01-31 19:47:53 +01:00
Andreas Preikschat 16ba742d1d sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting 2013-01-31 08:56:34 +01:00
Tim Bentley 80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley 91a959a490 More name cleanups 2013-01-27 10:18:06 +00:00
Tim Bentley eb3e5b8642 Remote Edit cleanup and simplification 2013-01-27 09:57:03 +00:00
Tim Bentley 183c0c700d More Registry cleanups and bug fixes 2013-01-26 07:39:07 +00:00
Tim Bentley c0aca32660 Head 2013-01-24 20:08:52 +00:00
Dmitriy Marmyshev 6e92547398 styling fix 2013-01-24 07:07:41 +04:00
Tim Bentley be6977a1a3 remove plugin helpers 2013-01-23 21:05:25 +00:00
Tim Bentley aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 9a107e627b Head 2013-01-23 19:53:02 +00:00
Tim Bentley 3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley 064ca583ca Live and Preview Moved 2013-01-22 21:25:16 +00:00
Tim Bentley a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Andreas Preikschat d0c9c35deb r2154 + fixed trunk 2013-01-21 20:47:53 +01:00
Tim Bentley 4224d8befe Spelling 2013-01-21 07:34:50 +00:00
Tim Bentley b04a6bba79 Code tidy ups to make pylint happier 2013-01-21 07:29:43 +00:00
Dmitriy Marmyshev a20c077698 Add Autoplay feature to Service items and Service Manager 
bzr-revno: 2152
 2013-01-21 06:45:00 +00:00
Andreas Preikschat e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Dmitriy Marmyshev e3e8693bcc name fix 2013-01-18 23:00:13 +04:00
Tim Bentley 9d8fc508b0 Head 2013-01-16 19:37:11 +00:00
Andreas Preikschat c29bbd3ca0 r2146 2013-01-16 12:29:19 +01:00
Dmitriy Marmyshev ef947355c5 style fixing 2013-01-16 03:59:04 +04:00
Dmitriy Marmyshev 024ba1aac9 Auto separating blank buttons, if width allows this. 
Fixes: https://launchpad.net/bugs/718797
 2013-01-12 00:23:06 +04:00
Tim Bentley 634246a493 set the focus to the maindisplay when it is updated. 
Fixes: https://launchpad.net/bugs/1097898
 2013-01-11 17:08:44 +00:00
Andreas Preikschat 91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Dmitriy Marmyshev 30ea5fce9c Pause looping when blanking screen 2013-01-09 14:30:32 +04:00
Tim Bentley feef9df575 Head 2013-01-02 21:50:45 +00:00
Dmitriy Marmyshev df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Dmitriy Marmyshev 8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley b1f80c96ea Fix media starting in wrong place 2012-12-21 19:11:00 +00:00
Andreas Preikschat 18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat 6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Dmitriy Marmyshev 3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev 770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Tim Bentley 0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley 3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Andreas Preikschat cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat 80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Andreas Preikschat ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Dmitriy Marmyshev 2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley 69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Philip Ridout e90af50fd6 Removes items with missing files prior to saving (after confirmation from user) 
bzr-revno: 2106
 2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Philip Ridout d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Tim Bentley 6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley f645ab962c Api cleanup 2012-10-26 21:20:23 +01:00
Tim Bentley 90a3493d89 Clean up video api 2012-10-25 21:33:28 +01:00
Tim Bentley 34b4828c30 convert video api to registered controller 2012-10-25 20:38:12 +01:00
Tim Bentley e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley 8e5dafb715 Fix bugs and more simplifications 2012-10-20 20:52:04 +01:00
Tim Bentley 057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Tim Bentley c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Tim Bentley f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01:00
Tim Bentley 2dadfbd17a More Code cleanups 2012-10-06 09:10:28 +01:00
Tim Bentley e141ff1c24 Cleanups 2012-10-04 21:12:09 +01:00
Tim Bentley 45849803aa Cleanups 2012-10-04 18:28:49 +01:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Tim Bentley d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Andreas Preikschat 88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Tim Bentley 59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley 4390c13901 Auto start media 2012-09-04 21:22:27 +01:00
Philip Ridout dcc4608f3c fixes issue 1045 and bug 1037076 "Short cut keys do not work for background audio" 2012-08-18 11:55:57 +01:00
Andreas Preikschat bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat 9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00