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

947 Commits

Author SHA1 Message Date
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