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

7406 Commits

Author SHA1 Message Date
Tim Bentley f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01:00
Tim Bentley fda3f1c93c Head 2012-10-09 18:38:25 +01:00
Erik Lundin ce67e95ff7 Removed unnecessary line break 2012-10-08 22:16:54 +02:00
Erik Lundin 5b6f058013 HEAD 2012-10-08 22:14:19 +02: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
Erik Lundin 1aa51ad5c4 Fixed bug #1038694 'Change in service order not reflected in stage view' 
Fixes: https://launchpad.net/bugs/1038694
 2012-10-08 02:47:10 +02:00
Tim Bentley 0c214cbf6c Head 2074 2012-10-06 10:21:46 +01:00
Tim Bentley 717cd68998 Fix media icons 2012-10-06 10:21:28 +01:00
Philip Ridout 17217062f4 Removed openlp.org-icon-32.bmp from resources. 
Found annother instance of the icon being used and corrected it.
 2012-10-04 19:18:24 +01:00
Philip Ridout 0674549168 fixed alert dialog's icon 2012-10-03 20:54:00 +01:00
Erik Lundin b1cfabc4f3 Fixed bug #986495 'The language selection setting for bibles does not work'. 
bzr-revno: 2074
Fixes: https://launchpad.net/bugs/986495
 2012-10-03 13:16:59 +02:00
Raoul Snyman 14efe006fc Fixed bug #993445 and cleaned up the logic a little in some other places. 
bzr-revno: 2073
 2012-10-02 13:51:50 +02:00
Andreas Preikschat afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +02:00
Erik Lundin b92f453632 HEAD 2012-09-30 00:15:06 +02:00
Erik Lundin 748f6f6d84 HEAD 2012-09-30 00:10:10 +02:00
Philip Ridout 93d5785b4c Fixes: Bug #876211 (OpenLyrics export non-compliant for split verses Edit) 
Fixes: Bug #904690 (cloning a song does not retain splits Edit)

Comment added to claifry line 28
 2012-09-25 21:15:56 +01: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
Raoul Snyman 7120571a61 HEAD 2012-09-22 21:04:59 +02:00
Raoul Snyman b4ff5ab3e3 Fixed bug #993445 and cleaned up the logic a little in some other places. 
Fixes: https://launchpad.net/bugs/993445
 2012-09-22 20:58:04 +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
Erik Lundin 39820d768b Fixed bug #1053654 'Adding verses from multiple chapters fails'. 
Fixes: https://launchpad.net/bugs/1053654
 2012-09-20 23:50:23 +02:00
Erik Lundin fc9acfb0dd Fixed bug #986495 'Cannot change bible language in bible editor' 
Fixes: https://launchpad.net/bugs/986495
 2012-09-20 23:07:32 +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
Martin Zibricky 43c976d671 Merge with trunk. 2012-09-15 14:11:26 +02:00
Tim Bentley 23a28d2152 Release 1.9.12 
bzr-revno: 2063
 2012-09-15 12:48:08 +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
Martin Zibricky 20bfde8e5a Fix placeholder for service name for non AscII characters 
bzr-revno: 2062
 2012-09-15 11:01:17 +01:00
Raoul Snyman f3e942c944 Fix bible download bugs - Again 
bzr-revno: 2061
Fixes: https://launchpad.net/bugs/1011051
 2012-09-15 09:39:30 +01:00
Martin Zibricky a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Raoul Snyman bb14134233 Fix bug #1051051 where "4-5" style verses would fail. Now they are imported as "4" 
Fixes: https://launchpad.net/bugs/1051051
 2012-09-14 21:53:55 +02:00
Raoul Snyman 19845ebfb4 Fixed bug #1049977 where some Bibles from Bible Gateway still use the old HTML format. 
Fixes: https://launchpad.net/bugs/1049977
 2012-09-13 21:49:31 +02: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 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
Martin Zibricky 3845db3579 Additional translate() substitution fixes in openlp.plugins modules. 2012-09-06 19:30:45 +02: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
Jonathan Corwin 9985b876b2 Rework code to prevent file lock 2012-09-04 23:39:47 +01: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
Tim Bentley e31c64ef7c Release 1.9.11 
bzr-revno: 2039
 2012-07-28 15:32:21 +01:00
Philip Ridout c6d85d3ab8 Implemented gushies changes 2012-07-22 21:20:53 +01:00
Philip Ridout 9e0291b0bc Fix OpenSong importer 
bzr-revno: 2037
Fixes: https://launchpad.net/bugs/1020915
 2012-07-22 13:36:02 +01:00
