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

4548 Commits

Author SHA1 Message Date
Tim Bentley a1bd9013cb Reference tidy up 2012-10-29 17:25:08 +00:00
Erik Lundin 48e2ac108d Fixed bug #1072498 'VLC: Add webm as supported format' 
Fixes: https://launchpad.net/bugs/1072498
 2012-10-29 00:08:54 +01: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 064a318f9a Bug #963955: Disable audio for video preview. 2012-10-27 19:32:56 +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
Philip Ridout fafe262adc Fixes bug1065423 "Missing image in service causes traceback when opening" 
Fixes bug1065420 ""missing files" dialog opens more then once when more files are missing"
 2012-10-27 10:06:33 +01: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 b901236a7f fix irc name 2012-10-24 17:35:41 +01:00
Tim Bentley bb3561c18a Fixes 2012-10-23 18:35:23 +01:00
Martin Zibricky e1cd3bdd8b Allow .mov videos in phonon backend. 2012-10-21 22:42:51 +02:00
Tim Bentley 01c537d965 contribute 2012-10-21 19:23:50 +01:00
Tim Bentley 3eca286a08 Yet More updates 2012-10-21 15:42:49 +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 cf635c1459 Stop service item generation running media twice 2012-10-20 09:20:11 +01:00
Tim Bentley 464480fc34 fix up settings tab 2012-10-18 21:38:01 +01:00
Andreas Preikschat 57e844cc12 r2093 2012-10-18 20:13:54 +02:00
Martin Zibricky fa7d3142db Merge with trunk. 2012-10-18 00:20:22 +02:00
Martin Zibricky bd9a1e550b Bug #1067703 fixed. 2012-10-18 00:00:44 +02:00
Martin Zibricky 8e125fb604 This change disables presentation plugin on osx and hides it in menu and fristtimewizard to be not visible for users. 
This also removes the line disabling presentation plugin.

bzr-revno: 2092
Fixes: https://launchpad.net/bugs/1002038
 2012-10-16 16:07:07 +02:00
Andreas Preikschat f84c089938 fixed bug #1066296 (Renaming theme keeps old/new theme in Theme manager) 
Fixes: https://launchpad.net/bugs/1066296
 2012-10-16 10:25:54 +02:00
Tim Bentley 057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Tim Bentley 8fb1ede03f Media Players help text 2012-10-15 18:35:14 +01:00
Tim Bentley a5824120c3 Lite save works 2012-10-15 17:20:23 +01:00
Martin Zibricky 16c0ec482e Bug #1002038: Fix enabling presentation plugin if no osx os. 2012-10-15 10:25:42 +02:00
Martin Zibricky 869d1c6fd7 Merge with trunk. 2012-10-14 20:53:07 +02:00
Martin Zibricky 7321f5fb2d Bug #1002038: Disable and hide presentation plugin on osx. 2012-10-14 20:42:20 +02:00
Tim Bentley c29cf8ce70 Lite Save for Media working 2012-10-14 17:21:47 +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
Martin Zibricky 1408e6620d Merge: merge with trunk. 2012-10-14 13:14:37 +02:00
Martin Zibricky 0f18ec43a0 Bug #687638: improved performance of local aware sorting. 2012-10-14 13:11:48 +02:00
Raoul Snyman 14fec54927 Song import dialog now shows individual songs being imported. 
Improve the progress page of the FTW.

bzr-revno: 2088
 2012-10-14 08:01:46 +01:00
Tim Bentley 7ce17e99f8 Head 2087 2012-10-13 21:55:41 +01:00
Tim Bentley 77ddd4f385 Fixes 2012-10-13 21:54:56 +01:00
Raoul Snyman 43e41b2688 Try to lessen the number of superfluous process events signals 2012-10-13 19:05:55 +02:00
Raoul Snyman 83de6bb99f Fixed bug #851706: The song import dialog now shows individual songs being imported. Also tried to make the progress page of the FTW work better, pity it is only slightly... 
Fixes: https://launchpad.net/bugs/851706
 2012-10-12 20:51:47 +02:00
Martin Zibricky 4427d4168e Bug #687638: use locale aware comparison in other places too. 2012-10-12 15:00:56 +02:00
Martin Zibricky 2cc18a8fb4 Bug #687638: use locale aware comparison for songs by default. 2012-10-12 13:55:06 +02:00
Martin Zibricky 0836306f1b Bug 687638: add function locale_compare. 2012-10-12 00:55:21 +02:00
Andreas Preikschat 638b95f62c fixed shortcut dialog 2012-10-11 12:53:39 +02:00
Andreas Preikschat 6553dda038 reverted fix 2012-10-11 12:42:37 +02:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Andreas Preikschat a5b456a374 Fix bypass of X11 for Gnome Shell 
bzr-revno: 2081
 2012-10-10 20:49:31 +01:00
Tim Bentley c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Tim Bentley f52859c2f8 Fix the icons for the media plugin so they are shown. 
bzr-revno: 2078
 2012-10-10 17:48:33 +02:00
