Commit Graph

8974 Commits

Author SHA1 Message Date
Stevan Pettit 1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Stevan Pettit 394a02c696 Merged trunk 2012-05-29 08:59:11 -04: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 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 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
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
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
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
Stevan Pettit aa5805863a Moved location of settings ini file to ..\Data 2012-05-17 23:24:49 -04:00
Raoul Snyman d754fe4ae5 Fixed a super-annoying bug where any newly imported Bibles would throw an exception.
bzr-revno: 1971
2012-05-17 22:38:40 +02: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
Andreas Preikschat d9cbcc7d46 r1970 2012-05-17 14:43:30 +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
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
Andreas Preikschat 09faa0aac9 show shortcuts in service item menu
bzr-revno: 1969
2012-05-07 18:48:09 +02: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
Andreas Preikschat 43892f7d53 r1968 2012-05-07 17:45:02 +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