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 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
Mattias Põldaru f730280ce0 Update copyright header. 2012-07-04 12:48:29 +03:00
Mattias Põldaru 16186c3960 Remove unnecessary import and move one more constant to module level. Thanks, Tim. 2012-07-04 08:31:27 +03:00
Mattias Põldaru 7871dfdf00 Cleanup. 2012-07-04 01:55:53 +03:00
Mattias Põldaru aef1c550e0 Make strip_rtf a function again. 2012-07-04 01:26:54 +03:00
Jonathan Corwin 3094375233 Share ew strip_rtf routine 2012-07-03 22:14:12 +01: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
Samuel Findlay c9a7f56cbb ZionWorxImport tidy 2012-06-27 00:58:08 +10:00
Tim Bentley 4e1fc4cb0d Reload list on exit of Song import regardless of user action 
Fixes: https://launchpad.net/bugs/1015528
 2012-06-26 05:40:07 +01:00
Jonathan Corwin f70b9d3547 Include the import class too perhaps 2012-06-25 23:26:46 +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
Mattias Põldaru 4aa62141a0 Ensure it is asked only once for encoding. 2012-06-25 23:30:24 +03:00
Mattias Põldaru 556f28db33 Constant names' readability. Thanks, Samuel. 2012-06-25 17:49:33 +03:00
Mattias Põldaru 4917831206 Simplify previous cruft. 2012-06-25 13:41:55 +03:00
Mattias Põldaru 3b5bd4852f Sorry for leftovers of a thought. Maybe some other time. 2012-06-25 13:31:31 +03:00
Mattias Põldaru bfeef67048 Handling for some extra characters. 2012-06-25 11:08:53 +03:00
Mattias Põldaru 25dc4fe36c Better handling of encodings. User is asked only once, if possible. 2012-06-25 09:44:11 +03:00
Mattias Põldaru 75ae9065d0 Uppercase names for static variables. 2012-06-25 01:59:28 +03:00
Mattias Põldaru 36f7e03dc0 Move strip_rtf and change it into a class StripRtf + other changes. It might not work that well yet. 2012-06-24 21:08:20 +03:00
Jonathan Corwin 64d0494ff1 SongPro import 2012-06-23 23:47:26 +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
Mattias Põldaru 0a2ea0fc51 Remove unnecessary reimports which slipped in by accident. 2012-06-20 10:43:35 +03:00
Mattias Põldaru 53e4909952 Remove unnecessary imports. 2012-06-20 10:23:41 +03:00
Mattias Põldaru 76694891fa SundayPlus is written together on their own site. 2012-06-20 10:15:40 +03:00
Mattias Põldaru 92baf9887c Fix strip_rtf() 2012-06-20 10:03:25 +03:00
Mattias Põldaru 953fbf6604 Merge trunk. 2012-06-20 01:51:50 +03:00
Mattias Põldaru 8a599eab43 Sunday Plus importer, strip_rtf might be yet nonfunctional. 2012-06-20 00:56:19 +03:00
Andreas Preikschat 155e99d307 fixed other occurrences 2012-06-19 18:09:59 +02:00
Philip Ridout b39e23d224 A fix for issue 507. http://support.openlp.org/issues/507 
The opensong database file contained verses containing sub-elements such as <i> tags. lxml considders the text of an element up until the first sub element.

bzr-revno: 2001
 2012-06-19 15:04:38 +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
Philip Ridout c0c46ab8a0 A fix for a number of historic issues on the tracker: 
http://support.openlp.org/issues/475
http://support.openlp.org/issues/492
http://support.openlp.org/issues/661

bzr-revno: 1998
 2012-06-19 14:59:22 +02:00
Jonathan Corwin ef134c2ea7 Release the application reference 2012-06-18 23:05:11 +01:00
Philip Ridout 8b5e174049 A fix for a number of historic issues on the tracker 
http://support.openlp.org/issues/475
http://support.openlp.org/issues/492
http://support.openlp.org/issues/661

being the most recent.
 2012-06-18 20:26:44 +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
Philip Ridout 0e36394256 Removed unused import, added doc string and removed double new line. 2012-06-18 17:37:03 +01: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
Philip Ridout 9bb4418487 A fix for issue 507. http://support.openlp.org/issues/507 
The opensong database file contained verses containing sub-elements such as <i> tags. lxml considders the text of an element up until the first sub element.
 2012-06-17 14:57:35 +01:00
Andreas Preikschat f542ebf94d Various clean ups: 
- refactor method argument
- some variable name fixes
- converted dict to list
- added missing lines

bzr-revno: 1996
 2012-06-17 09:16:34 +01:00
Philip Ridout 79299f15cd Fix JS error in OpenLP.js 
A fix for issues: http://support.openlp.org/issues/703
http://support.openlp.org/issues/677

bzr-revno: 1995
 2012-06-17 09:13:47 +01:00
Andreas Preikschat 631535acfd another variable fix 2012-06-16 18:12:54 +02:00
Andreas Preikschat 49e1713226 variable fix 2012-06-16 18:02:22 +02:00
Andreas Preikschat b797b5e341 removed not needed variable 2012-06-16 17:58:38 +02:00
Andreas Preikschat 999af73d14 variable naming conventions, converted dict to list 2012-06-16 17:51:04 +02:00
Andreas Preikschat 84332702a5 r1994 + conflict 2012-06-16 17:22:18 +02:00
Andreas Preikschat 225caae1d0 removed line which has accidentally been added 2012-06-16 10:26:25 +02:00
Andreas Preikschat de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00
Andreas Preikschat a8b41e95d2 - fixed ticket 695 (http://support.openlp.org/issues/695) 
bzr-revno: 1992
 2012-06-16 10:21:00 +02:00
Philip Ridout 6124de5a51 Removed input validation on "Edit All" Dialog, as per Raouls comment on my previous merge request 2012-06-16 09:20:23 +01:00
Philip Ridout 8f8e5558a2 A fix for issues: 
http://support.openlp.org/issues/703
http://support.openlp.org/issues/677

The bug was being caused because we were passing file paths for images and presentations. In windows a back slash is used. This needed escaping
 2012-06-16 01:12:08 +01:00
Andreas Preikschat 8eacb2c50b - fixed ticket 695 2012-06-15 18:19:46 +02:00
Andreas Preikschat cc85d1682d fixed bug 2012-06-15 18:03:46 +02:00
Andreas Preikschat 9496c68fa7 r1990 2012-06-15 17:34:57 +02:00
Andreas Preikschat 266e8eb29b - fixed ticket 729 (http://support.openlp.org/issues/729) 
bzr-revno: 1990
 2012-06-15 17:32:45 +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
Raoul Snyman 4e0b9c30d3 Fixed bug #991150: BibleGateway has new HTML, so we need to change our parsing. This now parses the new HTML correctly. 
Fixes: https://launchpad.net/bugs/991150
 2012-06-12 23:25:31 +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
Philip Ridout f51d270ba8 Removed debug.log statment 2012-06-11 07:12:23 +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
Philip Ridout b1c27d98a4 Fixes 1011286 Song Editor -> Edit All Crashes with out valid verse splitter 
Fixes: https://launchpad.net/bugs/1011286
 2012-06-10 21:57:36 +01:00
Stevan Pettit c306573309 Minor changes to logging, variable name 2012-06-10 15:53:46 -04:00