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

4485 Commits

Author SHA1 Message Date
Tim Bentley 1f8e9017b2 Fix data type 2013-07-08 17:58:06 +01:00
Tomas Groth 289ee5ba40 Migrate service files from pickle to json and replace osd with osj 
bzr-revno: 2147
 2013-07-05 16:42:48 +01:00
Tomas Groth 5c8c3145bc Change service format from pickle based to json based. 2013-06-30 14:14:30 +02:00
Tim Bentley eec7a8490c Remove pickle from displaytags and move to json 2013-06-30 06:12:57 +01:00
Andreas Preikschat e1085a1798 increased possible min/max line spacing 
Fixes: https://launchpad.net/bugs/645452
 2013-06-14 11:54:59 +02:00
Martin Zibricky 496540257a This change should use the download url directly from download.cfg file and not connectiong to openlp.org for every download. (bug #1160506) 
bzr-revno: 2142
Fixes: https://launchpad.net/bugs/1160506
 2013-04-20 11:27:35 +02:00
Andreas Preikschat 2b02a3f868 Fix file filters 
bzr-revno: 2141
 2013-04-14 19:21:40 +01:00
Martin Zibricky 576524b873 Bug #1160506 - remove print statement. 2013-04-11 12:06:44 +02:00
Martin Zibricky 1c4c2e3636 Bug #1160506 - wrap url constructions into join_url() function. 2013-04-09 11:53:42 +02:00
Martin Zibricky caf1290a16 Fixed bug #1160506 - use download settings exlusively from download.cfg. 2013-04-05 23:31:23 +02:00
Andreas Preikschat e2c81aaf00 replaced other file masks 2013-03-19 20:22:10 +01:00
Andreas Preikschat 8df2a6af32 fixed bug 1146964 
Fixes: https://launchpad.net/bugs/1146964
 2013-03-19 20:07:02 +01:00
Andreas Preikschat 8a97088526 added missing space in log message 2013-03-19 19:57:44 +01:00
phill-ridout 1ac1619b85 Changed extenstion to *.* 2013-03-14 22:16:36 +00:00
phill-ridout 633bbc02cf 2013-03-12 22:02:53 +00:00
phill-ridout 5ac1d0809e 2013-03-12 21:56:04 +00:00
phill-ridout d5f8201c8b 2013-03-12 21:26:38 +00:00
phill-ridout 2c01be044c Fixes #1154059 2013-03-12 21:03:38 +00:00
Andreas Preikschat fac9f027e0 fixed bug 1147307 (Transtion + fast slide changes + ESC causes screen to open again) 
Fixes: https://launchpad.net/bugs/1147307
 2013-03-05 18:14:17 +01:00
Andreas Preikschat 7f814c12ee fixed bug #1128376 (Configure shortcuts has two items called settings) 
Fixes: https://launchpad.net/bugs/112837
 2013-02-19 14:58:55 +01:00
Andreas Preikschat 5c6a63e518 fixed bug 1112587 
Fixes: https://launchpad.net/bugs/1112587
 2013-02-10 13:21:59 +01:00
Andreas Preikschat 19495c4719 fixed Bug 1086987 (Log system does not log all exceptions) 
Fixes: https://launchpad.net/bugs/1086987
 2013-01-20 19:46:41 +01:00
Arjan Schrijver 12eb03f8f9 When a saved service file is loaded, images always get a black background instead of the configured background. This patch fixes that, although I'm not sure if it fits within the coding standards. 
bzr-revno: 2129
 2013-01-18 19:15:40 +00:00
Arjan Schrijver 28241d591c Fix line spacing 2013-01-15 22:28:47 +01:00
Arjan Schrijver 7e2e72b4a6 Read the background color setting outside of the loop 2013-01-10 13:05:33 +01:00
Arjan Schrijver 8b01158856 Make sure images use the configured background/border color when loaded from a saved service file 2013-01-10 11:12:47 +01:00
Samuel Mehrbrodt 36fb2ddc42 When importing a presentation containing a non-ASCII character, an exception is no longer thrown preventing the file from being loaded. 
bzr-revno: 2126
Fixes: https://launchpad.net/bugs/1093184
 2013-01-05 11:31:02 +00:00
Samuel Mehrbrodt f37482dec5 Remove blank line 2013-01-04 12:03:03 +01:00
Samuel Mehrbrodt 908a56586d Revert cleanups for this branch, only the bugfix 
Fixes: https://launchpad.net/bugs/1093184
 2013-01-03 23:11:28 +01:00
Jonathan Corwin 0377c8ad26 Attempt to successfully import the settings we can now export. 
* QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

* If you run 2.1, even if just the once, it'll create a [players] settings group. If you later go back to 2.0 it'll load this group (even if it doesn't use it) and so it'll be exported. However the import considers the group invalid so fails. I've therefore changed the import to be more forgiving and just ignore unknown groups. A basic sanity test is done earlier instead.

bzr-revno: 2125
 2013-01-02 20:10:37 +00:00
Tim Bentley bdef1b73f2 head 2012-12-30 19:41:40 +00:00
Tim Bentley c912dea3b6 2013 2012-12-30 19:41:24 +00:00
Jonathan Corwin 4257ce2932 Attempt to load %General section, and just ignore those we don't know 2012-12-29 22:55:40 +00:00
Tim Bentley e54f4eec7b Interface unusable when run on XFce 2012-12-26 12:20:30 +00:00
Tim Bentley 81640a9612 Fix media starting in wrong place 2012-12-21 19:19:26 +00:00
Samuel Mehrbrodt 1e53bd37a6 Fix import of files that contain non-ascii chars. 
QStringList containing QStrings is converted to std list containing unicode strings.
Thus, we don't need these unicode() calls on the contents of the list  anymore.
 2012-12-19 23:05:48 +01:00
Samuel Mehrbrodt c45d6915c7 Convert QStringList to Python list. 
This fixes importing when the path name contains non-ascii chars.
 2012-12-19 13:37:40 +01:00
Jonathan Corwin 1c651abea2 Set css on specific widgets 2012-12-06 22:06:59 +00:00
Patrick Zimmermann 47d8bd7e5f Correct indentation. 2012-11-22 19:01:50 +01:00
Patrick Zimmermann 883a4baba3 Turn off alternating row colors on Windows. 2012-11-22 00:03:28 +01:00
Raoul Snyman fed4a0adda Add additional media suffix to vlc 
bzr-revno: 2112
 2012-11-20 19:19:24 +00:00
Raoul Snyman 85920b2132 Added .m4v to list of allowed VLC extensions. 2012-11-20 15:04:46 +02:00
Tim Bentley fb558935ca guard against missing image files in themes 
Fixes: https://launchpad.net/bugs/1071170
 2012-11-16 19:15:36 +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
Raoul Snyman e919c53434 Fix DB unit of work for updates 
Fix Bible identification code for BibleGateway

bzr-revno: 2109
 2012-11-11 17:25:09 +00:00
Raoul Snyman b76be3d6b8 Fixed bug #1077654 where there were more classes in the CSS, but we were specifically looking for only one class. Made the code less brittle. 
Fixes: https://launchpad.net/bugs/1077654
 2012-11-11 18:09:23 +02:00
Erik Lundin 4c502dba9c Fixed the spelling of "Erik Lundin" 2012-11-10 21:09:09 +01:00
Philip Ridout e90af50fd6 Removes items with missing files prior to saving (after confirmation from user) 
bzr-revno: 2106
 2012-11-10 16:38:26 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Philip Ridout 0bc2e5b71e Simplified Validate Method 2012-11-07 21:10:38 +00:00
Martin Zibricky 72bb217749 This is the fix for playback with vlc on osx. It also includes fix to get media length without starting playback of a video. 
I tested it only on osx in one- and dual-screen setup so far.

Also controllersVisible is renamed to controlsVisible.

bzr-revno: 2104
 2012-11-07 18:42:21 +00:00
Philip Ridout b47512254b fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 
bzr-revno: 2102
Fixes: https://launchpad.net/bugs/1066142
 2012-11-06 18:34:00 +00:00
Martin Zibricky 5c82a0c3dd Bug #963955 : Rename controllersVisible to controlsVisible. 2012-11-06 12:58:32 +01:00
Martin Zibricky 54fac2266e Merge with trunk. 2012-11-06 12:54:51 +01:00
Philip Ridout 4f78c5e5bc fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 2012-11-04 20:45:31 +00:00
Philip Ridout 443ad478c1 Added validate function to serviceitem 2012-11-02 18:54:42 +00:00
Raoul Snyman 61b505f1bd Updated the image in the About dialog to the one from the new web site. 
Fixes: https://launchpad.net/bugs/1069109
 2012-11-01 19:41:22 +02:00
Philip Ridout d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Philip Ridout 713f742a3a fixed indentation. 2012-10-30 18:36:39 +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
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 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
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
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
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
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 a5b456a374 Fix bypass of X11 for Gnome Shell 
bzr-revno: 2081
 2012-10-10 20:49:31 +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
Andreas Preikschat afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +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
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