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

5137 Commits

Author SHA1 Message Date
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
Philip Ridout
1d4e5c9430 I have actually fixed the entering of verses with no text! 2012-07-22 09:50:37 +01:00
Andreas Preikschat
08c258a9f1 Fixed bug 1023585 (No handlers could be found for logger 'openlp.core.lib') 
bzr-revno: 2035
Fixes: https://launchpad.net/bugs/1023585
 2012-07-20 09:45:05 +02:00
Andreas Preikschat
a10c56e976 fixed bug 1023585 (No handlers could be found for logger 'openlp.core.lib') 
Fixes: https://launchpad.net/bugs/1023585
 2012-07-19 19:26:04 +02: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
60f08438b3 fixed bug 1022837 (Configure Formatting Tags has inconsistent control labels) 
bzr-revno: 2030
Fixes: https://launchpad.net/bugs/1022837
 2012-07-11 21:56:17 +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
Andreas Preikschat
ef49432548 fixed bug 1023522 (OpenLP does not start in debug mode) 
Fixes: https://launchpad.net/bugs/1023522
 2012-07-11 20:06:33 +02:00
Stevan Pettit
2e693c0d52 Added code to put logfile into portableapp-dir/other if running portable. 
bzr-revno: 2028
Fixes: https://launchpad.net/bugs/1020068
 2012-07-11 13:13:03 +02:00
ElderP
746eb094e7 Removed comment 2012-07-08 18:11:20 -04:00
Raoul Snyman
c1d5831887 Fixed up some issues with the FreeBSD port. 
bzr-revno: 2024
 2012-07-08 22:58:05 +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
ElderP
cc5da47886 Fixed proc name 2012-07-08 15:32:56 -04:00
Raoul Snyman
6d236e9671 Fixed two issues in FreeBSD. Firstly, the translation files were never being picked up, and secondly, OpenLP is installed into /usr/local, so we need to make provision for that. 2012-07-08 21:27:43 +02:00
ElderP
8ad5fdad4a Added code to put logfile into appdir/other if running portable 2012-07-08 08:53:06 -04: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
d604d6b07f fixed spelling 2012-07-02 20:47:12 +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
4e158ed8f0 fixed variable name 
bzr-revno: 2012
 2012-07-02 19:38:00 +02:00
Andreas Preikschat
44161ebee9 Clean ups 
bzr-revno: 2011
 2012-07-02 19:32:41 +02:00
Andreas Preikschat
c6e7a297ad Variable fixes 
bzr-revno: 2010
 2012-07-02 19:31:12 +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
Jonathan Corwin
886963b7cb Reduce the number of times a new QWebView is created, which seems to prevent OpenLP from crashing when creating a new theme and there are a lot of items in the service. 
bzr-revno: 2008
Fixes: https://launchpad.net/bugs/1016843
 2012-07-02 19:22:56 +02:00
Andreas Preikschat
b409bacca3 final fix for Trb143 2012-07-01 22:44:40 +02:00
Andreas Preikschat
6869ea41f6 updated doc 2012-07-01 21:41:12 +02:00
Andreas Preikschat
e31ac2cdde fixed variables 2012-07-01 21:22:11 +02:00
Andreas Preikschat
584aedb308 fixed doc 2012-07-01 21:22:10 +02:00
Andreas Preikschat
fb59eab8e7 removed fix because another branch fixes this differently 2012-07-01 20:45:51 +02:00
Andreas Preikschat
6f353ab01d fixed variable name 2012-07-01 20:45:14 +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
Jonathan Corwin
65beb6ccda move webview to init and use %s 2012-06-30 23:20:16 +01: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
Jonathan Corwin
2518a340ae Well only creating the QWebView just the once fixes it. But I'm sure we used to do that and there was a good reason why we started recreating it for each render... 2012-06-25 23:14:53 +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
Andreas Preikschat
bb814eacb9 Fixed non existing variable under certain conditions. 
bzr-revno: 1999
 2012-06-19 15:02:10 +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
d1f1113851 use the update mechanism to reset images instead of deleting them (leading to a time advantage when the image did not change) 2012-06-18 14:27:04 +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
87722c9579 fixed non existing variable under certain conditions 2012-06-17 17:41:36 +02:00
Andreas Preikschat
84332702a5 r1994 + conflict 2012-06-16 17:22:18 +02:00
Andreas Preikschat
de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00
Andreas Preikschat
8eacb2c50b - fixed ticket 695 2012-06-15 18:19:46 +02:00
Andreas Preikschat
9496c68fa7 r1990 2012-06-15 17:34:57 +02:00
Andreas Preikschat
08adb54679 updated vlc.py 2012-06-15 17:31:24 +02:00
Raoul Snyman
0ad713407b Fixed bug #1013215: Catch a previously uncaught NotImplementedError and do nothing so that OpenLP realises that VLC is not available. 
Fixes: https://launchpad.net/bugs/1013215
 2012-06-14 23:20:55 +02:00
Andreas Preikschat
6a23b75b8c reverted changes 2012-06-14 17:46:47 +02:00
Andreas Preikschat
21fc0f9533 fixed docstring 2012-06-13 17:53:54 +02:00
Andreas Preikschat
1f5ac7f483 fixed ticket 729 and fixed variables to camelCase 2012-06-13 17:44:33 +02:00
Dave Warnock
e0c5fabc5a Amend DB Error OperationError 
bzr-revno: 1988
 2012-06-11 18:33:57 +01:00
Dave Warnock
b9b0d83a00 renamed tryCount local variable to try_count 2012-06-11 15:11:53 +01:00
Dave Warnock
913b0433f6 This update is a tidy up of the code that fixed bug #927473 
Changes are made due to the following issues:

- the code assumed that exception OperationalError would only be thrown by  mySQL temporarily disappearing. However, other dbms can throw this exception and usually for errors that mean a retry will also fail.

- the code repeated the actual code of the method within the exception handler. This means code duplication and also that any new exceptions  are not handled by the same exception handler so for example their transaction will not get rolled back.

- not all potential dbms exceptions were caught and so in some cases the database transaction was not rolled back

The solution is to retry transactions where an OperationalError is thrown. Currently these are retried up to 3 times before the error is logged and the method returns false. By retrying the transaction we ensure that the same transaction code with the same exception handlers is used each time.

An additional catchall exception has been added where there is a transaction to ensure that it is rolled back. As with the OperationError this throws the exception back up the stack.
 2012-06-10 22:45:02 +01:00
Stevan Pettit
c306573309 Minor changes to logging, variable name 2012-06-10 15:53:46 -04:00
Stevan Pettit
8365d6f589 Fixed some cosmedics 2012-06-10 10:29:50 -04:00
Andreas Preikschat
7281f44603 removed argument 2012-06-10 15:39:45 +02:00
Stevan Pettit
245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Samuel Findlay
f1afae1813 Added ZionWorx importer. Added descriptionLabel to song import wizard. 
bzr-revno: 1986
 2012-06-09 19:58:56 +01:00
Stevan Pettit
24bcc54d68 Provides the ability to change the data path storing the config files and databases. 
bzr-revno: 1985
 2012-06-09 19:50:56 +01:00
