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

7410 Commits

Author SHA1 Message Date
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
Andreas Preikschat
779a1201fc reverted some changes to avoid conflicts + clean up 2012-05-17 22:26:31 +02:00
Stevan Pettit
a7fc64f0c3 Fixed problem with Import settings. 2012-05-17 15:23:58 -04:00
Andreas Preikschat
0b9923742e trivial clean ups 2012-05-17 14:59:57 +02: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
Edwin Lunando
a251522ef3 #902492 resolved 2012-05-16 20:14:32 +07:00
Raoul Snyman
bfcb6a50b0 Reworked according to Andreas' specifications. 2012-05-15 23:06:09 +02: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
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
2f38d55261 Changes to accomodate correct directory structure 2012-05-11 14:37:57 -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
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
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
Andreas Preikschat
be26adc0b8 added secondary priority for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority 
bzr-revno: 1968
 2012-05-05 21:53:34 +02: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
8b08fbbe32 docs and class variable fix 2012-05-05 20:34:26 +02:00
Andreas Preikschat
265b703ba9 fixed bug 885874 (Song with mis matched formatting tags abends on render); fixed one extra new lines added before and after an optional break 
bzr-revno: 1965
Fixes: https://launchpad.net/bugs/885874
 2012-05-05 20:15:13 +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
b72101c724 fixed formatting tag not being present on slides 2012-05-05 16:36:47 +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
Andreas Preikschat
7f7ac0c54e extended doc string 2012-05-05 14:40:31 +02:00
Andreas Preikschat
aa917e7aba fixed cap 2012-05-05 14:38:06 +02:00
Andreas Preikschat
baf1c792e5 clean ups 2012-05-05 14:24:25 +02:00
Andreas Preikschat
785787d7f3 added secondary criterion for the image queue to privilege images which were added earlier over images which were added later, when both have the same priority 2012-05-05 14:23:42 +02:00
Stevan Pettit
3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04: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
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
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
Andreas Preikschat
6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +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
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
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
Andreas Preikschat
dbe85abb84 updated vlc.py 
bzr-revno: 1960
 2012-05-01 15:11:24 +02:00
Andreas Preikschat
99314e762d refactor version comparison code; removed dead code 
bzr-revno: 1959
 2012-05-01 14:58:22 +02:00
Armin Köhler
43e5d7a9ee fix bug 825205 - Keep/restore selected book, chapters and verses when changing the bible translation in advanced search 
bzr-revno: 1958
Fixes: https://launchpad.net/bugs/825205
 2012-05-01 13:28:49 +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
Samuel Findlay
1184e9219d Small fixes for comments typos in songs.lib modules 2012-04-30 22:19:36 +10:00
Samuel Findlay
370603c779 PowerSong importer working. Successful on test set of 1057 songs 2012-04-30 20:57:44 +10:00
Samuel Findlay
ea9bfb160d Integrated module openlp.plugins.songs.lib.powersongimport 2012-04-30 16:24:04 +10:00
M2j
41402ab078 add a space character 2012-04-29 18:01:15 +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
76c004bb9a fixed LooseVersion usage 2012-04-28 18:19:02 +02:00
Andreas Preikschat
69affcc059 removed dead code, refactor version comparison code 2012-04-28 15:51:05 +02:00
Andreas Preikschat
38e5635901 r1955 2012-04-28 15:19:26 +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
2a7e5fc781 Fixed bug #986827: Exception doesn't exist on Windows. 
bzr-revno: 1954
Fixes: https://launchpad.net/bugs/986827
 2012-04-25 20:46:23 +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
