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

7395 Commits

Author SHA1 Message Date
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
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
Samuel Findlay 413cfc3782 Change description label. dump->convert. Added link to manual 2012-06-09 07:03:18 +10:00
Samuel Findlay 598ef7fff3 Merge refactor-song-import 2012-06-09 06:31:15 +10:00
Samuel Findlay 6bf5f6d56f Change attributes from enumeration to strings. Double underscore class attributes 2012-06-09 05:30:33 +10:00
Stevan Pettit b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Samuel Findlay f02e886976 Clean import strings of ASCII control chars (user's db had x07 chars) 2012-06-09 04:30:34 +10:00
Andreas Preikschat f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay 398ac5afdf String correction 2012-06-07 22:49:33 +10:00
Samuel Findlay c219665e1c Formatting 2012-06-07 22:30:41 +10:00
Samuel Findlay cc90096534 Added optional descriptionLabel for song format to import wizard 2012-06-07 22:11:47 +10:00
Samuel Findlay 837fc1c726 Merge refactor-song-import r1994 2012-06-07 00:55:42 +10:00
Samuel Findlay 818e46fba7 Formatting and comments 2012-06-06 19:14:53 +10:00
Samuel Findlay 0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay a79419d715 Formatting 2012-06-06 00:14:50 +10:00
Samuel Findlay 34de12040f Refactor exception handling 2012-06-06 00:12:19 +10:00
Samuel Findlay a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay 2ccf92f543 Improved isComplete() validation for single file/folder. 2012-06-05 19:20:07 +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 d16e64f11a fixed ticket 502 and another fix 
bzr-revno: 1981
 2012-06-04 12:39:38 +02:00
Andreas Preikschat 81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Andreas Preikschat c4e8935392 fixed other variable names 2012-06-04 12:05:55 +02:00
Andreas Preikschat 770d245534 fixed non camelCase attributes 2012-06-04 11:57:45 +02:00
Andreas Preikschat b02ea132f6 r1979 2012-06-04 11:54:02 +02:00
Andreas Preikschat 8f0ddfac9d r1979 2012-06-04 11:53:34 +02:00
Samuel Findlay 676b0223b8 Tidy up 2012-06-04 01:32:21 +10:00
Samuel Findlay 6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay 501107c840 r1979 2012-06-03 23:53:20 +10:00
Samuel Findlay a07a81d851 Formatting 2012-06-03 23:52:45 +10:00
Samuel Findlay 7b97c15fc7 Refactor SongFormatAttr into SongFormat. PascalCase for enumeration. 2012-06-03 23:50:57 +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 d9ed9aaa5c Removed obj_prefix (old code from r1055 and even < r990) 2012-06-01 00:24:24 +10:00
Samuel Findlay 606da7ab76 Typo 2012-05-31 23:58:10 +10:00
Samuel Findlay 5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay dddd883ede Fixed alignment of filepathEdit widget by adjusting spacer size according to label width. 2012-05-31 22:42:44 +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 c4060dc04b First working rev. Completed basic testing. 2012-05-31 00:59:54 +10:00
Samuel Findlay 504145d454 Completed refactor of songimportform.py 2012-05-30 23:53:31 +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
Samuel Findlay 465aecc61c Mostly complete attempt at refactor. Tidy ups needed. 2012-05-30 02:26:50 +10: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
Tim Bentley 0a16d41aef Head 2012-05-27 06:46:20 +01:00
Tim Bentley 577e39bdee Fix typing 2012-05-27 06:46:08 +01:00
Andreas Preikschat 8241808d65 fixed traceback when deleting an author/topic which has just been added to an unsaved song 2012-05-26 22:06:19 +02:00
Andreas Preikschat cf59d89afa fixed ticket 502 2012-05-26 21:56:12 +02: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
Samuel Findlay fc87e58a3c Changed ZionWorxImport to parse CSV database dump (XML had invalid syntax) 2012-05-24 22:12:48 +10:00
Stevan Pettit ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Samuel Findlay b7cde8938c r1975 2012-05-24 20:07:00 +10:00
Samuel Findlay 4fd9855b69 Added ZionWorxImport class, xml version 2012-05-24 19:58:05 +10: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
Samuel Findlay e01995eafd Tidy up 2012-05-20 11:42:07 +10: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
Samuel Findlay e28f654b0f r1972 2012-05-19 20:49:05 +10:00
Samuel Findlay cdd867a755 Added static method isValidSource so importers can validate their input. Also tidyup: removed SongImport.errorLog 2012-05-19 20:43:19 +10:00
Edwin Lunando b9aaaf05f6 Using the renderer.py calculation 2012-05-19 15:46:22 +07:00
Andreas Preikschat e878e17784 - removed a work around as it should not be needed any longer; - uncommented some lines 
bzr-revno: 1972
 2012-05-18 17:09:02 +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