Patrick Zimmermann
ab88b77f9c
Merge master.
2013-02-14 22:04:12 +01:00
Patrick Zimmermann
f7c19f599c
Move customInit to wizard. So dummy implementations are not required in the deriving classes.
2013-02-14 22:01:10 +01:00
Patrick Zimmermann
2a16a6ebcb
Rename lots of variables and methods. Shorten some too long lines.
2013-02-14 21:57:13 +01:00
Patrick Zimmermann
bbd491baa8
Make songsProbablyEqual test more standard like.
2013-02-14 00:15:21 +01:00
Patrick Zimmermann
6d5935a0b9
Fix many whitespace issues.
2013-02-14 00:00:05 +01:00
Tim Bentley
61a45e87ea
Remove EventReceiver and make use of the Registry
...
bzr-revno: 2176
2013-02-13 06:03:25 +00:00
Patrick Zimmermann
9597c9f129
Minor cosmetic fix.
2013-02-12 23:10:13 +01:00
Patrick Zimmermann
e16a3c6dea
Merge trunk.
2013-02-12 22:51:04 +01:00
Patrick Zimmermann
d8cfc4f28a
Fix wizard after trunk merge and fix a minor display bug.
2013-02-12 22:44:33 +01:00
Tim Bentley
8080fc1f8c
Remove blank line
2013-02-12 21:27:43 +00:00
Patrick Zimmermann
e807c9cb93
Add basic test logic & tune duplicate identification logic a bit.
2013-02-12 21:38:43 +01:00
Tim Bentley
fb4cad42d0
Review fix
2013-02-12 16:50:42 +00:00
Tim Bentley
159e14c987
Head
2013-02-10 16:10:32 +00:00
Andreas Preikschat
203eb315b7
Fixed regression in theme manager / first time wizard
...
bzr-revno: 2175
2013-02-10 16:10:08 +00:00
Tim Bentley
064a4bad20
Merge fixes
2013-02-10 16:05:52 +00:00
Tim Bentley
f669032fc9
Comment updates
2013-02-09 17:30:46 +00:00
Tim Bentley
f92adad31d
Comment fixes
2013-02-09 17:23:35 +00:00
Tim Bentley
f9dc608984
Review fixes
2013-02-09 17:13:27 +00:00
Tim Bentley
536bee40d4
Test fixes
2013-02-09 17:07:33 +00:00
Andreas Preikschat
5739536d8c
fixed more regression
2013-02-09 16:27:35 +01:00
Andreas Preikschat
b0065d808c
removed not needed call
2013-02-09 15:45:07 +01:00
Andreas Preikschat
d6128a4f06
fixed first time wizard
2013-02-09 15:13:38 +01:00
Tim Bentley
d1f7900ed4
fixes
2013-02-07 21:50:25 +00: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
Tim Bentley
cae39247d9
Final cleanup of variables
2013-02-07 11:33:47 +00:00
Tim Bentley
3063526430
Fix problems with start up thread
2013-02-07 10:16:08 +00:00
Tim Bentley
c90d45ca73
Bye Bye Event Receiver
2013-02-07 08:42:17 +00:00
Tim Bentley
fae34b1b4d
Head + fix merge problems
2013-02-07 07:17:19 +00:00
Tim Bentley
1576a2c1d4
Config update conversion
2013-02-07 07:08:35 +00:00
Tim Bentley
1430559205
More Receiver to Registry migrations
2013-02-06 21:52:15 +00: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
Tim Bentley
d491997ca7
old test code
2013-02-06 19:25:16 +00:00
Tim Bentley
eac2ce39b3
More Receiver removals
2013-02-05 21:42:15 +00: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