Philip Ridout
52e23a2eeb removed import that sliped in! 2012-04-24 20:39:40 +01: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
Armin Köhler
19ea43ead8 fixes 2012-04-23 22:21:38 +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
85d48705fc Try to prevent older versions of OpenLP from deleting newer Bibles due to a change in the metadata names. 2012-04-22 23:07:39 +02:00
Raoul Snyman
0f1bca77b4 Some small coding standards things. 2012-04-22 21:50:18 +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
b6cf925bd8 Removed "dbversion" as it is not actually used. 
Renamed some other variables.
Removed one use of "proxy_url" which was pretty much invalid.
 2012-04-22 20:19:36 +02:00
Armin Köhler
4ce8d3710a HEAD r1951 2012-04-22 20:02:28 +02:00
Armin Köhler
7e9c30dfaf fix bug 825205 - Keep/restore selected book, chapters and verses when changing the bible translation in advanced search 2012-04-22 19:53:48 +02:00
Raoul Snyman
9d2b730634 Try to fix bug #986827, an exception is thrown on Windows when opening an imported presentation. 
Fixes: https://launchpad.net/bugs/986827
 2012-04-22 14:25:39 +02:00
Andreas Preikschat
715e9b50a7 trivial cleanups part 
bzr-revno: 1951
 2012-04-22 08:32:43 +01:00
Andreas Preikschat
baf758e45d trivial cleanups part 2 
bzr-revno: 1950
 2012-04-22 08:32:13 +01: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
Armin Köhler
a9fea228ee Use localized booknames instead of English in BookNameForm (used by BibleImportWizard and BibleUpgradeWizard) 
bzr-revno: 1948
 2012-04-21 18:35:14 +02:00
Armin Köhler
e4687e4d68 Fixed bug #941683: Add support for non-English book names in OSIS files. 
bzr-revno: 1947
Fixes: https://launchpad.net/bugs/941683
 2012-04-21 18:33:40 +02:00
Andreas Preikschat
69b616a3ec added favicon to remote pages 2012-04-21 09:03:32 +02:00
Raoul Snyman
b4538541f9 Updated libraries and made some UI and usability improvements to the web remote. 
bzr-revno: 1946
 2012-04-20 21:36:10 +02:00
Andreas Preikschat
e8cbf8e3f0 more clean ups + fix error message shown when remote is being used 2012-04-20 21:33:43 +02:00
Raoul Snyman
7d5d7d7116 Changed the 'Split' button to say 'Optional Split' instead. 
bzr-revno: 1945
 2012-04-20 21:32:34 +02:00
Armin Köhler
d4eac06935 refer localized booknames to the corresponding english one 2012-04-20 21:14:23 +02:00
Armin Köhler
83ff347bc9 HEAD r1944 2012-04-20 19:54:27 +02:00
Andreas Preikschat
0038f4fa31 capitalisation fix 2012-04-20 17:51:58 +02:00
Tim Bentley
44a7c32baf Updates to web to allow Android to poll 
bzr-revno: 1944
 2012-04-19 21:19:02 +01:00
Armin Köhler
93a72fd4d5 Added a dialog to edit metadata of Bibles, and additional language options. 
bzr-revno: 1943
Fixes: https://launchpad.net/bugs/738697, https://launchpad.net/bugs/822363
 2012-04-19 08:45:37 +02:00
Andreas Preikschat
6f3b0f337a trivial clean ups 
bzr-revno: 1942
 2012-04-19 08:41:57 +02:00
Raoul Snyman
489f19cf39 Renamed all instances (i.e. comments) of 'virtual' to 'optional' 2012-04-18 23:55:44 +02:00
Raoul Snyman
4810bce920 Removed animations due to rendering issues on some browsers. 
Removed the "close dialog" call since it was being called after the "go to" in some browsers (instead of before).
 2012-04-18 22:44:47 +02:00