Andreas Preikschat
6c981afedc - clean ups 
bzr-revno: 1984
 2012-06-09 20:28:07 +02:00
Andreas Preikschat
fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat
e8eb2e317d updated vlc.py 2012-06-09 15:46:34 +02:00
Stevan Pettit
67093ed65f Added code to call superclass cancel 2012-06-09 08:03:47 -04:00
Stevan Pettit
c4d3ba5559 Fixed indenting 2012-06-09 00:32:28 -04:00
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit
d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Stevan Pettit
b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Andreas Preikschat
f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay
0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay
a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay
2fb09b2462 Working ZionWorxImport 2012-06-05 19:16:24 +10:00
Stevan Pettit
1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Andreas Preikschat
ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Andreas Preikschat
8f0ddfac9d r1979 2012-06-04 11:53:34 +02:00
Samuel Findlay
6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay
501107c840 r1979 2012-06-03 23:53:20 +10:00
Edwin Lunando
b05774e672 Fixed bug #902492: the theme wizard now uses the current output display geometry when creating a thumbnail for a theme. 
bzr-revno: 1979
Fixes: https://launchpad.net/bugs/902492
 2012-06-03 00:01:52 +02:00
Stevan Pettit
de15cf85a3 Changed some labels. Fixed GUI buttons 2012-06-01 14:36:53 -04:00
Samuel Findlay
78c4906b55 2012-06-01 17:32:58 +10:00
Samuel Findlay
5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay
d86caecbbf Refactored sourcePage validation: reimplemented QWizardPage.isComplete() so that Next button is disabled until source(s) are selected. validateCurrentPage gives each song format class chance to validate its input. 2012-05-31 19:15:45 +10:00
Tim Bentley
ab0be0006a Cache theme backgrounds earlier 
bzr-revno: 1978
 2012-05-30 20:58:33 +01:00
Tim Bentley
cdb6859edf Add space 2012-05-30 20:50:24 +01:00
Samuel Findlay
2b51e7fcdc r1977 2012-05-31 01:01:25 +10:00
Samuel Findlay
e882607360 Completed refactor of importer.py 2012-05-30 19:11:44 +10:00
Tim Bentley
14bdc5ca7a Remove blank lines 2012-05-29 20:13:02 +01:00
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Edwin Lunando
faebbc1f5d comment reformatting 2012-05-28 09:43:00 +07:00
Andreas Preikschat
4943e6681d - fixed crash on chancel if thread is still running in FTW 
bzr-revno: 1977
 2012-05-27 19:58:58 +02:00
Andreas Preikschat
d5f1c54669 do some of the clean ups even when we just imported settings 2012-05-27 12:58:10 +02:00
Edwin Lunando
749a90b9da merge with trunk. 2012-05-27 17:02:03 +07:00
Edwin Lunando
32ee1ec343 refactor code 2012-05-27 16:41:53 +07:00
Tim Bentley
3bc0fc7de5 cache images sooner 2012-05-27 07:06:18 +01:00
Andreas Preikschat
612500c677 r1976 2012-05-26 19:53:03 +02:00
Andreas Preikschat
51d69a28ce stop imageManager thread on shutdown 2012-05-26 19:51:27 +02:00
Andreas Preikschat
56b02b02b1 attribute instead of method 2012-05-26 19:12:01 +02:00
Andreas Preikschat
f96073000f fixed crash on cancel when thread is still running 2012-05-26 18:52:34 +02:00
Andreas Preikschat
fc577afda2 little clean up, doc string 2012-05-24 21:05:15 +02:00
Andreas Preikschat
71e8a7a2eb fixes and doc string 2012-05-24 20:00:43 +02:00
Stevan Pettit
ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Andreas Preikschat
45a9b5f615 clean ups 2012-05-23 23:02:34 +02:00
Stevan Pettit
7bc4c5f318 Settings to set default as ini format 2012-05-23 13:13:22 -04:00
Andreas Preikschat
0517f3d8d7 renamed attribute 2012-05-23 18:59:28 +02:00
Andreas Preikschat
28930a9c32 added missing docstring 2012-05-23 18:55:41 +02:00
Andreas Preikschat
8a90476f89 added missing line 2012-05-23 18:53:08 +02:00
Andreas Preikschat
45c05e700d clean ups 2012-05-23 18:53:04 +02:00
Andreas Preikschat
ded1e82659 r1975 2012-05-23 18:49:24 +02:00
Andreas Preikschat
1604d863eb clean ups 2012-05-23 18:46:54 +02:00
Andreas Preikschat
4a6697f5a1 r1975 2012-05-23 18:31:25 +02:00
Andreas Preikschat
2745406038 removed test code 2012-05-23 18:28:35 +02:00
Samuel Findlay
bda1a0c420 Changes PowerSong importer to import a folder, rather than a selection of files. This involved implementing a getFolder method in core.ui.OpenLPWizard. 
bzr-revno: 1975
 2012-05-23 18:26:47 +02:00
Andreas Preikschat
c15ac3a84e last fixes 2012-05-23 18:14:03 +02:00
Stevan Pettit
357f876331 Removed unused import qtcore 2012-05-21 08:41:33 -04:00
Stevan Pettit
968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Stevan Pettit
0548bfb345 Modified code to use the directory choosen by user, don't append a sub-dir 2012-05-20 21:23:50 -04:00
Raoul Snyman
1c57abf8ab Refactored ScreenList into a true Pythonic singleton, though I sadly had to go with a "create" classmethod in order to retain the functionality of the previous constructor.. 2012-05-20 22:56:11 +02:00
Stevan Pettit
f239cdcdad Various changes 2012-05-20 15:29:08 -04:00
Andreas Preikschat
a5fa986bdd continued work 2012-05-20 21:11:27 +02:00
Andreas Preikschat
060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Andreas Preikschat
9fa14f3e3a attempt to fix bug 923496 
Fixes: https://launchpad.net/bugs/923496
 2012-05-20 17:52:21 +02:00
Edwin Lunando
fb8519694e updated the set_default_header_footer method on lib/theme.py 
all the works and the import is inside the method.
 2012-05-20 21:05:06 +07:00
Andreas Preikschat
0ba3ccf199 random clean ups 2012-05-19 20:56:28 +02:00
Edwin Lunando
41d1ea3590 added comment 2012-05-19 23:50:45 +07:00
Andreas Preikschat
5157f3a714 fixed traceback 2012-05-19 17:49:23 +02:00
Andreas Preikschat
49cd100f90 clean up 2012-05-19 17:41:05 +02:00
Andreas Preikschat
b0585297fb clean up 2012-05-19 17:30:09 +02:00
Andreas Preikschat
1fe4e0a56a removed toFloat() 2012-05-19 17:25:39 +02:00
Andreas Preikschat
01db1d34d8 removed/added empty lines 2012-05-19 17:12:15 +02:00
Andreas Preikschat
a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Samuel Findlay
e28f654b0f r1972 2012-05-19 20:49:05 +10:00
Andreas Preikschat
b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Andreas Preikschat
b07fab7ff0 clean up 2012-05-19 10:50:33 +02:00
Edwin Lunando
b9aaaf05f6 Using the renderer.py calculation 2012-05-19 15:46:22 +07:00
Andreas Preikschat
175b01621d fixed songusage, clean ups 2012-05-19 10:44:45 +02:00
Andreas Preikschat
374a426340 added another case, clean ups 2012-05-19 10:29:31 +02:00
Andreas Preikschat
039ba3f412 r1972 + conflict 2012-05-18 17:14:09 +02:00
Edwin Lunando
3fdb3b2991 I've resolved the bug #902492 
I got the primary screen resolution from the ScreenList class.
 2012-05-18 17:44:28 +07:00
