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

4254 Commits

Author SHA1 Message Date
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
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
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 bc3173966a clean ups 2012-07-01 20:41:59 +02: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
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
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 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
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
Philip Ridout 0e36394256 Removed unused import, added doc string and removed double new line. 2012-06-18 17:37:03 +01:00
Andreas Preikschat f2884f0593 update image in cache when timestamp changed; docs 2012-06-18 14:07:26 +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
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 cc85d1682d fixed bug 2012-06-15 18:03:46 +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
Philip Ridout f51d270ba8 Removed debug.log statment 2012-06-11 07:12:23 +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
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
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Stevan Pettit cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -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
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
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
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 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
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
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
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
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
Samuel Findlay fc87e58a3c Changed ZionWorxImport to parse CSV database dump (XML had invalid syntax) 2012-05-24 22:12:48 +10:00
Samuel Findlay 4fd9855b69 Added ZionWorxImport class, xml version 2012-05-24 19:58:05 +10:00
Andreas Preikschat 4a6697f5a1 r1975 2012-05-23 18:31:25 +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
Andreas Preikschat 060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Samuel Findlay e01995eafd Tidy up 2012-05-20 11:42:07 +10: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
Raoul Snyman f5cba00ca9 Fixed a small bug left over from a previous refactoring. 
Fixes: https://launchpad.net/bugs/997174
 2012-05-16 18:42:33 +02:00
Raoul Snyman bfcb6a50b0 Reworked according to Andreas' specifications. 2012-05-15 23:06:09 +02:00
Raoul Snyman 8436d9d8c0 Fixed a super-annoying bug where any newly imported Bibles would throw an exception. 2012-05-11 21:09:12 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Samuel Findlay a03af240df Minor fixes 2012-05-07 23:38:02 +10:00
Samuel Findlay 31debbe238 Improved PowerSong import wizard validation 2012-05-07 23:26:52 +10:00
Samuel Findlay 3483231a32 Adapted PowerSongImport class to receive a folder 2012-05-07 23:10:26 +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
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 b3f733233a fixed two extra new lines being added 2012-05-05 16:25:55 +02:00
Andreas Preikschat f658c741eb renamed method 2012-05-05 16:12:11 +02:00
Andreas Preikschat 74ff2f92ee added comment 2012-05-05 16:08:07 +02:00
Andreas Preikschat 75f1041d27 removed occurrences of 'virtual' split 2012-05-05 16:03:48 +02:00
Andreas Preikschat a9c1443cc5 r1963 2012-05-05 15:59:27 +02:00
Andreas Preikschat 34b3173988 fixed bug 885874 (Song with mis matched formatting tags abends on render) 
Fixes: https://launchpad.net/bugs/885874
 2012-05-05 15:59:04 +02:00
Raoul Snyman cc3243d8bd Fixed up some things so that our source is Debian-compliant and moved some of the packaging stuff to it's own branches. 
bzr-revno: 1963
 2012-05-03 22:52:17 +02:00
Samuel Findlay 416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay 45c180308a Implemented BinaryReader.Read7BitEncodedInt from .NET. Tidy code. 2012-05-03 22:41:49 +10:00
Samuel Findlay 76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Raoul Snyman 10dbb5ee16 Changed some things to comply with Debian's packaging policies. 2012-05-02 22:57:12 +02:00
Samuel Findlay 8877484aea Tidy up code, stonger error checking. 2012-05-02 19:14:30 +10:00
Andreas Preikschat 63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Samuel Findlay ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Samuel Findlay 63b71802ab Rewrote PowerSongImport class to read variable-length strings directly from file, rather than searching for them. Other minor fixes. 2012-05-01 23:51:46 +10:00