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
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
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley 9eb3757c9f Stop indexing arrays with objects 2012-11-16 21:46:17 +00: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 431a5fbb15 Fix from misalignment 2012-11-10 16:51:23 +00:00
Tim Bentley 69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley 2295a74d5d Head 2104 - reverse some changes as not valid in this release 2012-11-07 18:47:56 +00:00
Martin Zibricky 5c82a0c3dd Bug #963955 : Rename controllersVisible to controlsVisible. 2012-11-06 12:58:32 +01:00
Tim Bentley 751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Tim Bentley 8cd8d07d2c missing rename 2012-11-01 18:57:07 +00:00
Tim Bentley 6047657741 cleanups and minor fixes 2012-11-01 18:45:12 +00:00
Tim Bentley a91dc027d2 Documentation 2012-11-01 16:54:37 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley 1145d661a5 more tidyups 2012-10-31 18:27:24 +00:00
Tim Bentley 6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley 29ec487d58 Remove old controller stack 2012-10-30 19:38:48 +00:00
Tim Bentley 5b7b2ecfb9 Api clean up 2012-10-29 16:54:39 +00:00
Tim Bentley a1bd9013cb Reference tidy up 2012-10-29 17:25:08 +00:00
Tim Bentley a106244aba Zeoo Vol for preview and fix start / stop buttons 2012-10-28 22:00:28 +00:00
Martin Zibricky b414177fc3 Merge with trunk. 2012-10-27 20:14:01 +02:00
Martin Zibricky e6cc675207 Bug #963955: Fix the video progress bar. 2012-10-27 19:04:54 +02:00
Martin Zibricky b5de3c2828 Bug #963955: Avoid the need to start video twice to just get media length. 2012-10-27 16:52:51 +02:00
Tim Bentley f645ab962c Api cleanup 2012-10-26 21:20:23 +01:00
Tim Bentley a5fc3ea3f7 Fix bug 2012-10-25 22:03:12 +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 a997bfa001 Fix player selection and simplify media_length 2012-10-25 20:16:56 +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
Tim Bentley aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Tim Bentley 77ddd4f385 Fixes 2012-10-13 21:54:56 +01:00
Tim Bentley 34284ea8ae Clean up media extension lists and move the controller. Fix reload of suffixes to happen after media or presentaions changes 2012-10-07 08:25:55 +01:00
Tim Bentley 56501b69f7 Head 2074 2012-10-06 09:37:40 +01:00
Tim Bentley 66728c52cd Renames 2012-10-06 09:35:37 +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
Tim Bentley ee126c9924 Change background color of video 2012-09-29 19:36:30 +01:00
Martin Zibricky ba37730538 Remove cheching for non-existing file in media player code. 2012-09-15 18:47:14 +02:00
Martin Zibricky 35bed5d11b Fix #963894: Put warning about disabled vlc to openlp.log. 2012-09-15 13:29:55 +02:00
Martin Zibricky 292bae6924 Fix #963894: Put message about disabled vlc to openlp.log. 2012-09-15 13:26:42 +02:00
Martin Zibricky 803d6bbe98 Add some more comments. 2012-09-15 13:18:47 +02:00
Martin Zibricky 41980a3a46 Fix #963894: disable vlc backend completely for osx. 2012-09-15 13:16:58 +02:00
Martin Zibricky f51f19e2b9 Fix #963894: expect also OSError while checking for media backends. 2012-09-15 13:09:59 +02:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Tim Bentley 1df6934bda Refactor video length 2012-09-09 07:54:09 +01:00
Tim Bentley a9dd3336fb Move media files around 2012-09-09 07:06:44 +01:00
Tim Bentley 51893b8052 tabs 2012-09-08 19:39:15 +01:00
Tim Bentley 77f49258f9 Fix duplicate ifs 2012-09-08 19:29:05 +01:00
Tim Bentley 59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley 6d53ed904b Fix extra line 2012-09-06 18:12:02 +01:00
Tim Bentley ed2d670f18 fix ups 2012-09-06 17:38:31 +01:00
Tim Bentley 9813e45bde VLC does support wva 2012-08-05 19:17:52 +01:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat e80287f591 fixed import 2012-05-17 22:19:07 +02:00
Andreas Preikschat cb13f805e4 clean up + fix 2012-05-17 22:06:23 +02:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Andreas Preikschat 1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
rimach 210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach 8a029daf11 Head 2012-03-20 22:21:47 +01:00
Jon Tibble 086a32d7b1 Head r1908 2012-03-17 16:42:53 +00:00
rimach 360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
rimach 7464d0f9fc correct pause check, correct signal names 2012-03-16 22:09:27 +01:00
rimach 09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01:00
Jon Tibble 8e7eca36c7 Head r1903 2012-03-12 22:16:52 +00:00
Jon Tibble 9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Mattias Põldaru 9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02:00
Jonathan Corwin e3d523042b Fix a couple of spelling mistakes 
bzr-revno: 1897
 2012-03-10 23:00:14 +00:00
Meinert Jordan 77b8f84ed2 Tidyups: 
Unify all QAction creation methods.
Derive OpenLPToolbar().actions keys from object names.
Use Python methods instead of Qt for file path manipulations.
Bug #943919: Shortcuts for "Move to Previous/Next" in live slide controller.

bzr-revno: 1894
 2012-03-10 22:50:38 +00:00
Jonathan Corwin e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Jonathan Corwin e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00:00
M2j 9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
rimach 5d6db957e1 fix 2012-03-03 23:36:46 +01:00
M2j 587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
rimach 87e70fa2dc fix 2012-03-03 00:08:24 +01:00
M2j 45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in 
case translators translate different strings same.
 2012-03-02 13:11:13 +01:00
M2j 6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
rimach 88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
rimach edf4ac75c8 move phonon and vlc to own windows 2012-01-12 22:45:07 +01:00
rimach 3e6d1e7962 update vlc code 2012-01-11 21:51:11 +01:00
Jon Tibble e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
M2j cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
rimach b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
Andreas Preikschat b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Jon Tibble e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
rimach e627960391 bugfixing 2011-12-01 19:07:15 +01:00
rimach 58035f505d bugfixing 2011-11-30 18:06:57 +01:00