Tim Bentley f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01:00
Olivier Aubert 4a5b845cd0 updated from master 2012-10-08 17:44:42 +02:00
Andreas Preikschat 5d3269e907 fixed bug 1014422 ('X11 Over ride being on by default causes gnome-shell to become unusable') 
Fixes: https://launchpad.net/bugs/1014422
 2012-10-08 16:14:38 +02: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 802de6d241 fix 2012-10-03 22:11:54 +02:00
Andreas Preikschat 43af89f70f fix 2012-10-03 20:52:52 +02:00
Andreas Preikschat 99e4786ab6 fix 2012-10-03 20:44:00 +02:00
Andreas Preikschat c4bdea7edd fixes 2012-10-03 19:55:39 +02:00
Andreas Preikschat 4a7a7e9050 fixes 2012-10-03 19:09:56 +02:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat f375d4b0b8 fixed bug 1050081 'display screen - hide mouse by default' 
Fixes: https://launchpad.net/bugs/1050081
 2012-10-03 13:27:28 +02:00
Andreas Preikschat b226364559 when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 2012-10-02 19:35:10 +02:00
Andreas Preikschat afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +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
Tim Bentley a3e41b1ee7 Fix video injection and have black backgrounds 2012-09-29 17:27:55 +01:00
Andreas Preikschat 5eeab86db9 removed not needed parameters 2012-09-26 16:13:42 +02:00
Raoul Snyman b71043f37d Fixed bug #1051971 where we weren't validating that a user had actually selected a file. 
bzr-revno: 2070
Fixes: https://launchpad.net/bugs/1051971
 2012-09-24 18:07:48 +02:00
Andreas Preikschat 88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Andreas Preikschat 4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
ElderP 3855b28d40 Added [crashreport] as a valid section for settings import 2012-09-21 16:35:42 -04:00
Raoul Snyman 657beb727c Made changes to keep others happy. 2012-09-21 08:42:31 +02:00
Andreas Preikschat ea88f94e85 - do not reload theme list twice when renaming a theme 
- fixed not reloading list after adding a new theme [regression]

bzr-revno: 2068
 2012-09-20 07:21:17 +02:00
Andreas Preikschat e1707c4203 updated vlc.py from master 
bzr-revno: 2067
 2012-09-20 07:19:56 +02:00
Martin Zibricky 906f259d8e Fixed bug #963894 for the moment by dynamically removing VLC support from OpenLP on Mac OS X. 
bzr-revno: 2066
Fixes: https://launchpad.net/bugs/963894
 2012-09-19 23:59:26 +02:00
Andreas Preikschat 8545e04228 r2065 2012-09-19 20:44:19 +02:00
Andreas Preikschat 195608f39e do not reload theme list twice when renaming a theme; fixed not reloading list after adding a new theme 2012-09-19 20:43:02 +02:00
Andreas Preikschat 0a98901ab2 updated vlc.py 2012-09-19 08:34:45 +02:00
ElderP 86465f349d Added code to fix (normalize) the custom data path 2012-09-17 18:20:38 -04:00
Raoul Snyman 2591d24a41 Fixed bug #1051971 where we were not validating that a background image was being selected. 
Fixes: https://launchpad.net/bugs/1051971
 2012-09-17 23:30:10 +02:00
Tim Bentley 1d881e426a Fix service date formats 2012-09-16 16:33:05 +01:00
Martin Zibricky ba37730538 Remove cheching for non-existing file in media player code. 2012-09-15 18:47:14 +02:00
Tim Bentley 436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley c8f54a44ae Titles 2012-09-15 15:27:09 +01: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 795d11849d Local save works 2012-09-15 06:57:03 +01:00
Martin Zibricky a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Martin Zibricky 7089e6980a Fixed bug #1049036 in singlescreen mode set full screen mode instead of StaysOnTopHint. 2012-09-12 23:43:31 +02:00
Martin Zibricky c0a165d818 Fixed bug #1049036 where on osx openlp exited incorrectly with modified service. 2012-09-12 23:06:26 +02:00
Tim Bentley 1df6934bda Refactor video length 2012-09-09 07:54:09 +01:00
Tim Bentley 6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Tim Bentley a9dd3336fb Move media files around 2012-09-09 07:06:44 +01:00
Tim Bentley 0a65493ce0 Fix video autoplay options 
bzr-revno: 2056
 2012-09-08 20:32:51 +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
Raoul Snyman d943707fbf Added *.ogv to VLC. 
bzr-revno: 2055
 2012-09-08 20:14:30 +02:00
