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

361 Commits

Author SHA1 Message Date
Philip Ridout 70019b570b Update and refactor dynamic import code 2017-05-14 11:11:10 +01:00
Tim Bentley 5d917de2f8 Head 2017-03-03 19:27:31 +00:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tim Bentley fa19108885 tidy up media 2016-08-12 20:16:39 +01:00
Tim Bentley 80f927f5d6 Tidy up code more 2016-08-08 22:01:09 +01:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tim Bentley 071a4438e9 Finish moving things around 
bzr-revno: 2649
 2016-04-23 14:46:59 +01:00
Tim Bentley bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley 40981701e9 fix checks 2016-04-16 15:43:31 +01:00
Tim Bentley 19d120de1b Head and review comments 2016-04-13 19:38:49 +01:00
Tim Bentley 0c2c869dbf Fix more bugs 2016-03-08 17:49:57 +00:00
Tim Bentley 7308a97c29 remove crash 2016-03-07 21:52:09 +00:00
Tim Bentley 071dfa6299 remove prints 2016-02-26 18:17:39 +00:00
Tim Bentley 5f5d69d4d2 Getting there many bits work 2016-02-26 16:00:04 +00:00
Tim Bentley 9eed19ee50 fix missing bits from revert 2016-02-21 09:29:16 +00:00
Tim Bentley 72a180716b revert changes 2016-02-21 09:23:09 +00:00
Tim Bentley 334eb6c8c5 fix missing resize) 2016-02-20 11:51:58 +00:00
Tim Bentley 3e522186ec Displays work now 2016-02-19 18:59:39 +00:00
Tim Bentley cdbf6ac9ea Fix timers 2016-02-16 21:14:38 +00:00
Tim Bentley 30dc055532 Video backgrounds work 2016-02-14 17:53:16 +00:00
Tim Bentley 89f6926a71 Add replacement to context 2016-02-14 16:54:31 +00:00
Tim Bentley 19b6716bea More cleanups comments and flash removal 2016-02-14 15:43:54 +00:00
Tim Bentley 360d1155f1 Remove flash 2016-02-14 08:38:21 +00:00
Tim Bentley 7a72fe84df more updates and cleanups 2016-02-14 08:26:04 +00:00
Tim Bentley a6b5b36502 More cleanups 2016-02-13 22:10:11 +00:00
Tim Bentley 81c9f5f1ca more simplifications 2016-01-24 10:13:33 +00:00
Tim Bentley 4aebe441e7 cleanups 2016-01-23 12:11:34 +00:00
Tim Bentley 06ed550c8f head and Mediainfo 2016-01-23 10:09:36 +00:00
Tim Bentley 29dd834816 debug 2016-01-23 10:07:59 +00:00
Tim Bentley 4a0330f126 Add wrapper for mediainfo 2016-01-22 20:12:46 +00:00
Tim Bentley 9c2b472ee8 prints 2016-01-01 20:39:26 +00:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Tim Bentley fe0cdc70fb cleanup 2015-12-23 22:19:28 +00:00
Tim Bentley 3791eea777 clean ups 2015-12-23 06:06:25 +00:00
Tim Bentley e90fb00ddd head 2015-12-22 19:07:51 +00:00
Tim Bentley 15f1b61fd4 simplified 2015-12-20 21:30:47 +00:00
Tim Bentley 2ef0b3b210 remove debugs 2015-12-20 18:00:38 +00:00
Tim Bentley b728dddaa4 remove slidecontroller 2015-12-20 17:58:24 +00:00
Tim Bentley 8de95e34a0 first merge 2015-12-20 17:24:45 +00:00
s.mehrbrodt@gmail.com 12141d6a7e Small fixes: 
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
  * OpenLP 2.0 -> OpenLP 2
  * Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
  * Improve exception dialog (mention that description should be english and relevant files should be attached)
  * Do not translate the bug report labels
  * Ignore "E402 module level import not at top of file" pep8 errors (added to ...

bzr-revno: 2574
 2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt e6978033e9 PEP8 2015-12-17 22:43:49 +01:00
Jonathan Springer 0a935bdb90 merge trunk 2015-12-13 19:21:58 -05:00
Jonathan Springer fc3c433a21 Fix failing situation by making default_players a list instead of a string 2015-12-10 12:26:08 -05:00
Jonathan Springer 2e23d9919d Fix system player being used for live-background 2015-12-07 16:40:09 -05:00
Jonathan Springer ae4858e434 Fix traceback in mediacontroller if a service item had a processor type of automatic 2015-12-07 16:34:10 -05:00
Jonathan Springer 3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05:00
Tim Bentley ae1888106d Fix Presentations and Media 2015-11-28 15:37:26 +00:00
Jonathan Springer 285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tomas Groth aea6c424fc Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390. 
Fixes: https://launchpad.net/bugs/1465390
 2015-06-15 21:29:34 +01:00
Raoul Snyman 5bcdc85ce1 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 2015-05-28 22:38:43 +02:00
Tomas Groth cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
 2015-04-03 20:31:19 +02:00
Tomas Groth 25f6fe0a59 Fix another case of bug 1422761. 
Fixes: https://launchpad.net/bugs/1422761
 2015-03-20 17:03:45 +00:00
Tomas Groth c3d21ca742 Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478. 2015-03-16 21:32:56 +00:00
Tomas Groth 83ad7c31d7 Don't try to play media if no players are available. Fixes bug 1422761 
Fixes: https://launchpad.net/bugs/1422761
 2015-02-18 21:32:42 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Tomas Groth 98c5dd4865 Fix bug 1405476 by checking if an end_time has been set. 
Fixes: https://launchpad.net/bugs/1405476
 2014-12-26 17:45:34 +00:00
Tomas Groth e9a151cec0 This fixes the adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix 2014-10-27 14:14:12 +01:00
Tomas Groth df28a6799b trunk 2014-09-02 21:17:56 +01:00
Phill Ridout 9b6979b840 Changed log.warn to log.warning 2014-06-30 21:59:22 +01:00
Tomas Groth 2a1a93d319 Made it possible to name optical clips, and fixed some issues. 2014-06-14 23:48:07 +02:00
Tomas Groth 06825e4aeb Added support for audio cds and udisks2 2014-05-23 15:39:25 +02:00
Tomas Groth 817fe854e4 PEP8 fixes 2014-04-22 22:42:07 +02:00
Tomas Groth f6231e024a Head 2014-04-20 15:57:12 +02:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Samuel Mehrbrodt ac05205a1e Trunk 2014-04-08 15:46:08 +02:00
Tomas Groth 19558e7a03 head 2014-03-26 19:39:54 +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
Tim Bentley 30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tim Bentley 9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley 6c80ba1c7d Full migration 2014-03-17 07:29:29 +00:00
Tim Bentley 0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00: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
Tim Bentley 51178b2ede Fix tests 2013-12-31 20:29:03 +00:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley 257fba8548 Start theme clean up 2013-10-13 14:51:13 +01: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
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat 13c9a69de1 changed constructors 2013-07-18 16:14:29 +02:00
Tim Bentley 4b2868b271 Fox presentations and refactor service item 2013-05-24 21:17:47 +01:00
Andreas Preikschat e708140d13 head 2013-03-26 12:35:29 +01:00
Tim Bentley decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Tim Bentley 861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Andreas Preikschat 2d26110f22 fixed regression bugs 2013-03-12 09:00:48 +01:00
Andreas Preikschat 7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat 33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Andreas Preikschat 14b61cabf4 renamed canFolder 2013-03-07 00:00:57 +01:00
Andreas Preikschat e1f35e002a some media renames 2013-03-06 23:54:16 +01:00
Andreas Preikschat 1d9425c3b7 renamed videoBehindText 2013-03-06 23:50:49 +01:00
Andreas Preikschat 8383acf636 renamed isValid 2013-03-06 23:49:13 +01:00
Andreas Preikschat 8bb4c7e131 renamed serviceItem 2013-03-06 23:23:01 +01:00
Tim Bentley ca920ff774 Merge issues 2013-03-06 21:49:46 +00:00
Tim Bentley 13f18e271b Fix review comments 2013-03-06 17:46:19 +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 847eb4d910 remove print 2013-03-04 16:56:41 +00:00
Tim Bentley 3a44717acf Head and conflict 2013-03-04 16:55:13 +00:00
Andreas Preikschat 40de8647cf renamed general settings to core 
Fixes: https://launchpad.net/bugs/1133237
 2013-02-28 21:47:59 +01:00
Tim Bentley 4bc2c301e2 Stage renames 2013-02-21 21:18:26 +00:00
Tim Bentley 20c3157d6d final fixes 2013-02-21 17:05:56 +00:00
Tim Bentley ffb10c0149 More cleanups of slide controller and friends 2013-02-20 20:43:20 +00:00
Tim Bentley 6d732cf3ba Cleanups 2013-02-19 19:50:14 +00:00
Tim Bentley c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Raoul Snyman e25326512d Now all the media players are looking better 2013-02-02 08:32:29 +02:00
Tim Bentley bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Andreas Preikschat e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Tim Bentley f2ef685cf1 tidy ups 2013-01-16 19:35: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
Tim Bentley 9f7725573d Fix tests 2013-01-09 19:56:16 +00:00
Tim Bentley 7ee8d8c576 Fix crash on blank to desktop 2013-01-03 21:28:00 +00:00
Tim Bentley feef9df575 Head 2013-01-02 21:50:45 +00:00
Tim Bentley e03a265ba9 Style updates and more tests 2013-01-02 21:50:20 +00:00
Tim Bentley 44a9f96c87 merge fixes 2012-12-30 19:49:48 +00:00
Tim Bentley a235602acb Fix up auto start 2012-12-30 16:43:49 +00:00
Tim Bentley e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley 01de9a93df Capture key and mouse movements 2012-12-29 20:54:25 +00:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley 933925647b Fix unblocking of events 2012-12-24 21:04:52 +00: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
Tim Bentley cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley 68ce73544a volume fixes 2012-12-13 18:55:11 +00:00
Tim Bentley 0f0b8d04e7 Core Media to 120 2012-12-11 19:55:47 +00:00
Tim Bentley 5a4a33b9b8 Updates 2012-12-09 20:57:41 +00:00
Tim Bentley d6513f7c60 Fix blank / unblank bug 2012-12-07 17:47:32 +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
Tim Bentley b1c2cee003 Fix swf files 2012-12-03 19:18:28 +00:00
Tim Bentley 580de0015f Fix background video 2012-12-02 08:06:08 +00:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 2299290f5c fix stop 2012-11-29 20:46:16 +00:00
Tim Bentley 846d909dc3 Fix osz bug 2012-11-28 21:14:08 +00:00
Tim Bentley cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley 116c5b030f Fix media language Automatic 2012-11-22 22:02:40 +00:00
Tim Bentley acadf89a34 Fix displayed preview 2012-11-18 07:56:12 +00:00
Tim Bentley 506fd80f89 Style cleanups 2012-11-17 07:59:25 +00:00