Commit Graph

10104 Commits

Author SHA1 Message Date
Andreas Preikschat 8bb88f3c9f fixed bug 1112587
Fixes: https://launchpad.net/bugs/1112587
2013-02-10 13:29:42 +01:00
Andreas Preikschat 75fbfe3edd Fix bugs with servicemanager settings
bzr-revno: 2174
2013-02-07 21:48:37 +00:00
Andreas Preikschat 28ea251866 fixed servicemanager bugs preventing saving/opening a service 2013-02-07 19:00:40 +01:00
Andreas Preikschat ecb991535a r2173 2013-02-07 18:51:21 +01:00
Andreas Preikschat a832377554 - removed not needed imports; removed not needed script
- used += instead
- fixed short lines
- converted print statements
- reordered imports

bzr-revno: 2173
2013-02-06 22:43:18 +01:00
Andreas Preikschat 801b364c01 Fixed a rename error
bzr-revno: 2172
2013-02-06 22:41:07 +01:00
Philip Ridout e03411422f Fix bug #1098075: Cancelling character table dialog in song importer causes OpenLP to crash
bzr-revno: 2171
Fixes: https://launchpad.net/bugs/1098075
2013-02-05 21:34:47 +02:00
Andreas Preikschat ea3e24096c use registry 2013-02-05 20:29:31 +01:00
Andreas Preikschat f1e8f9812c fixed rename error 2013-02-05 18:47:57 +01:00
Andreas Preikschat b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat 864909c753 - ordered settings
- fixed old 'songs/ccli number' setting
 - do not make changes to the settings file when importing
- move settings file to the tmp dir and clean it up there

bzr-revno: 2170
2013-02-05 09:08:56 +01:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat 682460132c search and replace does evil things 2013-02-05 07:54:55 +01:00
Andreas Preikschat f94da5c22c fixed spaces 2013-02-05 07:47:03 +01:00
Andreas Preikschat 7cf10df7e8 converted print statements 2013-02-04 23:05:19 +01:00
Andreas Preikschat 8a36430659 removed not needed script 2013-02-04 22:42:31 +01:00
Andreas Preikschat 8f5fe64d3e fixed short lines 2013-02-04 22:39:44 +01:00
Andreas Preikschat a72b4283bf removed mutable as parameters 2013-02-04 22:27:50 +01:00
Andreas Preikschat 3df730db09 used += instead 2013-02-04 22:26:27 +01:00
Andreas Preikschat 86912ec2c3 removed not needed imports; removed not needed script 2013-02-04 22:22:12 +01:00
Andreas Preikschat 9aa7cf7b29 r2169 + conflict 2013-02-04 22:07:38 +01:00
phill-ridout 17252dafd2 fixes bug 1098075 trunk version 2013-02-04 17:47:02 +00:00
Tim Bentley c28448d18c Start to remove Receiver and some bug fixes from previous merges
bzr-revno: 2169
2013-02-03 19:50:42 +00:00
Tim Bentley a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +00:00
Tim Bentley 28aeed815f Minor fixes 2013-02-03 17:42:31 +00:00
Tim Bentley ad438ba4b2 Remove rogue print 2013-02-03 16:56:19 +00:00
Tim Bentley 084da9c1bd Minor fixes 2013-02-03 16:44:03 +00:00
Tim Bentley b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Raoul Snyman a7dae7cc98 Various code cleanups and improvements to get code to standard
bzr-revno: 2168
2013-02-03 15:10:41 +00:00
Tim Bentley 123f460f7e Fix up Receiver code changes 2013-02-03 15:06:17 +00:00
Raoul Snyman 12fc795c9c Fix up some issues caused by my refactor and some apparent merge conflict somewhere. 2013-02-03 16:40:48 +02:00
Raoul Snyman b60cfba63f Ignore some files that might appear at times. 2013-02-03 15:35:20 +02:00
Raoul Snyman 00039fbdef Removed an accidental commit 2013-02-03 15:31:05 +02:00
Tim Bentley 27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman 327711d0ef HEAD 2013-02-02 23:16:42 +02:00
Tim Bentley 7303395cb7 Head 2013-02-02 20:58:27 +00:00
Philip Ridout 0918206973 Fix missed Registry conversion
bzr-revno: 2167
2013-02-02 20:55:12 +00:00
Raoul Snyman 922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Tim Bentley 44ea74cf55 Code cleanups and style fixes
bzr-revno: 2166
2013-02-02 20:53:50 +00:00
Tim Bentley e61bb30d75 missed one 2013-02-02 20:21:14 +00:00
Raoul Snyman 2f8bc1e2bb More cleanups 2013-02-02 22:18:34 +02:00
Tim Bentley 4f2b21ddfa Fix review comments 2013-02-02 19:49:56 +00:00
Raoul Snyman b0d96aa932 HEAD 2013-02-02 20:43:34 +02:00
phill-ridout 7cc695f3bb New line at end of file added. 2013-02-02 17:44:07 +00:00
Andreas Preikschat 67b739a1b7 r2165 2013-02-02 15:54:07 +01:00
Philip Ridout f75b3ffdaf Fixes bug 1113446 2013-02-02 14:09:22 +00:00
Tim Bentley 42ff12dc48 more tweeks 2013-02-02 07:34:42 +00:00
Tim Bentley 345b0fcd12 Fix up merge request issues 2013-02-02 07:08:28 +00:00
Raoul Snyman e25326512d Now all the media players are looking better 2013-02-02 08:32:29 +02:00
Tim Bentley 8c0144d1fc Merge errors 2013-02-01 22:14:30 +00:00