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

3531 Commits

Author SHA1 Message Date
Andreas Preikschat
afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +02:00
Tim Bentley
d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Tim Bentley
ee126c9924 Change background color of video 2012-09-29 19:36:30 +01:00
Tim Bentley
a3e41b1ee7 Fix video injection and have black backgrounds 2012-09-29 17:27:55 +01:00
Andreas Preikschat
5eeab86db9 removed not needed parameters 2012-09-26 16:13:42 +02:00
Raoul Snyman
b71043f37d Fixed bug #1051971 where we weren't validating that a user had actually selected a file. 
bzr-revno: 2070
Fixes: https://launchpad.net/bugs/1051971
 2012-09-24 18:07:48 +02:00
Andreas Preikschat
88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Andreas Preikschat
4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
ElderP
3855b28d40 Added [crashreport] as a valid section for settings import 2012-09-21 16:35:42 -04:00
Raoul Snyman
657beb727c Made changes to keep others happy. 2012-09-21 08:42:31 +02:00
Andreas Preikschat
ea88f94e85 - do not reload theme list twice when renaming a theme 
- fixed not reloading list after adding a new theme [regression]

bzr-revno: 2068
 2012-09-20 07:21:17 +02:00
Andreas Preikschat
e1707c4203 updated vlc.py from master 
bzr-revno: 2067
 2012-09-20 07:19:56 +02:00
Martin Zibricky
906f259d8e Fixed bug #963894 for the moment by dynamically removing VLC support from OpenLP on Mac OS X. 
bzr-revno: 2066
Fixes: https://launchpad.net/bugs/963894
 2012-09-19 23:59:26 +02:00
Andreas Preikschat
8545e04228 r2065 2012-09-19 20:44:19 +02:00
Andreas Preikschat
195608f39e do not reload theme list twice when renaming a theme; fixed not reloading list after adding a new theme 2012-09-19 20:43:02 +02:00
Andreas Preikschat
0a98901ab2 updated vlc.py 2012-09-19 08:34:45 +02:00
ElderP
86465f349d Added code to fix (normalize) the custom data path 2012-09-17 18:20:38 -04:00
Raoul Snyman
2591d24a41 Fixed bug #1051971 where we were not validating that a background image was being selected. 
Fixes: https://launchpad.net/bugs/1051971
 2012-09-17 23:30:10 +02:00
Tim Bentley
1d881e426a Fix service date formats 2012-09-16 16:33:05 +01:00
Martin Zibricky
ba37730538 Remove cheching for non-existing file in media player code. 2012-09-15 18:47:14 +02:00
Tim Bentley
436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley
c8f54a44ae Titles 2012-09-15 15:27:09 +01:00
Martin Zibricky
35bed5d11b Fix #963894: Put warning about disabled vlc to openlp.log. 2012-09-15 13:29:55 +02:00
Martin Zibricky
292bae6924 Fix #963894: Put message about disabled vlc to openlp.log. 2012-09-15 13:26:42 +02:00
Martin Zibricky
803d6bbe98 Add some more comments. 2012-09-15 13:18:47 +02:00
Martin Zibricky
41980a3a46 Fix #963894: disable vlc backend completely for osx. 2012-09-15 13:16:58 +02:00
Martin Zibricky
f51f19e2b9 Fix #963894: expect also OSError while checking for media backends. 2012-09-15 13:09:59 +02:00
Tim Bentley
795d11849d Local save works 2012-09-15 06:57:03 +01:00
Martin Zibricky
a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Tim Bentley
a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Martin Zibricky
7089e6980a Fixed bug #1049036 in singlescreen mode set full screen mode instead of StaysOnTopHint. 2012-09-12 23:43:31 +02:00
Martin Zibricky
c0a165d818 Fixed bug #1049036 where on osx openlp exited incorrectly with modified service. 2012-09-12 23:06:26 +02:00
Tim Bentley
1df6934bda Refactor video length 2012-09-09 07:54:09 +01:00
Tim Bentley
6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Tim Bentley
a9dd3336fb Move media files around 2012-09-09 07:06:44 +01:00
Tim Bentley
0a65493ce0 Fix video autoplay options 
bzr-revno: 2056
 2012-09-08 20:32:51 +01:00
