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

9005 Commits

Author SHA1 Message Date
Stevan Pettit cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit 1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Andreas Preikschat d16e64f11a fixed ticket 502 and another fix 
bzr-revno: 1981
 2012-06-04 12:39:38 +02:00
Andreas Preikschat a12dc37d70 - stop the imageManager when closing OpenLP 
bzr-revno: 1980
 2012-06-04 12:37:46 +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
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
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
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
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 b909d27b3b fixed bug #923496 (Traceback when closing main window before the service is loaded) 
bzr-revno: 1976
Fixes: https://launchpad.net/bugs/923496
 2012-05-26 19:42:38 +02:00
Andreas Preikschat 56b02b02b1 attribute instead of method 2012-05-26 19:12:01 +02:00
Andreas Preikschat d2a38f676c r1975 2012-05-26 19:04:13 +02:00
Andreas Preikschat f96073000f fixed crash on cancel when thread is still running 2012-05-26 18:52:34 +02:00
Andreas Preikschat 4a83129b63 r1975 2012-05-26 18:29:10 +02:00
Stevan Pettit ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04: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 45c05e700d clean ups 2012-05-23 18:53:04 +02:00
Andreas Preikschat ded1e82659 r1975 2012-05-23 18:49:24 +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
Raoul Snyman 3a6f59a35e Refactored ScreenList into a true Pythonic singleton. 
bzr-revno: 1974
 2012-05-23 18:25:20 +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
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 ca3e0c03f3 random clean ups 
bzr-revno: 1973
 2012-05-20 21:54:38 +02:00
Stevan Pettit f239cdcdad Various changes 2012-05-20 15:29:08 -04: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
Andreas Preikschat 2b00c28635 r1972 2012-05-19 20:49:39 +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