Edwin Lunando
81f0ff3870 #902492 resolved. All the working code is a placed at theme.py. 2012-05-18 17:38:05 +07:00
Stevan Pettit
aa5805863a Moved location of settings ini file to ..\Data 2012-05-17 23:24:49 -04:00
Andreas Preikschat
779a1201fc reverted some changes to avoid conflicts + clean up 2012-05-17 22:26:31 +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
c36475f27e completely fixed recently file menu 2012-05-17 21:57:45 +02:00
Andreas Preikschat
3fa5422d7d fixed recent file menu 2012-05-17 21:49:06 +02:00
Stevan Pettit
a7fc64f0c3 Fixed problem with Import settings. 2012-05-17 15:23:58 -04:00
Andreas Preikschat
06e49d4b97 clean up 2012-05-17 21:01:15 +02:00
Andreas Preikschat
ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat
a379d9ec54 more clean ups 2012-05-17 18:53:54 +02:00
Andreas Preikschat
56c36f355d More clean ups and fixes 2012-05-17 18:35:58 +02:00
Andreas Preikschat
5378399302 more clean ups 2012-05-17 18:32:43 +02:00
Andreas Preikschat
4a979b49d9 continued to implement QString v2 api 2012-05-17 18:19:06 +02:00
Andreas Preikschat
2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Andreas Preikschat
0b9923742e trivial clean ups 2012-05-17 14:59:57 +02:00
Edwin Lunando
a251522ef3 #902492 resolved 2012-05-16 20:14:32 +07:00
Stevan Pettit
eb58ee10e8 Changed name of settings INI to conform to PortableApps Standards 
Disabled data path change when running portable
 2012-05-14 23:17:20 -04:00
Stevan Pettit
2f38d55261 Changes to accomodate correct directory structure 2012-05-11 14:37:57 -04:00
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Stevan Pettit
cf0e8c184e Fixed code per comments. Fixed misc syntax errors. 2012-05-10 19:23:45 -04:00
Tim Bentley
01ed8e4ed8 Fix delete key for services 
bzr-revno: 1970
 2012-05-07 18:07:34 +01:00
Tim Bentley
7cb1603d12 Fix traceback 2012-05-07 17:01:53 +01:00
Andreas Preikschat
5f1afcf9de show shortcuts in service item menu 2012-05-07 17:49:22 +02:00
Samuel Findlay
a03af240df Minor fixes 2012-05-07 23:38:02 +10:00
Samuel Findlay
28d9a05731 Adapted all PowerSong import widgets for select folder 2012-05-07 21:24:46 +10:00
Samuel Findlay
bf4dcdde92 Added getFolder to OpenLPWizard 2012-05-07 20:36:39 +10:00
Tim Bentley
f9247078bc more Delete clean ups 2012-05-07 09:35:52 +01:00
Tim Bentley
bcb6668792 Delete clean ups 2012-05-07 09:21:21 +01:00
Tim Bentley
5815d637a7 Add Service delete to Shortcuts and allow from keyboard 2012-05-07 08:40:34 +01:00
Andreas Preikschat
be26adc0b8 added secondary priority for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority 
bzr-revno: 1968
 2012-05-05 21:53:34 +02:00
Samuel Findlay
fc8c5598aa Changed 'PowerSong' to 'PowerSong 1.0 and Code tidy ups. 
bzr-revno: 1967
 2012-05-05 19:51:31 +01:00
Andreas Preikschat
2680cc7cda - fixed regression which I have introduced in r1962 (user defined formatting tags were not considered any longer); - reworked staticmethods (merged functions etc); - changed saveButton behaviour to reflect the internal things happening (the button is now only enabled when you can save a change) 
bzr-revno: 1966
 2012-05-05 20:38:59 +02:00
Andreas Preikschat
8b08fbbe32 docs and class variable fix 2012-05-05 20:34:26 +02:00
Andreas Preikschat
265b703ba9 fixed bug 885874 (Song with mis matched formatting tags abends on render); fixed one extra new lines added before and after an optional break 
bzr-revno: 1965
Fixes: https://launchpad.net/bugs/885874
 2012-05-05 20:15:13 +02:00
Andreas Preikschat
5959ee5158 fixed regression, reworked staticmethods, changed button behaviour to reflect the internal actions 2012-05-05 18:03:40 +02:00
Andreas Preikschat
b72101c724 fixed formatting tag not being present on slides 2012-05-05 16:36:47 +02:00
Andreas Preikschat
a9c1443cc5 r1963 2012-05-05 15:59:27 +02:00
Andreas Preikschat
34b3173988 fixed bug 885874 (Song with mis matched formatting tags abends on render) 
Fixes: https://launchpad.net/bugs/885874
 2012-05-05 15:59:04 +02:00
Andreas Preikschat
7f7ac0c54e extended doc string 2012-05-05 14:40:31 +02:00
Andreas Preikschat
aa917e7aba fixed cap 2012-05-05 14:38:06 +02:00
Andreas Preikschat
baf1c792e5 clean ups 2012-05-05 14:24:25 +02:00
Andreas Preikschat
785787d7f3 added secondary criterion for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority 2012-05-05 14:23:42 +02:00
Stevan Pettit
3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Andreas Preikschat
554df1e363 Improved renderer performance: 0.11 vs. 0.29 (average time needed) 
bzr-revno: 1962
Fixes: https://launchpad.net/bugs/856296
 2012-05-03 22:51:04 +02:00
Stevan Pettit
e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Samuel Findlay
416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay
76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Andreas Preikschat
6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +02:00
Andreas Preikschat
63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Raoul Snyman
c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Samuel Findlay
ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Andreas Preikschat
dbe85abb84 updated vlc.py 
bzr-revno: 1960
 2012-05-01 15:11:24 +02:00
Andreas Preikschat
99314e762d refactor version comparison code; removed dead code 
bzr-revno: 1959
 2012-05-01 14:58:22 +02:00
Meinert Jordan
da46ec470a pythonifying code: 
bzr-revno: 1957
 2012-05-01 12:21:57 +01:00
