Commit Graph

3531 Commits

Author SHA1 Message Date
Dmitriy Marmyshev
1dc22fc912 fix 2013-04-02 14:19:33 +04:00
Andreas Preikschat
28ea251866 fixed servicemanager bugs preventing saving/opening a service 2013-02-07 19:00:40 +01:00
Andreas Preikschat
b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat
f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +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
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
Tim Bentley
123f460f7e Fix up Receiver code changes 2013-02-03 15:06:17 +00:00
12fc795c9c Fix up some issues caused by my refactor and some apparent merge conflict somewhere. 2013-02-03 16:40:48 +02:00
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
327711d0ef HEAD 2013-02-02 23:16:42 +02:00
922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Tim Bentley
e61bb30d75 missed one 2013-02-02 20:21:14 +00:00
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
b0d96aa932 HEAD 2013-02-02 20:43:34 +02: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
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
Tim Bentley
aa14303003 standards for thememanager and more Registry 2013-02-01 21:48:06 +00:00
c891edc40c Last of the dialogs 2013-02-01 23:34:23 +02:00
4bd77075f3 Slowly making progress. 2013-02-01 22:52:42 +02:00
Tim Bentley
4c26ff8f80 Cleaned up ServiceManager 2013-02-01 20:40:23 +00:00
439fc9b8f0 More cleanups 2013-02-01 22:36:27 +02:00
Tim Bentley
3b6f897f6e Cleanup Advance Tab 2013-02-01 20:09:47 +00:00
18034a2f6a Linting cleanups. 2013-02-01 21:58:18 +02:00
Andreas Preikschat
9d2fc38717 r2164 + conflict 2013-01-31 20:22:56 +01:00
Patrick Zimmermann
27a6fbdc86 Proper fix for line striping with config setting
bzr-revno: 2164
2013-01-31 19:09:52 +00:00
Dmitriy Marmyshev
235d1c8b79 Make slide controller buttons width aware
bzr-revno: 2163
2013-01-31 19:06:53 +00:00
Andreas Preikschat
9bc317532c r2162 + conflict 2013-01-31 19:47:53 +01:00
Andreas Preikschat
16ba742d1d sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting 2013-01-31 08:56:34 +01:00
Patrick Zimmermann
bc93e5e3e2 Merge trunk. 2013-01-31 00:31:57 +01:00
Tim Bentley
72920494a6 Head and merge fixes 2013-01-30 22:01:52 +00:00
Andreas Preikschat
d7472876c7 change wording 2013-01-30 21:34:54 +01:00
Andreas Preikschat
cc5776c7d3 fixed 'song/ccli number' setting; do not change setting.ini when IMPORTING 2013-01-30 21:29:33 +01:00
Andreas Preikschat
94be547550 removed not needed return 2013-01-30 19:29:10 +01:00
Andreas Preikschat
320b692db7 fixed lower case on some settings 2013-01-30 19:24:41 +01:00
Andreas Preikschat
6822834c86 r2160 2013-01-30 18:56:00 +01:00
Tim Bentley
0a1f91af8b Review fixes 2013-01-29 17:19:19 +00:00
Patrick Zimmermann
cd89c4de9a Enable -> Use and British spelling. 2013-01-27 23:10:03 +01:00
Patrick Zimmermann
6e1f9cd3c1 Adapt code for new Settings() infrastructure. 2013-01-27 23:07:30 +01:00
Patrick Zimmermann
85810cc7f5 Merge master. 2013-01-27 22:55:24 +01:00
Tim Bentley
80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00