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

3370 Commits

Author SHA1 Message Date
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
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
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 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 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 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
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 4390c13901 Auto start media 2012-09-04 21:22:27 +01: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
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
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 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
ElderP cf1a0b27ea Added code to hide data location wizard if running portable 2012-07-15 07:59:55 -04:00
Andreas Preikschat 978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Andreas Preikschat 0a89ddbc86 fixed traceback when deleting last formatting tag form the list 2012-07-11 23:05:28 +02:00
Andreas Preikschat fc5fbea624 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
bzr-revno: 2031
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 22:09:02 +02:00
Andreas Preikschat b743abac83 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 20:28:05 +02:00
Andreas Preikschat a2a19675f9 changed labels (bug 1022837) 
Fixes: https://launchpad.net/bugs/1022837
 2012-07-11 20:16:51 +02:00
Samuel Findlay 6d9cc62ab4 Various tidy-ups: 
* themeform: spelling
* easyslidesimport: old code, comment copied from elsewhere
* importer: clarify docstring
* zionworximport: module constant, variable names

bzr-revno: 2023
 2012-07-08 21:37:05 +02:00
Samuel Findlay efdc1126b1 Various tidy-ups 2012-07-08 18:23:56 +10:00
Andreas Preikschat bbc6b0d7b6 r2019 2012-07-07 16:55:23 +02:00
Andreas Preikschat 3c69631b59 clean ups 2012-07-07 16:54:14 +02:00
Samuel Findlay f9eab33dd9 Comment typo 2012-07-06 16:25:21 +10:00
Andreas Preikschat 4b6769f9b2 fixed bug 1021272 (Exporting settings fails with traceback in Build 2014) 
Fixes: https://launchpad.net/bugs/1021272
 2012-07-05 17:25:23 +02:00
Andreas Preikschat 25177adce6 - update the image cache when the image timestamp changes 
- reworked image manager's _cache

bzr-revno: 2013
 2012-07-02 20:45:03 +02:00
Andreas Preikschat 44161ebee9 Clean ups 
bzr-revno: 2011
 2012-07-02 19:32:41 +02:00
Samuel Findlay cba8ae36c4 Theme Wizard: updated final page's subtitle to match behaviour 
bzr-revno: 2009
Fixes: https://launchpad.net/bugs/1019696
 2012-07-02 19:27:51 +02:00
Andreas Preikschat b409bacca3 final fix for Trb143 2012-07-01 22:44:40 +02:00
Andreas Preikschat fb59eab8e7 removed fix because another branch fixes this differently 2012-07-01 20:45:51 +02:00
Andreas Preikschat 978045a845 r2007 2012-07-01 20:44:03 +02:00
Andreas Preikschat bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat f74c16b03b reverted parent() change 2012-07-01 19:58:58 +02:00
Samuel Findlay 3f7efd32c9 Updated Theme Wizard final page's subtitle to match behaviour that changed in r1176 2012-07-01 13:25:59 +10:00
Martin Barrett d2d129deb3 fixes bug #986699: Print Service not separating verses 2012-06-30 19:51:53 +01:00
Andreas Preikschat 3fc52181a5 make code more readable 2012-06-30 20:41:15 +02:00
Martin Barrett 30e760dbe3 fixes bug #986699: Print Service not separating verses 2012-06-30 18:25:49 +01:00
Martin Barrett d9037de8f2 fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:44 +01:00
Martin Barrett 620b8d519b fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:26 +01:00
Martin Barrett ac769b96f9 fixes bug #986699: Print Service not separating verses 2012-06-30 17:15:42 +01:00
Martin Barrett d86a94b3c0 fixes bug #986699: Print Service not separating verses 2012-06-30 17:11:49 +01:00
Andreas Preikschat 9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Andreas Preikschat 78753d03dc r2005 2012-06-30 12:46:24 +02:00
Martin Barrett c73a57afd3 fixed bug #986688 'PrintService copy not separating verses 
Fixes: https://launchpad.net/bugs/986688
 2012-06-29 00:17:17 +01:00
Andreas Preikschat 0f8054c1fd removed fixmes 2012-06-27 19:00:02 +02:00
Andreas Preikschat 894c6c2868 fixed 1014684 (OpenLP doesn't start on Windows XP) 
bzr-revno: 2005
 2012-06-26 17:14:42 +01:00
Andreas Preikschat 39916e4232 fixed code, fixed long lines 2012-06-23 19:21:27 +02:00
Andreas Preikschat d3e8950db8 fixed long line 2012-06-22 22:18:50 +02:00
Andreas Preikschat ab8e6ee30a use get_filesystem_encoding 2012-06-22 22:12:43 +02: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
Andreas Preikschat 155e99d307 fixed other occurrences 2012-06-19 18:09:59 +02:00
Raoul Snyman 6a688ab845 Catch a previously uncaught NotImplementedError. 
bzr-revno: 2000
Fixes: https://launchpad.net/bugs/1013215
 2012-06-19 15:03:24 +02:00
Jonathan Corwin ef134c2ea7 Release the application reference 2012-06-18 23:05:11 +01:00
Andreas Preikschat 826f83e8bf fixed 1014684 (OpenLP doesn't start on Windows XP) 
Fixes: https://launchpad.net/bugs/1014684
 2012-06-18 19:00:27 +02:00
Andreas Preikschat f2884f0593 update image in cache when timestamp changed; docs 2012-06-18 14:07:26 +02:00
Andreas Preikschat 2095a6d0d0 fixed wrong image being kept in cache when aborting the themeform 2012-06-17 18:25:56 +02:00
Andreas Preikschat de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00