M2j
eafd3a20ae revert openlp/core/ui/media/mediacontroller.py to prevent merge conflict 2012-05-01 13:03:31 +02:00
Andreas Preikschat
a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Andreas Preikschat
bd4cded398 updated vlc.py 2012-05-01 12:38:19 +02:00
M2j
c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
Samuel Findlay
21a88085e3 First attempt at class openlp.plugins.songs.lib.PowerSongImport 2012-04-30 00:08:25 +10:00
Andreas Preikschat
f6177c62b2 fixed LooseVersion usage 2012-04-28 18:22:37 +02:00
Andreas Preikschat
76c004bb9a fixed LooseVersion usage 2012-04-28 18:19:02 +02:00
Andreas Preikschat
69affcc059 removed dead code, refactor version comparison code 2012-04-28 15:51:05 +02:00
Andreas Preikschat
38e5635901 r1955 2012-04-28 15:19:26 +02:00
Andreas Preikschat
9668b22f85 shorter solution 2012-04-28 15:10:54 +02:00
Andreas Preikschat
9dc7d1a795 fixed cap 2012-04-28 14:28:38 +02:00
Andreas Preikschat
42bc12f3fb try to prevent traceback when vlc too old 
Fixes: https://launchpad.net/bugs/966086
 2012-04-28 14:27:18 +02:00
Andreas Preikschat
1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat
f01252c23b fixed missing word 2012-04-28 13:31:42 +02:00
Andreas Preikschat
cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
Philip Ridout
7b99c97174 Adds DreamBeam song importer. 
Small fix for SongShowPlus importer.

bzr-revno: 1955
 2012-04-25 20:50:08 +02:00
Raoul Snyman
948186c45c A bunch of refactoring, including more sensible naming conventions. 
bzr-revno: 1953
 2012-04-25 20:43:57 +02:00
Raoul Snyman
ad84097547 Added a generic except to catch other UNO problems. 
Fixes: https://launchpad.net/bugs/987568
 2012-04-24 18:50:12 +02:00
Raoul Snyman
640e12d85e Some more refactoring and renaming. 
Changed the Bible upgrade to leave the old values behind so that older versions of OpenLP don't delete the "corrupted" databases.
 2012-04-23 21:19:13 +02:00
Raoul Snyman
0f1bca77b4 Some small coding standards things. 2012-04-22 21:50:18 +02:00
Raoul Snyman
070ed7fcb5 Merged HEAD from trunk and fixed a conflict. 
Some more refactoring.
 2012-04-22 21:37:11 +02:00
Andreas Preikschat
baf758e45d trivial cleanups part 2 
bzr-revno: 1950
 2012-04-22 08:32:13 +01:00
Raoul Snyman
4452d4834c Refactored various variable names. 
Refactored the names of the fields in the "metadata" table of Bibles, and provided an upgrade script to upgrade the Bibles seamlessly.
Refactored the name of a setting, and wrote some code to migrate it seamlessly.
 2012-04-22 00:29:08 +02:00
Raoul Snyman
7d5d7d7116 Changed the 'Split' button to say 'Optional Split' instead. 
bzr-revno: 1945
 2012-04-20 21:32:34 +02:00
Tim Bentley
44a7c32baf Updates to web to allow Android to poll 
bzr-revno: 1944
 2012-04-19 21:19:02 +01:00
Raoul Snyman
489f19cf39 Renamed all instances (i.e. comments) of 'virtual' to 'optional' 2012-04-18 23:55:44 +02:00
Andreas Preikschat
0fdf3b7f7c trivial clean ups 2012-04-16 09:02:24 +02:00
Raoul Snyman
70d75b0f80 Removed an unused import. 
Changed the "Split" button to say "Optional Split" instead.
 2012-04-13 22:08:05 +02:00
Andreas Preikschat
620d858d68 clean ups 2012-04-12 16:16:12 +02:00
Tim Bentley
2052387a91 head 2012-04-10 20:39:20 +01:00
Tim Bentley
04b4a34c68 Add service count for remotes 2012-04-10 20:38:25 +01:00
Andreas Preikschat
4ec49627db fixed comments, simplification, removed not needed attribute 2012-04-09 12:22:47 +02:00
Andreas Preikschat
aa8457dd6e reverted changes and fixed the bug differently 2012-04-09 12:01:06 +02:00
Andreas Preikschat
6ad7a867cc fixed bug 970436 ('Display if a single screen' always in effect) 
Fixes: https://launchpad.net/bugs/970436
 2012-04-08 14:53:11 +02:00
M2j
bca06c4a7a fix: wrong method name 2012-04-05 00:41:18 +02:00
M2j
3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
M2j
5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
M2j
7175902e6d removed whitespaces 2012-04-03 19:58:42 +02:00
Meinert Jordan
6a4edea071 Change default theme level to song level. 
String fixes.
Fix missalignment of theme level selection labels.

bzr-revno: 1933
Fixes: https://launchpad.net/bugs/960386
 2012-04-03 18:15:52 +01:00
M2j
9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
Meinert Jordan
a57289da8c Bug #967522: Don't drag from empty service manager area 
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
 2012-04-02 23:12:51 +02:00
Meinert Jordan
22d29e7d62 Bug #959760: Change theme manager delete button visibility on default theme change. 
bzr-revno: 1927
Fixes: https://launchpad.net/bugs/959760
 2012-04-02 23:06:16 +02:00
M2j
dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
M2j
45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j
41ff5b04df small fixes 2012-04-02 21:34:49 +02:00
M2j
b97445eaab string changed 2012-04-02 20:44:07 +02:00
M2j
40774f6375 Bug #923500: Do not mark service changed when accepting settings dialog. 2012-04-02 17:33:54 +02:00
M2j
f876898033 Bug #959760: Change theme manager delete button visibility on default theme change. 2012-04-02 15:46:41 +02:00
M2j
3fc81ea230 Bug #967522: Don't drag from empty service manager area 2012-04-02 14:25:55 +02:00
M2j
352ee8e041 Bug #960386: string fixes 
fix missalignment of theme level selection labels
change default theme level to song level
 2012-04-02 12:32:52 +02:00
M2j
c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
M2j
6657e27694 add objectName parameter to create_button_box method 
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
 2012-04-02 00:44:09 +02:00
M2j
d7ab06cc7e - reorganisation of methods in openlp.core.lib.ui to make them more comprehensive 
- some small restatements of some code in bibles parse_reference() method
 2012-04-01 23:19:56 +02:00
Andreas Preikschat
390def1f61 fixed 'Search Themes...' string 2012-03-26 11:41:59 +02:00
Andreas Preikschat
3136ee475c remove not needed import 2012-03-25 23:36:09 +02:00
Andreas Preikschat
9a53a8211e removed not needed import 2012-03-25 23:34:02 +02:00
Andreas Preikschat
7f4664b69b each search 'type' has its own place holder text instead of the generic 'Search...' place holder 2012-03-25 23:09:44 +02:00
Edwin Lunando
49dbda7476 themeform.py line 426 at function setPositionPageValues(self): 
added main and footer page width and height based on the screen size
 2012-03-25 19:37:22 +07:00
Philip Ridout
b68300bdc6 New importer for DreamBeam song files. 
One small fix to SongShowPlus importer
 2012-03-24 16:41:29 +00:00
Andreas Preikschat
384d61b302 use try instead of version sting checking 2012-03-24 12:26:37 +01:00
Andreas Preikschat
8dca5b4647 add placeholder text to the search edit 2012-03-24 12:08:30 +01:00
Philip Ridout
b4e8b48c6d Fixed bug #952533: Invalid file name characters in song name causes OpenLyrics to crash. 
bzr-revno: 1916
Fixes: https://launchpad.net/bugs/952533
 2012-03-23 13:09:51 +02:00