Raoul Snyman ad39fa11e5 Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) 2012-09-08 19:15:08 +02:00
Erik Lundin dd001e15ab Corrected width of the default main output area (was wider than the screen). 2012-09-08 00:17:53 +02:00
Tim Bentley 59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley 4986fbdce8 Head 2012-09-07 10:28:15 +01:00
Tim Bentley 6d53ed904b Fix extra line 2012-09-06 18:12:02 +01:00
Tim Bentley 9d692af5b9 Head 2012-09-06 17:38:54 +01:00
Tim Bentley ed2d670f18 fix ups 2012-09-06 17:38:31 +01:00
Martin Zibricky 9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Martin Zibricky 1a1f4f9743 Merge with trunk r2052. 2012-09-06 11:33:34 +02:00
Martin Zibricky 9736707e5b Fixed bug #1046599: String substitution cannot be done for translate() funciton and for QString type. 2012-09-06 11:31:27 +02:00
Andreas Preikschat 5792f8405f fixed bug #1046508 
Fixes: https://launchpad.net/bugs/1046508
 2012-09-06 00:00:26 +02:00
Tim Bentley 67931d6d00 Head 2012-09-04 21:22:42 +01:00
Tim Bentley 4390c13901 Auto start media 2012-09-04 21:22:27 +01:00
Raoul Snyman dcaf1f0934 typo 2012-09-02 16:53:51 +02:00
Raoul Snyman 9f6b6b99f3 Fixed a regression introduced by my previous bug fix. 2012-09-02 16:37:43 +02:00
Raoul Snyman b1f7f3b623 Meh. 2012-08-31 10:39:38 +02:00
Raoul Snyman b8a8995fdc Fixed bug #1018855: Set the WM_CLASS property in X11. 2012-08-30 21:28:38 +02:00
Jonathan Corwin f10f28aed6 Fixed bug #1041366 
bzr-revno: 2048
Fixes: https://launchpad.net/bugs/1041366
 2012-08-30 20:11:00 +02:00
Jonathan Corwin 7a5041536d Fix comment 2012-08-27 21:00:09 +01:00
Jonathan Corwin eade26690d Cleanups 2012-08-27 20:12:06 +01:00
Jonathan Corwin d8e5226b20 Next attempt 2012-08-27 20:04:53 +01:00
Philip Ridout f4b9cfd727 Fixed bug #1011286 and removed the constraint of no blank verses. 
bzr-revno: 2047
Fixes: https://launchpad.net/bugs/1011286
 2012-08-25 21:23:40 +02:00
Jonathan Corwin 4be69969fd Add comment 2012-08-25 17:50:26 +01:00
Jonathan Corwin c965905a30 Only renderer maindisplay 2012-08-25 17:36:48 +01:00
Jonathan Corwin 9b378fbea5 Fix 2012-08-25 17:29:17 +01:00
Jonathan Corwin 9864bf9084 update text on main event thread 2012-08-25 17:15:30 +01:00
Tim Bentley 72bfc662f7 fix Media detection on saved services 
bzr-revno: 2046
 2012-08-25 08:28:10 +01:00
Raoul Snyman eb6704cf01 Force the garbage collector to run. 2012-08-25 00:19:15 +02:00
Raoul Snyman 72d842a2aa Fix bug #1041366: Specified size display area not working. 
Fixes: https://launchpad.net/bugs/1041366
 2012-08-24 22:52:42 +02:00
Tim Bentley d003ff9009 Allow saved media to be played 2012-08-24 21:06:56 +01:00
Martin Zibricky 15d031eec1 Fix playback of videos with vlc in preview window on OSX. 2012-08-18 19:26:54 +02: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
Philip Ridout 96b787ff49 removed unecessary if statment 2012-08-13 20:25:28 +01:00
Philip Ridout 943cac3f7f a fix for bug 1022038 2012-08-09 22:48:05 +01:00
Brian T. Meyer 9b48175ab5 Addresses bug 995427 which results in About, Preferences and Quit menu items not moving to the right Application Menu when translated, by adding hints so Qt knows how to handle them. 
bzr-revno: 2043
Fixes: https://launchpad.net/bugs/995427
 2012-08-06 13:21:26 +02:00
Tim Bentley 8b6c2d0024 VLC plays wma files 
bzr-revno: 2042
 2012-08-05 22:10:31 +01:00
Tim Bentley 9813e45bde VLC does support wva 2012-08-05 19:17:52 +01:00
Brian T. Meyer briantmeyer@cox.net c14a4f4e8d fixed spaces around brackets to match style guidelines 2012-08-04 10:09:12 -07:00
Philip Ridout d8589c4a6e A few UI tweeks and updates. 
Changed Contribute button and icon to Volunteer (As discussed with Roaul on IRC)
Changed and resized the remote QR code for better recoginition on some phones (BrianMayerDesign)
Updated the link and text to the Android Market, as it is now know as Google Play
Set the window title for the ProcessDialog when importing songs using the first run wizard.
 2012-08-04 15:43:44 +01:00
Brian T. Meyer briantmeyer@cox.net 8100a66622 Contains fix to allow QT to move place About, Exit and Preference Menu 
Items into the Application menu per Apple UI guidelines.
 2012-08-03 21:34:13 -07:00
Philip Ridout c6d85d3ab8 Implemented gushies changes 2012-07-22 21:20:53 +01:00