Philip Ridout 1d4e5c9430 I have actually fixed the entering of verses with no text! 2012-07-22 09:50:37 +01:00
Tim Bentley e2184c4a02 Add title 2012-07-22 06:30:21 +01:00
Philip Ridout e1cc13d54d Changed bible to Bible 2012-07-21 22:32:04 +01:00
Philip Ridout 73ad78e3ad Fix for bug:1020915 OpenSong Bible import has uncaught exception on non-xml file 2012-07-20 20:25:55 +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
Stevan Pettit c5e23da78b Hide the Data Location group box on the Advanced tab if OpenLP is running portable. 
bzr-revno: 2034
 2012-07-20 09:35:16 +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
Philip Ridout ae37f749f1 A real fix this time! 2012-07-15 09:03:37 +01:00
Philip Ridout b37bf5022c Now uses the first line of the first verse if no title present 2012-07-14 22:10:20 +01:00
Philip Ridout 22c3c76a5a Fixes https://bugs.launchpad.net/openlp/+bug/1015524 
Note: If a title is not present in the song, it is still added. I feel this is the right action, as it apears that that is how it was in Foil Presenter
 2012-07-14 21:35:19 +01:00
Philip Ridout 33510c3346 Refactored validation of edit all form so that it does not crash on empty textedit, and so that it does not allow empty verses. 
Ideally we would accept empty verses, but these are removed automatically else where.

Changed the save button to OK as per the reasons in my email.
 2012-07-14 18:53:24 +01:00
Andreas Preikschat 0a89ddbc86 fixed traceback when deleting last formatting tag form the list 2012-07-11 23:05:28 +02:00
Philip Ridout d41f69ce8c Fixes 1011286 Song Editor -> Edit All Crashes with out valid verse splitter. 
Plus a small bit of refactoring
 2012-07-11 21:41:31 +01: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
Tim Bentley c9e8c8452a Update Bible delete text 
bzr-revno: 2027
 2012-07-10 21:43:14 +01:00
Tim Bentley e52b4e60af update text 2012-07-10 05:56:07 +01:00
Samuel Findlay 6089c89f8a Improved disabledLabelText for MediaShout 2012-07-09 18:12:29 +10:00
Samuel Findlay 9d73d37b94 Song Import Wizard: disabledLabelTextfor default and MediaShout 2012-07-09 15:49:10 +10: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
Jonathan Corwin c1db424460 Add SongPro and MediaShout song importer 
bzr-revno: 2022
 2012-07-08 17:04:35 +01:00
Andreas Preikschat c89cf12a9e clean ups 
bzr-revno: 2021
 2012-07-08 15:08:33 +02:00
ElderP 8ad5fdad4a Added code to put logfile into appdir/other if running portable 2012-07-08 08:53:06 -04:00
Tim Bentley a3684cb96a amend delete text 2012-07-08 13:18:54 +01:00
Jonathan Corwin 18fc43f739 Oops. Don't forget to remove the code after temporarily commenting out 2012-07-08 09:56:33 +01:00
Samuel Findlay 4b5a346d20 r2019 2012-07-08 18:25:20 +10:00
Samuel Findlay efdc1126b1 Various tidy-ups 2012-07-08 18:23:56 +10:00
Jonathan Corwin ca3e938afe Remove redundant logging and incrementProgressBar 2012-07-07 22:33:17 +01:00
Andreas Preikschat e42115e78a fixed bug 1022125 (Authors display name is not automatically entered) 
Fixes: https://launchpad.net/bugs/1022125
 2012-07-07 21:06:42 +02: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
Andreas Preikschat 2bcf47cedc fixed bug 1016927 (Filesystem encoding problem when importing songs) 
Fixes: https://launchpad.net/bugs/1016927
 2012-07-06 18:10:49 +02:00
Jonathan Corwin 1717e4fa4c Fix comment location 2012-07-06 07:31:00 +01:00
Samuel Findlay f9eab33dd9 Comment typo 2012-07-06 16:25:21 +10:00
Jonathan Corwin 614dc2648b Use new strip_rtf routine and error trap 2012-07-05 20:24:56 +01:00
Jonathan Corwin 577be9a9c1 Head 2012-07-05 19:41:59 +01:00
Jonathan Corwin 3668adc6ff ewimport and __init__ back now mahfiaz has merged his 2012-07-05 19:39:47 +01:00
Mattias Põldaru dc8496fa71 Adds SundayPlus importer with new strip_rtf function which keeps track of encodings. 
bzr-revno: 2016
 2012-07-05 17:54:41 +02: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
Jonathan Corwin ef29c0e97e Available tests 2012-07-05 00:13:19 +01:00
Jonathan Corwin 1edfac99e6 Add mediashout import 2012-07-05 00:04:11 +01:00
Mattias Põldaru 5f04399d6c Spacing around operator. 2012-07-04 23:08:04 +03:00
Jonathan Corwin 9c1005ac3c Fix copyrights 2012-07-04 19:53:03 +01:00
Mattias Põldaru a33f39f50e Merge master. 2012-07-04 12:50:31 +03:00