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

7100 Commits

Author SHA1 Message Date
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
Samuel Findlay 413cfc3782 Change description label. dump->convert. Added link to manual 2012-06-09 07:03:18 +10:00
Samuel Findlay 598ef7fff3 Merge refactor-song-import 2012-06-09 06:31:15 +10:00
Samuel Findlay 6bf5f6d56f Change attributes from enumeration to strings. Double underscore class attributes 2012-06-09 05:30:33 +10:00
Stevan Pettit b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Samuel Findlay f02e886976 Clean import strings of ASCII control chars (user's db had x07 chars) 2012-06-09 04:30:34 +10:00
Andreas Preikschat f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay 398ac5afdf String correction 2012-06-07 22:49:33 +10:00
Samuel Findlay c219665e1c Formatting 2012-06-07 22:30:41 +10:00
Samuel Findlay cc90096534 Added optional descriptionLabel for song format to import wizard 2012-06-07 22:11:47 +10:00
Samuel Findlay 837fc1c726 Merge refactor-song-import r1994 2012-06-07 00:55:42 +10:00
Samuel Findlay 818e46fba7 Formatting and comments 2012-06-06 19:14:53 +10:00
Samuel Findlay 0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay a79419d715 Formatting 2012-06-06 00:14:50 +10:00
Samuel Findlay 34de12040f Refactor exception handling 2012-06-06 00:12:19 +10:00
Samuel Findlay a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay 2ccf92f543 Improved isComplete() validation for single file/folder. 2012-06-05 19:20:07 +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 d16e64f11a fixed ticket 502 and another fix 
bzr-revno: 1981
 2012-06-04 12:39:38 +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
Samuel Findlay 676b0223b8 Tidy up 2012-06-04 01:32:21 +10:00
Samuel Findlay 6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay 501107c840 r1979 2012-06-03 23:53:20 +10:00
Samuel Findlay a07a81d851 Formatting 2012-06-03 23:52:45 +10:00
Samuel Findlay 7b97c15fc7 Refactor SongFormatAttr into SongFormat. PascalCase for enumeration. 2012-06-03 23:50:57 +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 d9ed9aaa5c Removed obj_prefix (old code from r1055 and even < r990) 2012-06-01 00:24:24 +10:00
Samuel Findlay 606da7ab76 Typo 2012-05-31 23:58:10 +10:00
Samuel Findlay 5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay dddd883ede Fixed alignment of filepathEdit widget by adjusting spacer size according to label width. 2012-05-31 22:42:44 +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 c4060dc04b First working rev. Completed basic testing. 2012-05-31 00:59:54 +10:00
Samuel Findlay 504145d454 Completed refactor of songimportform.py 2012-05-30 23:53:31 +10:00
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 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 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 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
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
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 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
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
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