Philip Ridout
cb38c0acd7 corrected the raw strings and back slashes 2012-03-23 06:36:24 +00:00
Philip Ridout
61ecf629cd added + 2012-03-22 21:09:20 +00:00
Jonathan Corwin
d6e3ed6ae1 Fixed bug #891775: When the theme is bottom-aligned, stop the tails of y and g from being chopped off. 
bzr-revno: 1914
Fixes: https://launchpad.net/bugs/891775
 2012-03-22 23:02:23 +02:00
Philip Ridout
77f283c182 added the plus 2012-03-22 20:37:38 +00:00
Philip Ridout
d4bfda2ade Made modifications according to merge request 2012-03-22 17:22:01 +00:00
Philip Ridout
1fd08401bf Fix for bug 952533 2012-03-22 06:50:54 +00:00
Jonathan Corwin
6eff57d17b Fix missing tails for bottom alignment 2012-03-21 22:27:04 +00:00
rimach
210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach
8a029daf11 Head 2012-03-20 22:21:47 +01:00
rimach
527f4cc00c change camelcase variables 2012-03-19 20:27:02 +01:00
Jon Tibble
a21ab3859b Head r1910 2012-03-18 21:20:58 +00:00
Raoul Snyman
aa9ab19e38 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.

bzr-revno: 1910
 2012-03-18 17:33:36 +02:00
Jon Tibble
025a81d553 Head r1909 2012-03-18 09:33:05 +00:00
Raoul Snyman
7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.
 2012-03-17 23:30:53 +02:00
Jon Tibble
086a32d7b1 Head r1908 2012-03-17 16:42:53 +00:00
Jon Tibble
a9d70a2d2e Bugs #888815 #941966 2012-03-17 14:44:23 +00:00
Tim Bentley
bc4cc7adb9 Remove print 2012-03-17 10:54:33 +00:00
Tim Bentley
83629a1b22 Get it working this time 2012-03-17 10:51:04 +00:00
Tim Bentley
9cdec0e3d3 Minor fixes 2012-03-17 10:46:08 +00:00
Tim Bentley
d00840d1e0 Make plugin config updates generic 
Fix up some copyright issues missed
 2012-03-17 10:40:06 +00:00
Jonathan Corwin
7872ea03b1 Fix the next slide keypress action to call its own routine, since the interface is different to the other next slide event. 
bzr-revno: 1908
Fixes: https://launchpad.net/bugs/957129
 2012-03-17 08:59:45 +02:00
Jonathan Corwin
8bca20a48c Create wrapper routine due to incorrect parameter to slidenext 2012-03-16 23:05:06 +00:00
Christian Richter
2d18402e0b Fixed bug 900038. Corrected signal names. Corrected pause/stop check. 
bzr-revno: 1907
Fixes: https://launchpad.net/bugs/900038
 2012-03-17 01:03:05 +02:00
Jon Tibble
5ded814527 Head r1906 2012-03-16 22:56:06 +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
Tim Bentley
b092f19606 Fix remote Search displaying errors on UI 2012-03-15 06:15:21 +00:00
Jon Tibble
1882ea59f2 Head r1904 2012-03-13 22:19:14 +00:00
Raoul Snyman
44dc84c3cb Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly. 
bzr-revno: 1904
Fixes: https://launchpad.net/bugs/888815
 2012-03-13 22:47:42 +02: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
6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Raoul Snyman
ccba9e7df5 Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly. 
Fixes: https://launchpad.net/bugs/888815
 2012-03-12 23:05:39 +02: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
Philip Ridout
0dd0a9b821 Warn before importing a theme with a name that already exists 
bzr-revno: 1900
 2012-03-11 16:41:24 +00:00
Philip Ridout
2c5fa20154 Disable monitor selection drop down list when "Override display postition" is checked 
bzr-revno: 1899
 2012-03-11 16:37:59 +00:00
Jonathan Corwin
e3d523042b Fix a couple of spelling mistakes 
bzr-revno: 1897
 2012-03-10 23:00:14 +00:00
Philip Ridout
bad057e725 Added Raouls fix 2012-03-10 22:59:38 +00:00
Christian Richter
69d961666c Media player configuration changes: 
Change the layout of the up/down buttons
Fix issue: if choose down button without selecting any item before the settings dialog were broken

bzr-revno: 1895
 2012-03-10 22:56:57 +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
Philip Ridout
8f0e2ba8ec Fixed mainwindow bug 2012-03-10 22:18:52 +00:00
Jonathan Corwin
e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Philip Ridout
f8021d315e fixed mainWindow this time! 2012-03-10 17:13:19 +00:00
Philip Ridout
df54470988 Few more minor fixes 2012-03-10 16:44:58 +00:00
Philip Ridout
24b817cccf More minor fixes 2012-03-10 16:14:07 +00:00
Philip Ridout
7d7e76fd9b renaming variables, if your going to open a can of worms, might as well eat them all! 2012-03-10 16:03:58 +00:00
Philip Ridout
a40717c16f Fixed up to Raouls guidelines 2012-03-10 08:22:52 +00:00
Philip Ridout
bb4c6a4e16 A few minor fixes, and modifications to Wowimport: 
Fixes 439 on the support tracker

Remove .encode hopefully to fix http://support.openlp.org/issues/442

Revisited Words of Worship importer. A few tweeks, some to make it more robust, and to provide more information to the user.

bzr-revno: 1893
 2012-03-10 07:03:46 +00:00
Philip Ridout
e9caa194f5 Adds a dialouge asking if the user wants to replace an existing theme when importing. 
It works, but I dont know, it just feels like my code is a little bit "rough 'n' ready" let me know what you think!
 2012-03-09 21:43:27 +00:00
Philip Ridout
74db5acaa3 Re-ordered group boxes as per Raouls request, and applied his radiobox code 2012-03-09 21:41:13 +00:00
Mattias Põldaru
67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
rimach
499f51bd2b change Button layout, fix issue if no item selected and choose down button 2012-03-08 23:14:59 +01:00
Philip Ridout
5d8c2aae17 Fixes bug https://bugs.launchpad.net/openlp/+bug/883056 
Adds radio buttons, and disables monitor selection when override display is on.
 2012-03-07 22:14:58 +00:00
Jonathan Corwin
a2e40543ea Fix phonon video for opaque themes 
bzr-revno: 1892
 2012-03-06 19:37:27 +00:00
Philip Ridout
0e95ffe55f remove .encode hopefully to fix http://support.openlp.org/issues/442 2012-03-05 22:22:36 +00:00
Mattias Põldaru
1600e002cb Make media backend names translatable. 
Fixes: https://launchpad.net/bugs/903683
 2012-03-05 23:09:31 +02: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