Tim Bentley
51893b8052 tabs 2012-09-08 19:39:15 +01:00
Tim Bentley
77f49258f9 Fix duplicate ifs 2012-09-08 19:29:05 +01:00
Raoul Snyman
ad39fa11e5 Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) 2012-09-08 19:15:08 +02:00
Tim Bentley
59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley
4986fbdce8 Head 2012-09-07 10:28:15 +01:00
Tim Bentley
6d53ed904b Fix extra line 2012-09-06 18:12:02 +01:00
Tim Bentley
9d692af5b9 Head 2012-09-06 17:38:54 +01:00
Tim Bentley
ed2d670f18 fix ups 2012-09-06 17:38:31 +01:00
Martin Zibricky
9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Martin Zibricky
1a1f4f9743 Merge with trunk r2052. 2012-09-06 11:33:34 +02:00
Martin Zibricky
9736707e5b Fixed bug #1046599: String substitution cannot be done for translate() funciton and for QString type. 2012-09-06 11:31:27 +02:00
Andreas Preikschat
5792f8405f fixed bug #1046508 
Fixes: https://launchpad.net/bugs/1046508
 2012-09-06 00:00:26 +02:00
Tim Bentley
4390c13901 Auto start media 2012-09-04 21:22:27 +01:00
Jonathan Corwin
f10f28aed6 Fixed bug #1041366 
bzr-revno: 2048
Fixes: https://launchpad.net/bugs/1041366
 2012-08-30 20:11:00 +02:00
Jonathan Corwin
7a5041536d Fix comment 2012-08-27 21:00:09 +01:00
Jonathan Corwin
eade26690d Cleanups 2012-08-27 20:12:06 +01:00
Jonathan Corwin
d8e5226b20 Next attempt 2012-08-27 20:04:53 +01:00
Jonathan Corwin
c965905a30 Only renderer maindisplay 2012-08-25 17:36:48 +01:00
Jonathan Corwin
9b378fbea5 Fix 2012-08-25 17:29:17 +01:00
Jonathan Corwin
9864bf9084 update text on main event thread 2012-08-25 17:15:30 +01:00
Tim Bentley
72bfc662f7 fix Media detection on saved services 
bzr-revno: 2046
 2012-08-25 08:28:10 +01:00
Tim Bentley
d003ff9009 Allow saved media to be played 2012-08-24 21:06:56 +01:00
Martin Zibricky
15d031eec1 Fix playback of videos with vlc in preview window on OSX. 2012-08-18 19:26:54 +02:00
Philip Ridout
dcc4608f3c fixes issue 1045 and bug 1037076 "Short cut keys do not work for background audio" 2012-08-18 11:55:57 +01:00
Philip Ridout
943cac3f7f a fix for bug 1022038 2012-08-09 22:48:05 +01:00
Brian T. Meyer
9b48175ab5 Addresses bug 995427 which results in About, Preferences and Quit menu items not moving to the right Application Menu when translated, by adding hints so Qt knows how to handle them. 
bzr-revno: 2043
Fixes: https://launchpad.net/bugs/995427
 2012-08-06 13:21:26 +02:00
Tim Bentley
8b6c2d0024 VLC plays wma files 
bzr-revno: 2042
 2012-08-05 22:10:31 +01:00
Tim Bentley
9813e45bde VLC does support wva 2012-08-05 19:17:52 +01:00
Brian T. Meyer briantmeyer@cox.net
c14a4f4e8d fixed spaces around brackets to match style guidelines 2012-08-04 10:09:12 -07:00
Philip Ridout
d8589c4a6e A few UI tweeks and updates. 
Changed Contribute button and icon to Volunteer (As discussed with Roaul on IRC)
Changed and resized the remote QR code for better recoginition on some phones (BrianMayerDesign)
Updated the link and text to the Android Market, as it is now know as Google Play
Set the window title for the ProcessDialog when importing songs using the first run wizard.
 2012-08-04 15:43:44 +01:00
Brian T. Meyer briantmeyer@cox.net
8100a66622 Contains fix to allow QT to move place About, Exit and Preference Menu 
Items into the Application menu per Apple UI guidelines.
 2012-08-03 21:34:13 -07:00
ElderP
cf1a0b27ea Added code to hide data location wizard if running portable 2012-07-15 07:59:55 -04:00
Andreas Preikschat
978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Andreas Preikschat
0a89ddbc86 fixed traceback when deleting last formatting tag form the list 2012-07-11 23:05:28 +02:00
Andreas Preikschat
fc5fbea624 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
bzr-revno: 2031
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 22:09:02 +02:00
Andreas Preikschat
b743abac83 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 20:28:05 +02:00
Andreas Preikschat
a2a19675f9 changed labels (bug 1022837) 
Fixes: https://launchpad.net/bugs/1022837
 2012-07-11 20:16:51 +02:00
Samuel Findlay
6d9cc62ab4 Various tidy-ups: 
* themeform: spelling
* easyslidesimport: old code, comment copied from elsewhere
* importer: clarify docstring
* zionworximport: module constant, variable names

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

bzr-revno: 2013
 2012-07-02 20:45:03 +02:00
Andreas Preikschat
44161ebee9 Clean ups 
bzr-revno: 2011
 2012-07-02 19:32:41 +02:00