Armin Köhler
ef957caf55 show list to choose a bookname in selected application language 2012-04-18 22:44:09 +02:00
Armin Köhler
4c24ba59fa add support for non english booknames in OSIS files, additional improve the detection of progressbar maximum 2012-04-18 22:07:38 +02:00
Tim Bentley
33e6fc328e Fix default 2012-04-17 18:28:35 +01:00
Tim Bentley
d27c8f2f89 Head 2012-04-17 18:27:15 +01:00
Raoul Snyman
aae1d3753b Updated jQuery. 
Updated jQuery Mobile.
Fixed headers at the top.
Fixed toolbars at the bottom.
Removed top toolbars.
Added navigation to the top of most screens.
Added a "Add & Go to Service" button on the search result options dialog.
Implemented Theme and Desktop blank types.
Changed "back" button to say "Home" instead, and actually added the text.
 2012-04-16 23:57:10 +02:00
Andreas Preikschat
0fdf3b7f7c trivial clean ups 2012-04-16 09:02:24 +02:00
Philip Ridout
89e0b0b00c Implements the progress bar for all media items for which it is possible. This shows OpenLP is doing 'something' rather than just hung. 
bzr-revno: 1941
 2012-04-16 07:59:45 +02:00
Andreas Preikschat
3414763fff fixed spelling 2012-04-15 12:16:01 +02:00
Philip Ridout
cf069afe92 Implements the progress bar for all media items for which it is possible. This shows OpenLP is doing 'something' rather than just hung. 2012-04-13 22:47:15 +01:00
Philip Ridout
be3da3368e changed file version handeling. 
Added check for (c) symbol if not use it for the author
 2012-04-13 21:22:55 +01:00
Raoul Snyman
70d75b0f80 Removed an unused import. 
Changed the "Split" button to say "Optional Split" instead.
 2012-04-13 22:08:05 +02:00
Armin Köhler
665c27c785 fixes 2012-04-12 22:58:11 +02:00
Andreas Preikschat
620d858d68 clean ups 2012-04-12 16:16:12 +02:00
Andreas Preikschat
d53f7b6511 fixed bug 977835 (Advanced search of Bibles is not working.) 
Fixes: https://launchpad.net/bugs/977835
 2012-04-12 12:48:54 +02:00
Armin Köhler
5f16ddc73c fixes 2012-04-11 19:39:15 +02:00
Armin Köhler
35c3c1ce5a HEAD r1939 2012-04-11 19:19:17 +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
cb2e2b3248 fixed bug 970436 ('Display if a single screen' always in effect) and clean ups 
bzr-revno: 1939
Fixes: https://launchpad.net/bugs/970436
 2012-04-09 21:26:57 +01:00
Andreas Preikschat
3aa2161095 fixed bug 2012-04-09 13:36:26 +02:00
Andreas Preikschat
268e808b8d swapped flags, do not import Qt 2012-04-09 12:52:24 +02: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
Andreas Preikschat
a89b4f5931 fixed bug 803602 (Quick Tab for Bibles does not resize correctly) 
Fixes: https://launchpad.net/bugs/803602
 2012-04-08 13:43:14 +02:00
Philip Ridout
20eab8b917 Fixed case when there is no version information 2012-04-07 20:47:41 +01:00
Philip Ridout
9c11494364 Added support for ALL DreamBeam file formats. 2012-04-07 17:41:03 +01:00
Armin Köhler
e310c20ccc fixes 2012-04-06 20:14:38 +02:00
Armin Köhler
06033df8ad adapt editbibleform - some fixes 2012-04-05 20:31:15 +02:00
Armin Köhler
33dcda419a HEAD r1936 2012-04-05 19:04:17 +02:00
Andreas Preikschat
c0cae670ef bible clean ups 
bzr-revno: 1936
 2012-04-05 18:21:29 +02:00
