Commit Graph

9786 Commits

Author SHA1 Message Date
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
a641bb9a8a r1976 2012-05-26 23:35:48 +02: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
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
Raoul Snyman
3a6f59a35e Refactored ScreenList into a true Pythonic singleton.
bzr-revno: 1974
2012-05-23 18:25:20 +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
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
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
6e502554a6 r1972 2012-05-20 17:58:08 +02:00