Samuel Findlay
cba8ae36c4 Theme Wizard: updated final page's subtitle to match behaviour 
bzr-revno: 2009
Fixes: https://launchpad.net/bugs/1019696
 2012-07-02 19:27:51 +02:00
Andreas Preikschat
b409bacca3 final fix for Trb143 2012-07-01 22:44:40 +02:00
Andreas Preikschat
fb59eab8e7 removed fix because another branch fixes this differently 2012-07-01 20:45:51 +02:00
Andreas Preikschat
978045a845 r2007 2012-07-01 20:44:03 +02:00
Andreas Preikschat
bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat
f74c16b03b reverted parent() change 2012-07-01 19:58:58 +02:00
Samuel Findlay
3f7efd32c9 Updated Theme Wizard final page's subtitle to match behaviour that changed in r1176 2012-07-01 13:25:59 +10:00
Martin Barrett
d2d129deb3 fixes bug #986699: Print Service not separating verses 2012-06-30 19:51:53 +01:00
Andreas Preikschat
3fc52181a5 make code more readable 2012-06-30 20:41:15 +02:00
Martin Barrett
30e760dbe3 fixes bug #986699: Print Service not separating verses 2012-06-30 18:25:49 +01:00
Martin Barrett
d9037de8f2 fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:44 +01:00
Martin Barrett
620b8d519b fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:26 +01:00
Martin Barrett
ac769b96f9 fixes bug #986699: Print Service not separating verses 2012-06-30 17:15:42 +01:00
Martin Barrett
d86a94b3c0 fixes bug #986699: Print Service not separating verses 2012-06-30 17:11:49 +01:00
Andreas Preikschat
9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Andreas Preikschat
78753d03dc r2005 2012-06-30 12:46:24 +02:00
Martin Barrett
c73a57afd3 fixed bug #986688 'PrintService copy not separating verses 
Fixes: https://launchpad.net/bugs/986688
 2012-06-29 00:17:17 +01:00
Andreas Preikschat
0f8054c1fd removed fixmes 2012-06-27 19:00:02 +02:00
Andreas Preikschat
894c6c2868 fixed 1014684 (OpenLP doesn't start on Windows XP) 
bzr-revno: 2005
 2012-06-26 17:14:42 +01:00
Andreas Preikschat
39916e4232 fixed code, fixed long lines 2012-06-23 19:21:27 +02:00
Andreas Preikschat
d3e8950db8 fixed long line 2012-06-22 22:18:50 +02:00
Andreas Preikschat
ab8e6ee30a use get_filesystem_encoding 2012-06-22 22:12:43 +02:00
Samuel Findlay
4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Andreas Preikschat
155e99d307 fixed other occurrences 2012-06-19 18:09:59 +02:00
Raoul Snyman
6a688ab845 Catch a previously uncaught NotImplementedError. 
bzr-revno: 2000
Fixes: https://launchpad.net/bugs/1013215
 2012-06-19 15:03:24 +02:00
Jonathan Corwin
ef134c2ea7 Release the application reference 2012-06-18 23:05:11 +01:00
Andreas Preikschat
826f83e8bf fixed 1014684 (OpenLP doesn't start on Windows XP) 
Fixes: https://launchpad.net/bugs/1014684
 2012-06-18 19:00:27 +02:00
Andreas Preikschat
f2884f0593 update image in cache when timestamp changed; docs 2012-06-18 14:07:26 +02:00
Andreas Preikschat
2095a6d0d0 fixed wrong image being kept in cache when aborting the themeform 2012-06-17 18:25:56 +02:00
Andreas Preikschat
de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00
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
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
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
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
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
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04: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
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
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
Andreas Preikschat
0517f3d8d7 renamed attribute 2012-05-23 18:59:28 +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
4a6697f5a1 r1975 2012-05-23 18:31:25 +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
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
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
Andreas Preikschat
175b01621d fixed songusage, clean ups 2012-05-19 10:44:45 +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
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
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
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
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
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
5959ee5158 fixed regression, reworked staticmethods, changed button behaviour to reflect the internal actions 2012-05-05 18:03:40 +02:00
Andreas Preikschat
baf1c792e5 clean ups 2012-05-05 14:24:25 +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
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
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
070ed7fcb5 Merged HEAD from trunk and fixed a conflict. 
Some more refactoring.
 2012-04-22 21:37:11 +02: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
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
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
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
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
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
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
rimach
360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
rimach
7464d0f9fc correct pause check, correct signal names 2012-03-16 22:09:27 +01:00
rimach
09e7e16b12 fix issue, that video slider doesnt go back at video end 2012-03-13 20:54:16 +01:00
Jon Tibble
8e7eca36c7 Head r1903 2012-03-12 22:16:52 +00:00
Jon Tibble
6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Jon Tibble
9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Mattias Põldaru
9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru
f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02:00
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
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
3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Raoul Snyman
ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02: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
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
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
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
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