M2j
970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
Raoul Snyman
d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
Raoul Snyman
e59e717480 Hopefully fix the next button when things are on repeat. 2012-03-04 20:05:15 +02:00
M2j
b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +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
M2j
277de83b68 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:38:20 +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
Rastislav Pecik
8818256b2a Fixed code according to mrege proposal comments 2012-02-28 15:06:14 +01:00
Rastislav Pecik
271c4ef1a4 using QtCore.QVariant object as a second argument in settings.value method 2012-02-28 12:30:30 +01:00
Rastislav Pecik
6ec167ed83 QSettings.value() now uses second argument for default value, which is utf8 2012-02-28 12:12:52 +01:00
M2j
fe2966ac9e make slideShortcutActivated private 2012-02-28 10:47:34 +01:00
M2j
d13ec2184a concentrate action creation in slide controller 2012-02-28 10:24:42 +01:00
M2j
95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
M2j
fe5f3c8874 make use of **kwargs in action creation methods 2012-02-27 19:58:34 +01:00
Philip Ridout
d77534dc34 Fixes 439 on the support tracker 2012-02-27 18:41:24 +00:00
Rastislav Pecik
c024e9e47d Exported mysql charset settings to configuration files and cleaned up the code 2012-02-27 19:18:52 +01:00
Rastislav Pecik
b56d8d2a06 Fixed connection to mysql to use UTF8 encoding. 
Fixes: https://launchpad.net/bugs/941692
 2012-02-27 01:42:35 +01:00
M2j
3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
M2j
44a5784315 Merge all QAction creation methods in openlp.core.lib.ui 2012-02-26 21:43:59 +01:00
M2j
ee3da31682 Check for Qt version before calling QtCore.QLocale().createSeparatedList 2012-02-26 16:15:00 +01:00
Tim Bentley
025fe7e145 Correct brackets 2012-02-25 18:31:02 +00:00
Tim Bentley
3e1ba89a41 Fix locale test 2012-02-25 17:44:21 +00:00
Raoul Snyman
ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02:00
Tim Bentley
c1c1de5472 Fix Impress and OpenLP so it now starts . 
Fix Spelling
Remove QLocale code for now as not supported by PyQt

Fixes: https://launchpad.net/bugs/902115
 2012-02-25 13:01:47 +00:00
Raoul Snyman
476ba8eb1b Fixed the copyright in the patch file which someone else missed. 
Regenerated the resource file.
Fixed the copyright in the translation_utils.py script which someone else missed.
Removed an unnecessary comment.
 2012-02-25 13:11:59 +02:00
Raoul Snyman
d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Raoul Snyman
d681afb2b4 Added an icon in for the Next button, and added in direct-to-track skipping too. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 02:01:24 +02:00
Raoul Snyman
8fa7dcf080 Add the last two remaining outstanding items, the "next track" and the time remaining. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 01:26:10 +02:00
Raoul Snyman
3e726f453f Attempted to fix bug #927473 by catching operational errors and redoing the action. 
bzr-revno: 1883
Fixes: https://launchpad.net/bugs/927473
 2012-02-19 22:56:06 +02:00
Meinert Jordan
5b4b48a61c Displayed listed items are shown more natural type (Jack, René and Maria) 
bzr-revno: 1881
 2012-02-19 22:53:41 +02:00
M2j
9e03cf0715 use Qt method if available 2012-02-17 19:51:01 +01:00
Raoul Snyman
d14a316309 Added repeating of the background audio track list. 
Migrated the songs plugin configuration tab to use the proper camelCase names.
 2012-02-16 23:08:30 +02:00
M2j
ce7029776a localize separated item list format 2012-02-16 21:36:35 +01:00
Raoul Snyman
bcad2c171f Added exception logging in case we need to confirm that we are actually getting the exception we think we are. 2012-02-16 21:05:16 +02:00
Raoul Snyman
2644de0d01 HEAD 2012-02-16 21:04:20 +02:00
Jonathan Stafford
4016038d33 Fixes bug 932610 where OpenLP crashes if the "Service Item Slide Limits" was set to "Next Item" and the user tries to advance beyond the ends of a service item in the preview pane using the up/down arrow keys. 
bzr-revno: 1880
Fixes: https://launchpad.net/bugs/932610
 2012-02-16 19:02:11 +00:00
Jonathan Stafford
d57905f9d8 Fixed Preview Crash Bug 932610 
Fixes: https://launchpad.net/bugs/932610
 2012-02-15 18:37:42 +08:00
Mattias Põldaru
d4efbfe122 Moved two items over to right columns. 2012-02-13 13:10:27 +02:00
Raoul Snyman
f8a8185eb0 Attempt to catch the OperationalError which is thrown when MySQL closes the connection without telling us. 2012-02-12 11:24:06 +02:00
Mattias Põldaru
d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00
Mattias Põldaru
62e2616ace Code cleanup. 2012-02-07 12:54:13 +02:00
Jonathan Stafford
13ab688518 Changing the "Wrap Slide" option into a three-way radio button selection to allow the option of the up/down arrow keys to jump between service items at the end of each song, etc. 
bzr-revno: 1876
 2012-02-06 17:35:41 +00:00
Jonathan Stafford
e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
Andreas Preikschat
f9fb2bea5b fix ZeroDivisionError 
bzr-revno: 1875
 2012-02-05 16:22:21 +01:00
Christian Richter
863a9f9129 Added VLC support to OpenLP 
bzr-revno: 1874
 2012-02-05 16:39:46 +02:00
