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

1950 Commits

Author SHA1 Message Date
Martin Zibricky 7321f5fb2d Bug #1002038: Disable and hide presentation plugin on osx. 2012-10-14 20:42:20 +02:00
Tim Bentley aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Andreas Preikschat 43af89f70f fix 2012-10-03 20:52:52 +02:00
Andreas Preikschat c4bdea7edd fixes 2012-10-03 19:55:39 +02:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat b226364559 when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 2012-10-02 19:35:10 +02:00
Andreas Preikschat 4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
Tim Bentley 436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Tim Bentley 6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Tim Bentley a9dd3336fb Move media files around 2012-09-09 07:06:44 +01: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
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 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 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
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
Philip Ridout 96b787ff49 removed unecessary if statment 2012-08-13 20:25:28 +01:00
Philip Ridout c6d85d3ab8 Implemented gushies changes 2012-07-22 21:20:53 +01:00
Philip Ridout 1d4e5c9430 I have actually fixed the entering of verses with no text! 2012-07-22 09:50:37 +01:00
Andreas Preikschat 978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02: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 c6e7a297ad Variable fixes 
bzr-revno: 2010
 2012-07-02 19:31:12 +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 6f353ab01d fixed variable name 2012-07-01 20:45:14 +02:00
Andreas Preikschat bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Jonathan Corwin 65beb6ccda move webview to init and use %s 2012-06-30 23:20:16 +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
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
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
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 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
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
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
Andreas Preikschat f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay a9f97bf771 r1981 2012-06-05 19:34:00 +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 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
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 cdb6859edf Add space 2012-05-30 20:50:24 +01:00
Tim Bentley 14bdc5ca7a Remove blank lines 2012-05-29 20:13:02 +01: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
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
Andreas Preikschat 51d69a28ce stop imageManager thread on shutdown 2012-05-26 19:51:27 +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
Stevan Pettit ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Andreas Preikschat 45a9b5f615 clean ups 2012-05-23 23:02:34 +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 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 968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -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
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
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
Edwin Lunando 41d1ea3590 added comment 2012-05-19 23:50:45 +07:00
Andreas Preikschat 49cd100f90 clean up 2012-05-19 17:41:05 +02:00
Andreas Preikschat 01db1d34d8 removed/added empty lines 2012-05-19 17:12:15 +02:00
Andreas Preikschat a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Andreas Preikschat b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Edwin Lunando b9aaaf05f6 Using the renderer.py calculation 2012-05-19 15:46:22 +07:00
Andreas Preikschat 175b01621d fixed songusage, clean ups 2012-05-19 10:44:45 +02:00
Andreas Preikschat 374a426340 added another case, clean ups 2012-05-19 10:29:31 +02:00
Edwin Lunando 81f0ff3870 #902492 resolved. All the working code is a placed at theme.py. 2012-05-18 17:38:05 +07:00
Andreas Preikschat 06e49d4b97 clean up 2012-05-17 21:01:15 +02:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00