Andreas Preikschat
b335beae45 r1934 2012-04-05 17:17:40 +02:00
Andreas Preikschat
704795830d use filter instead of list comprehension 2012-04-05 17:16:47 +02:00
M2j
bca06c4a7a fix: wrong method name 2012-04-05 00:41:18 +02:00
Armin Köhler
5f88f49754 some fixes 2012-04-04 21:34:14 +02:00
M2j
3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
Armin Köhler
0b246275b2 adapt to run with HEAD r1934 2012-04-03 21:51:20 +02:00
Armin Köhler
06b63954a0 HEAD r1934 2012-04-03 21:30:30 +02:00
Armin Köhler
02e36ba641 bookname in list view and shown in footer now uses the choosen language 2012-04-03 21:23:26 +02:00
Armin Köhler
d7496056d8 HEAD r1933 2012-04-03 20:43:48 +02:00
Armin Köhler
800510f2f8 some fixes - improve error handling with duplicate book names 2012-04-03 20:42:21 +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
Meinert Jordan
b2abc5a060 Remove control characters from song copyright string 
bzr-revno: 1932
Fixes: https://launchpad.net/bugs/969282
 2012-04-03 17:24:52 +01:00
M2j
9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
Meinert Jordan
93a9b62abb Bug #959116: Split slide button inserts tag on its own line 
bzr-revno: 1931
Fixes: https://launchpad.net/bugs/959116
 2012-04-03 09:38:27 +02:00
Meinert Jordan
3374ad21d9 Bug #953240: Merging subverse entries (e.g. v1a) at OpenSong import 
bzr-revno: 1930
Fixes: https://launchpad.net/bugs/953240
 2012-04-03 09:37:07 +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
1128b424e5 Bug #795068: Verse List in Song Editor did not resize properly 
bzr-revno: 1928
Fixes: https://launchpad.net/bugs/795068
 2012-04-02 23:11:41 +02:00
M2j
5dd334370d Head 2012-04-02 23:06:55 +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
Meinert Jordan
a686cf9209 Bug #923500: Do not mark service changed when accepting settings dialog. 
bzr-revno: 1926
Fixes: https://launchpad.net/bugs/923500
 2012-04-02 23:05:03 +02:00
M2j
dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
M2j
1c9d92bf2e Bug #953240: Merging subverse entries (e.g. v1a) at OpenSong import 2012-04-02 22:53:21 +02:00
M2j
45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j
41ff5b04df small fixes 2012-04-02 21:34:49 +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
36fc1b5339 Bug #959116: Split slide button inserts tag on its own line 2012-04-02 16:23:25 +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
84ee153fec Bug #795068: Verse List in Song Editor did not resize properly 2012-04-02 15:27:08 +02:00
M2j
3fc81ea230 Bug #967522: Don't drag from empty service manager area 2012-04-02 14:25:55 +02:00
M2j
1b056a74ec Bug #969282: Remove control characters from song copyright string 2012-04-02 13:38:22 +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
Andreas Preikschat
a9a40f7a47 clean up 2012-04-01 16:22:32 +02:00
Andreas Preikschat
dbe9fc51aa clean ups 2012-04-01 13:16:08 +02:00
Andreas Preikschat
152bd850eb r1924 2012-04-01 12:55:14 +02:00
Armin Köhler
770fe855ee HEAD r1924 2012-03-31 21:03:35 +02:00
Andreas Preikschat
9d3093a99f speed up bible loading 
bzr-revno: 1924
 2012-03-31 18:42:06 +02:00
Andreas Preikschat
651de89cfa speed up bible loading 2012-03-31 18:24:25 +02:00
Philip Ridout
75212def12 Fixes bug #946581 'Prevent users from importing the wrong files' 
bzr-revno: 1922
 2012-03-31 15:38:35 +02:00
Armin Köhler
a47b12f8ec fix a bug in the bible autocompleter when set to application language 
bzr-revno: 1921
 2012-03-31 15:30:06 +02:00
Andreas Preikschat
2e587131f3 fixed bug-969909 ('Missing verse tag' warning is not updated after adding a new verse 
Fixes: https://launchpad.net/bugs/969909
 2012-03-31 11:58:34 +02:00
Philip Ridout
4ce95e9d56 Made changes as per Andreas comments. 2012-03-30 22:52:50 +01:00