Andreas Preikschat
bedb2d833d fix ZeroDivisionError 2012-02-04 18:11:35 +01:00
Mattias Põldaru
dedb85b0cf Merge trunk. 2012-02-04 09:48:55 +02:00
Mattias Põldaru
51ee117a48 More function name changes. 2012-02-04 09:46:10 +02:00
Mattias Põldaru
6f219e175f Name changes to camelCase where appropriate. 2012-02-02 14:42:52 +02:00
Mattias Põldaru
7fca26dd0e Remove a leftover line which causes trouble on OSX. 2012-02-01 01:47:33 +02:00
Mattias Põldaru
6da181834c Meinert's suggestions taken into account about syntax and removed unnecessary variables. 2012-01-30 01:16:12 +02:00
Jonathan Stafford
21d0e93505 Tidied up blank lines between class definitions (again) 2012-01-30 06:13:51 +08:00
Jonathan Stafford
d26de263f3 Fixed missing u and tidied up blank lines between class definitions 2012-01-30 06:07:06 +08:00
Mattias Põldaru
90332e60d3 Prevent several updates to service name example when launching OpenLP. 2012-01-29 23:14:27 +02:00
Mattias Põldaru
01d42e0f11 Use note text as tooltip. 2012-01-29 18:47:15 +02:00
Jonathan Stafford
02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Mattias Põldaru
b03295584b Addresses Meinert's concern about a hidden exception. 2012-01-28 01:13:35 +02:00
Mattias Põldaru
83155d45ea Text changes, thanks to Raoul. 2012-01-28 00:10:12 +02:00
Jonathan Stafford
312a02f14b Fixed typo 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:51:25 +08:00
Jonathan Stafford
7b180a4c67 Fixed bug #900727: Phonon backend no longer plays .mp4 video files 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:46:17 +08:00
Jonathan Stafford
6487a3248a Moved Service Item Advance enumeration to slidecontroller 2012-01-25 20:34:13 +08:00
Jonathan Stafford
d686799035 Created Service Item Advance enumeration class 2012-01-25 18:03:57 +08:00
Mattias Põldaru
8c483a58b3 Added checkbox for to disable default service name, just as suggested. 2012-01-25 11:32:20 +02:00
Jonathan Stafford
2c472ff38e Small Fixes 2012-01-23 17:33:12 +08:00
Jonathan Stafford
4f0cd62f63 Fix typo 2012-01-22 17:14:50 +08:00
Jonathan Stafford
cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08:00
Jonathan Stafford
210d88ac79 Documented signal in Receiver class 2012-01-21 16:11:41 +08:00
Stevan Pettit
ce230df91d Added code to allow user to change the location of the OpenLP data directory 2012-01-19 15:25:53 -05:00
rimach
88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
Mattias Põldaru
62a5578528 Make % acceptable character for filenames again. 2012-01-18 21:18:18 +02:00
Mattias Põldaru
62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02:00
M2j
1757436853 purge ICU integration from this branch 2012-01-18 14:50:06 +01:00
Mattias Põldaru
8601a47dce Remove obsolete import. Fix saving wrong syntax and % bugs. 2012-01-18 13:20:15 +02:00
Jonathan Stafford
6543bbafb6 Changed slide_advance variable to be set only in SlideController initialisation or when settings are changed. 2012-01-18 17:52:51 +08:00
M2j
82250ee71f added dependency check for PyICU in exception dialog 2012-01-17 21:58:20 +01:00
M2j
7491023005 Head 1868 2012-01-17 21:37:57 +01:00
Mattias Põldaru
e4f983e6ca Label back with new text. Also element Labels to the right place as Meinert suggested. 2012-01-17 10:50:29 +02:00
Mattias Põldaru
df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru
982bfbbd55 Fix labels according to Meinert's comment. 2012-01-16 15:50:17 +02:00
Jonathan Stafford
1dbcc18c7e Reintroduced slide_advance variable so that settings are only read once. Reverted language files. 2012-01-16 17:50:15 +08:00
Jonathan Stafford
c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford
01f7244db7 Removed unnecessary slide_advance 2012-01-15 18:05:12 +08:00
Mattias Põldaru
e6f2fd67c3 Disable QTimeEdit box, when it is not used. 2012-01-15 11:58:02 +02:00
Jonathan Stafford
87775f164a Migrate Wrap Setting to Slide Advance Setting 2012-01-15 17:08:08 +08:00
Jonathan Stafford
360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Mattias Põldaru
ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru
b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02: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
rimach
b834371d5c Sync with head 2012-01-09 22:30:31 +01:00
Jonathan Corwin
f413ad2d30 Prevent selection of text on maindisplay 2012-01-07 23:03:14 +00:00
Jonathan Corwin
75359ac361 Helps if we load the right setting 2012-01-07 12:09:17 +00:00
Jonathan Corwin
3ebe38f7e1 Setting for X11 bypass flag. Don't open Impress unnecessarily if not enabled 2012-01-07 11:22:53 +00:00
Mattias Põldaru
8be4f309f5 Escape html tags and support formatting tags in Alerts 
bzr-revno: 1866
Fixes: https://launchpad.net/bugs/908197
 2012-01-06 18:44:12 +00:00
Stevan Pettit
11d63c6607 If the save location is unavailable, the "Save As" dialog is used. 
bzr-revno: 1865
Fixes: https://launchpad.net/bugs/905040
 2012-01-06 18:42:09 +00:00
Jonathan Corwin
fcf2eb17f0 Fix controller/theme wizard displays if transparent 2012-01-04 18:37:27 +00:00
Jonathan Corwin
46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Mattias Põldaru
6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru
1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Mattias Põldaru
85a92455d1 Apply formatting tags to alerts. 2012-01-03 01:43:59 +02:00
Stevan Pettit
34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit
3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05:00
Mattias Põldaru
14dde1f0c4 Rename EasiSlides to EasySlides 
bzr-revno: 1863
 2011-12-31 19:17:54 +00:00
Jon Tibble
768c099971 Indentation 2011-12-31 17:36:58 +00:00
Jon Tibble
e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Jon Tibble
c997c38c59 Head r1860 2011-12-31 13:54:57 +00:00
Jon Tibble
89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Mattias Põldaru
185cc5487a Use cgi.escape instead of simply replacing tags, also escaping & was missing. 2011-12-30 15:00:08 +02:00
Andreas Preikschat
68ee74f72f - download theme screenshots in a thread to speed up the FTW 
bzr-revno: 1860
 2011-12-30 08:59:02 +01:00
Andreas Preikschat
214bd37057 fixed method name 2011-12-29 20:41:25 +01:00
Tim Bentley
93a59d560f Another year has passed by 
bzr-revno: 1859
 2011-12-29 17:50:42 +00:00
Andreas Preikschat
20ef9b9730 download theme screenshots in a thread 2011-12-29 13:26:37 +01:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jonathan Corwin
2b9f09b32a Minor fixes 2011-12-23 21:52:54 +00:00
Mattias Põldaru
b48dda3c74 Converts <> marks to &lt;&gt; to make it impossible to insert HTML to alerts. 
Fixes: https://launchpad.net/bugs/908197
 2011-12-23 21:14:49 +02:00
Jonathan Corwin
70ffa5b988 Head 2011-12-23 18:37:27 +00:00
Jonathan Corwin
5600946e0e divergences 2011-12-23 17:35:58 +00:00
Jonathan Corwin
ec035d6d37 Set correct monitor in wizard 2011-12-23 17:25:05 +00:00
Jonathan Corwin
3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00:00
Martin Zibricky
5f6962f4c7 This fixes bug #906926. 
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
 2011-12-22 23:36:22 +02:00
Jonathan Corwin
69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Martin Zibricky
79c5a3a4d4 refactoring: merge with trunk and use sys.platform 2011-12-22 19:29:55 +01:00
Martin Zibricky
4071bc8deb remove disabling opengl - done in new branch 2011-12-22 19:21:22 +01:00
Martin Zibricky
6828fc9ef5 fixed bug 907857: opengl rendering disabled for mac 2011-12-22 19:17:35 +01:00
Martin Zibricky
82728e148e #906926 fix stay on top for OS X 2011-12-22 15:46:47 +01:00
Jonathan Corwin
1cd3206f96 Redundant imports 2011-12-22 13:23:04 +00:00
Jonathan Corwin
16043527fc Check for Unity instead 2011-12-22 12:27:54 +00:00
Jonathan Corwin
b9c1da189a Head 2011-12-21 21:19:52 +00:00
Jonathan Corwin
febf40884f Just remove X11 bypass 2011-12-21 21:19:35 +00:00
Meinert Jordan
e974df4c54 recover v1.x theme file names from XML info 
bzr-revno: 1847
 2011-12-20 20:25:27 +00:00
Meinert Jordan
d94816d481 recover v1.x theme file names from XML info 
bzr-revno: 1846
 2011-12-20 20:23:36 +00:00
