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
Jonathan Corwin
ef134c2ea7
Release the application reference
2012-06-18 23:05:11 +01:00
Andreas Preikschat
87722c9579
fixed non existing variable under certain conditions
2012-06-17 17:41:36 +02:00
Andreas Preikschat
84332702a5
r1994 + conflict
2012-06-16 17:22:18 +02:00
Andreas Preikschat
de8e22f630
- updated vlc.py
...
bzr-revno: 1993
2012-06-16 10:22:26 +02:00
Andreas Preikschat
8eacb2c50b
- fixed ticket 695
2012-06-15 18:19:46 +02:00
Andreas Preikschat
9496c68fa7
r1990
2012-06-15 17:34:57 +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
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
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
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
Stevan Pettit
b8cd0dc7b3
Moved cancel button call to advancedtab
2012-06-08 15:27:08 -04:00
Andreas Preikschat
f17f0dc8cf
removed print statement, clean up
2012-06-08 15:27:40 +02:00
Samuel Findlay
0385996f43
Merge refactor-song-import r1993
2012-06-06 00:19:28 +10:00
Samuel Findlay
a9f97bf771
r1981
2012-06-05 19:34:00 +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
81b4d84c1f
changed attributes and arguments to camelCase
2012-06-04 12:22:47 +02:00
Andreas Preikschat
8f0ddfac9d
r1979
2012-06-04 11:53:34 +02:00
Samuel Findlay
6dba01ea23
2012-06-04 01:13:23 +10:00
Samuel Findlay
501107c840
r1979
2012-06-03 23:53:20 +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
5b7bc879ac
r1978
2012-05-31 22:45:00 +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
e882607360
Completed refactor of importer.py
2012-05-30 19:11:44 +10:00