M2j
cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
M2j
15449372e1 use ICU collator on Windows systems 2011-12-19 01:20:39 +01:00
Andreas Preikschat
8bfaa22535 added missing ) 2011-12-18 20:46:56 +01:00
Andreas Preikschat
9e03e18653 added floft to the list of packagers 2011-12-18 20:44:41 +01:00
Tim Bentley
0a9ea54bf8 Fix remote hiding of screen and updating UI buttons 
bzr-revno: 1841
 2011-12-16 15:06:14 +00:00
Andreas Preikschat
36d6a9003d Shortcut can be assigned twice in certain circumstances) 
Description of the fix:
1) Create a dict with the shortcuts as keys and a list of actions using this shortcut as value.
2) When we add a new action/shortcut we check if the shortcut is valid. If this is the case we add it to the dict and if not we remove the shortcut.

bzr-revno: 1840
 2011-12-16 15:04:51 +00:00
M2j
99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01:00
Tim Bentley
55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Mattias Põldaru
cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Andreas Preikschat
27843ae718 removed space 2011-12-15 16:27:17 +01:00
Jonathan Corwin
98a6c25ac8 Missed a file... 2011-12-14 23:41:52 +00:00
Jonathan Corwin
3874363e54 Add a more specific test for gnome shell 2011-12-14 22:44:41 +00:00
Tim Bentley
58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley
e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley
fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
Andreas Preikschat
d2cf6aa684 fixed a i18n bug + remove shortcut from map if removing the action 2011-12-14 16:45:11 +01:00
Mattias Põldaru
3d278d51a7 Fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have (they really shouldn't since BOM is used to detect unicode on Windows and at least by wiki nobody is opposed). 
bzr-revno: 1836
 2011-12-14 12:47:52 +02:00
Mattias Põldaru
2959235335 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags, resulting in the re-encoding of the same string on every save which makes the string wrong. 
bzr-revno: 1835
Fixes: https://launchpad.net/bugs/802159
 2011-12-13 22:34:30 +02:00
Mattias Põldaru
9f5c0645aa No silly name abbreviations anymore. 2011-12-13 12:58:33 +02:00
M2j
f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j
0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Mattias Põldaru
e70ca4fa06 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags. 2011-12-13 00:58:43 +02:00
Jonathan Corwin
16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley
143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley
4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat
f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Mattias Põldaru
ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Andreas Preikschat
08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat
3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Andreas Preikschat
9967e34d0a re reverted changes 
Fixes: https://launchpad.net/bugs/768495
 2011-12-10 15:03:08 +01:00
Jonathan Corwin
4949f88f28 Fix problem with the outline alignment when the theme is using Justify. 
bzr-revno: 1829
Fixes: https://launchpad.net/bugs/859950
 2011-12-10 10:14:13 +00:00
Tim Bentley
39bc9238bf Lost temporary edit flag 2011-12-10 08:52:18 +00:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Jonathan Corwin
6f77ee1351 Handle &nbsp; and other white space too 2011-12-09 18:52:24 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
rimach
1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
Christian Richter
b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before. 
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
 2011-12-08 22:27:22 +02:00
Jonathan Corwin
c36a13d0a8 Remove webkit version in js 2011-12-08 19:49:43 +00:00
Tim Bentley
c5f6dbfa6e Head 2011-12-08 19:42:40 +00:00
Jonathan Corwin
15d5b97075 Remove version check and js tidyups 2011-12-08 19:24:25 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat
95aedfa5d9 assign variables in methods instead of returning them 2011-12-08 18:45:33 +01:00
Andreas Preikschat
4f9a801966 set settings_tab to None if plugin is disabled 2011-12-08 17:34:18 +01:00
Mattias Põldaru
97560f6947 The category strings, if not unicode, can only be QStrings. Thanks to superfly. 2011-12-08 14:13:57 +02:00
Jonathan Corwin
44eb1fb024 Remove comment 2011-12-07 22:24:13 +00:00
Jonathan Corwin
1c79b28461 Workaround justify and outline alignment problems 2011-12-07 21:56:06 +00:00
Andreas Preikschat
66c183a6b8 break instead of continue 2011-12-07 21:41:19 +01:00
Andreas Preikschat
32f2dcac59 reverted change 2011-12-07 21:28:26 +01:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
rimach
f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
Jon Tibble
fd8525bf89 Head r1824 2011-12-06 22:38:46 +00:00
Mattias Põldaru
ef3e3252e7 Comparison to None is discouraged 2011-12-07 00:37:56 +02:00
rimach
b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
Mattias Põldaru
1830cfbe9e Ensure that action category names are unicode, to prevent warnings on comparison. 2011-12-06 23:25:04 +02:00
rimach
bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
rimach
7f513fc58c sync 2011-12-06 22:16:09 +01:00
Andreas Preikschat
73d0050b95 reverted r1819 
bzr-revno: 1824
 2011-12-06 20:40:55 +01:00
Andreas Preikschat
38a2a3dee2 fixed bug 768495 2011-12-06 20:30:39 +01:00
Andreas Preikschat
36e729303c reverted changes 2011-12-06 20:25:12 +01:00
Jon Tibble
04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
Tim Bentley
149a660dad Head 2011-12-05 19:47:59 +00:00
rimach
2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach
ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Jon Tibble
a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Tim Bentley
17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Jon Tibble
5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Andreas Preikschat
5d664d629d fixed bug 768495 (Shortcut can be assigned twice in certain circumstances) 
bzr-revno: 1819
Fixes: https://launchpad.net/bugs/768495
 2011-12-04 12:08:09 +01:00
Tim Bentley
456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Andreas Preikschat
b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Tim Bentley
6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Andreas Preikschat
f34ae80eec fixed bug 887313 
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:01:36 +01:00
Tim Bentley
add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley
8c4397d380 Head 2011-12-03 17:01:57 +00:00
Andreas Preikschat
ae8f57f707 r1815 2011-12-03 16:09:50 +01:00
Andreas Preikschat
5bfc101f09 changed name 2011-12-03 16:09:03 +01:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Andreas Preikschat
eb121abb12 attempt to fix bug 768495 
Fixes: https://launchpad.net/bugs/768495
 2011-12-03 15:38:30 +01:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley
624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
rimach
8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach
2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00: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
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
rimach
11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
rimach
4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
Tim Bentley
8fee84d052 Stop keyboard floods getting the slide controller and service manager out of set. 
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
 2011-11-30 22:27:54 +02:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
6ed1342f95 sync 2011-11-30 21:14:18 +01:00
rimach
44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach
3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Christian Richter
b2349d892b For newer versions of webkit playing videos doesnt work anymore. 
bzr-revno: 1807
 2011-11-29 19:49:33 +02:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j
047477c236 layout fix in exceptionform 
bug fix triggerd by searching for nonexistend book numbers
 2011-11-26 20:13:51 +01:00
rimach
65ce3c84d2 fix video play problem with newer webkit version and webkit player 2011-11-24 22:25:38 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach
dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT. 
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
 2011-11-23 06:05:42 +00:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more 
Fixes: https://launchpad.net/bugs/891781
 2011-11-18 19:34:04 +00:00
Tim Bentley
ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
Tim Bentley
516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
rimach
acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach
870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach
7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach
a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
c0cc590c71 sync 2011-11-11 17:42:01 +01:00