5285 Commits

Author	SHA1	Message	Date
Tim Bentley	669da85b2b	Config cleanup and bug fixes from previous cleanups ... bzr-revno: 2209	2013-03-13 19:08:44 +00:00
Andreas Preikschat	3a9e6c8ec0	do not continue when an invalid service is loaded	2013-03-13 14:43:28 +01:00
Andreas Preikschat	6c98df064f	I/we figured out, that transitions which end/start at a opacity of 0.2 do not look fluent. When set to 0.1 the transition look smoother. ... bzr-revno: 2205	2013-03-13 10:33:22 +01:00
Tim Bentley	7efe1320fb	Fix theme handling	2013-03-12 09:09:42 +00:00
Andreas Preikschat	841549ad59	make transitions a bit more fluent	2013-03-12 10:00:22 +01:00
Andreas Preikschat	2d26110f22	fixed regression bugs	2013-03-12 09:00:48 +01:00
Tim Bentley	dcec6ebbac	review corrections	2013-03-12 07:17:14 +00:00
Tim Bentley	5c79832bcc	More updates to authentication	2013-03-11 21:00:00 +00:00
Tim Bentley	46fe786f8b	More fixes	2013-03-11 19:11:46 +00:00
Arjan Schrijver	043c35a985	Merge HEAD	2013-03-11 16:23:43 +01:00
Tim Bentley	5f1db14ba4	Minor fixes	2013-03-10 20:35:14 +00:00
Tim Bentley	7d371228bc	Config updates	2013-03-10 20:19:42 +00:00
Andreas Preikschat	5acac7976c	reduced overlap time; renamed variable	2013-03-09 15:46:57 +01:00
Andreas Preikschat	c016067a4f	HEAD	2013-03-09 15:40:02 +01:00
Tim Bentley	c62dab074e	Basic Authentication now working	2013-03-08 19:15:49 +00:00
Tim Bentley	6bf07f9dce	Head	2013-03-08 16:35:10 +00:00
Andreas Preikschat	7ee4d94e2e	reverted indent change	2013-03-08 09:22:24 +01:00
Andreas Preikschat	ca406df0a4	head	2013-03-08 09:14:39 +01:00
Raoul Snyman	d6d1ecf616	Naming convention cleanups and a few merges from the upstream branch.	2013-03-07 23:04:19 +02:00
Tim Bentley	2464bef944	Head + conflicts	2013-03-07 18:22:38 +00:00
Andreas Preikschat	25919a34b2	fixed objectNames	2013-03-07 18:58:15 +01:00
Andreas Preikschat	3a33e1e6bf	spelling	2013-03-07 17:35:08 +01:00
Andreas Preikschat	e19161e039	use loop video attribute; fixed regression prevent media adding	2013-03-07 16:05:17 +01:00
Andreas Preikschat	0c4df23a19	converted while to for loop	2013-03-07 14:44:19 +01:00
Andreas Preikschat	bf02c4af34	fixed short lines	2013-03-07 14:37:50 +01:00
Andreas Preikschat	5f67e4f149	removed not needed icon parameter	2013-03-07 14:14:31 +01:00
Andreas Preikschat	7adb4bbdb5	do not override build-ins, clean ups	2013-03-07 13:59:35 +01:00
Andreas Preikschat	ceeaa0c359	renamed constant	2013-03-07 13:43:06 +01:00
Raoul Snyman	87212e5d1c	More cleanups and more tests	2013-03-07 14:34:35 +02:00
Andreas Preikschat	a70ef917fc	cleaned core/lib/init	2013-03-07 13:30:24 +01:00
Arjan Schrijver	52523224ec	Merge HEAD	2013-03-07 12:23:52 +01:00
Andreas Preikschat	d916bad0c8	fixed bug (thanks to our tests)	2013-03-07 12:20:57 +01:00
Andreas Preikschat	7e8b21b99f	progress bar fix	2013-03-07 12:11:35 +01:00
Andreas Preikschat	d2df81141f	last old signals	2013-03-07 12:10:16 +01:00
Andreas Preikschat	6066c80194	changed most of the signals to our new style	2013-03-07 12:01:06 +01:00
Andreas Preikschat	1031651db0	printform/dialog: code standards	2013-03-07 11:25:27 +01:00
Andreas Preikschat	b0f7e34271	log a warning, when a shortcut cannot be used	2013-03-07 11:07:02 +01:00
Arjan Schrijver	68d034e877	Revert code shortening from lp:~googol/openlp/image_groups	2013-03-07 10:03:02 +01:00
Andreas Preikschat	580baf76f4	fixed refactoring errors	2013-03-07 10:01:42 +01:00
Andreas Preikschat	cbb7de3928	spelltextedit: code standards	2013-03-07 09:58:12 +01:00
Andreas Preikschat	32ab855eb1	changed a few signals	2013-03-07 09:52:58 +01:00
Andreas Preikschat	99cdaa61ca	fixed docs, and signals	2013-03-07 09:24:12 +01:00
Andreas Preikschat	d2d34ed175	fixed display	2013-03-07 09:14:26 +01:00
Andreas Preikschat	a27b251060	songimporters	2013-03-07 09:05:43 +01:00
Andreas Preikschat	33ebf40630	toolbar: code standards	2013-03-07 07:48:09 +01:00
Raoul Snyman	e5c87ed6f2	HEAD	2013-03-07 08:47:43 +02:00
Andreas Preikschat	14b61cabf4	renamed canFolder	2013-03-07 00:00:57 +01:00
Andreas Preikschat	e1f35e002a	some media renames	2013-03-06 23:54:16 +01:00
Andreas Preikschat	1d9425c3b7	renamed videoBehindText	2013-03-06 23:50:49 +01:00
Andreas Preikschat	8383acf636	renamed isValid	2013-03-06 23:49:13 +01:00
Andreas Preikschat	c403e78684	renamed mediaObject, fixed songVerseMenu	2013-03-06 23:42:52 +01:00
Andreas Preikschat	86efc5629c	fixed formattigtagsform/dialog	2013-03-06 23:32:59 +01:00
Andreas Preikschat	1660fbf2f8	fixed formattigtagsform/dialog	2013-03-06 23:27:22 +01:00
Andreas Preikschat	8bb4c7e131	renamed serviceItem	2013-03-06 23:23:01 +01:00
Andreas Preikschat	0eaa3aa5f4	renamed forgotten methods	2013-03-06 23:11:30 +01:00
Andreas Preikschat	b864d360d3	r2201	2013-03-06 22:54:13 +01:00
Tim Bentley	f1aadde13c	Initial Cherrypy implementation	2013-03-06 21:53:29 +00:00
Tim Bentley	ca920ff774	Merge issues	2013-03-06 21:49:46 +00:00
Tim Bentley	13f18e271b	Fix review comments	2013-03-06 17:46:19 +00:00
Andreas Preikschat	d4a41180cf	updated doc	2013-03-06 14:21:27 +01:00
Patrick Zimmermann	d390fff811	Merge trunk.	2013-03-05 20:55:20 +01:00
Andreas Preikschat	555e38275a	changed order	2013-03-05 18:12:40 +01:00
Tim Bentley	4fb0aca862	Fix review comments	2013-03-05 17:11:58 +00:00
Andreas Preikschat	33db8e143b	fixed maindisplay opening again	2013-03-05 18:08:15 +01:00
Andreas Preikschat	4625f1f3a1	fixed object names	2013-03-05 15:18:05 +01:00
Andreas Preikschat	11db599cb1	exception form: code standards	2013-03-05 15:14:37 +01:00
Andreas Preikschat	8fed2230d3	exception form: code standards	2013-03-05 15:05:19 +01:00
Andreas Preikschat	4f1933dcfe	execptionform: code standards	2013-03-05 15:02:56 +01:00
Andreas Preikschat	5d68663c10	reverted maindisplay changes (avoid conflict)	2013-03-05 14:56:34 +01:00
Andreas Preikschat	6730d03373	fixed signal connecting	2013-03-05 14:55:50 +01:00
Andreas Preikschat	24bb3567ed	r2198	2013-03-05 14:43:04 +01:00
Andreas Preikschat	a835930990	renamed JS function	2013-03-05 11:36:41 +01:00
Andreas Preikschat	fee7797be1	removed not needed --webkit-transition	2013-03-05 11:32:20 +01:00
Andreas Preikschat	02335f6ef6	added comment	2013-03-05 11:09:15 +01:00
Andreas Preikschat	31abd72474	minimize the time 'nothing' is shown on the screen	2013-03-05 11:02:41 +01:00
Andreas Preikschat	a4f4ef0d7d	r2198	2013-03-05 10:41:00 +01:00
Andreas Preikschat	92a0d5d7ab	make transition a little faster	2013-03-05 10:40:00 +01:00
Raoul Snyman	e2c0ab3d8a	HEAD	2013-03-05 08:25:16 +02:00
Raoul Snyman	f1c2515502	HEAD	2013-03-04 22:40:28 +02:00
Andreas Preikschat	7c36d78ed8	r2197	2013-03-04 21:17:45 +01:00
Tim Bentley	bb48e35c5f	Fix theme load bug	2013-03-04 19:35:33 +00:00
Andreas Preikschat	2ed067ea0c	enable OpenGL again	2013-03-04 20:22:43 +01:00
Andreas Preikschat	6d66e6b957	fixed preview	2013-03-04 20:14:36 +01:00
Tim Bentley	5ee12ff1c0	Fix bug from bootstrap merge	2013-03-04 18:01:57 +00:00
Tim Bentley	847eb4d910	remove print	2013-03-04 16:56:41 +00:00
Tim Bentley	3a44717acf	Head and conflict	2013-03-04 16:55:13 +00:00
Arjan Schrijver	91ad9ae9cc	Merge HEAD	2013-03-04 14:48:42 +01:00
Arjan Schrijver	2561f995ac	Fixed manual import of configuration file with a list of images	2013-03-04 14:37:19 +01:00
Andreas Preikschat	b7448518d2	renamed variable/function	2013-03-04 12:04:15 +01:00
Andreas Preikschat	ac50ae1553	head	2013-03-04 11:55:02 +01:00
Andreas Preikschat	557c90129a	started to work on transitions	2013-03-04 11:52:38 +01:00
Tim Bentley	07a1dc9485	- Implementation of a two phase bootstrap. ... - Some minor code cleanups as well. - Removed unneeded tests bzr-revno: 2197	2013-03-04 11:32:05 +01:00
Andreas Preikschat	f52f4fac26	- fixed bug #902964 (Libreoffice deprecated commandline args) ... bzr-revno: 2196 Fixes: https://launchpad.net/bugs/902964	2013-03-04 11:23:43 +01:00
Raoul Snyman	6c1a0aa5e7	HEAD	2013-03-04 10:53:43 +02:00
Arjan Schrijver	a5e6cc358b	Moved initial images list conversion to app_startup	2013-03-03 20:35:11 +01:00
Arjan Schrijver	97184a9ea1	Moved conversion code. Doesn't work yet.	2013-03-03 18:24:32 +01:00
Arjan Schrijver	c02098faa8	Merge HEAD	2013-03-03 17:53:33 +01:00
Andreas Preikschat	c2794b6355	test new libreoffice arg	2013-03-02 10:30:36 +01:00
Tim Bentley	73fb71b4ce	Head + conflicts	2013-03-01 17:45:17 +00:00
Tim Bentley	188aa53082	Head + conflicts	2013-03-01 17:36:43 +00:00
Tim Bentley	83fe10361a	For minor fixes	2013-03-01 17:29:09 +00:00
Andreas Preikschat	7d0b2e9785	fixed bug #1116528 (Song Import Wizzard does not work in trunk) ... fixed exception form not being displayed Always log exceptions fixed/extended tes bzr-revno: 2195	2013-03-01 17:27:03 +00:00
Andreas Preikschat	3a9908345a	fileRenameForm/Dialog: code standards	2013-03-01 12:12:23 +01:00
Andreas Preikschat	9add95d2a5	aboutform: code standards	2013-03-01 12:02:18 +01:00
Andreas Preikschat	1fe2e31c1d	aboutform/dialog: code standards	2013-03-01 12:01:14 +01:00
Andreas Preikschat	ec56f5ff01	registry: code standards	2013-03-01 11:56:39 +01:00
Andreas Preikschat	d6a57aa5cf	image manager: code standards	2013-03-01 11:55:14 +01:00
Andreas Preikschat	a6617825ef	htmlbuilder: code standards	2013-03-01 11:50:41 +01:00
Andreas Preikschat	0086d102bd	updated renderer comments/docs	2013-03-01 11:46:46 +01:00
Andreas Preikschat	daed497a9e	made searchedit conform to our standards	2013-03-01 11:39:38 +01:00
Andreas Preikschat	1ef6cde4e4	fixed short lines; some other trivial fixes	2013-03-01 10:20:26 +01:00
Andreas Preikschat	2c02420bee	fixed AttributErrors (regressio)	2013-03-01 09:38:25 +01:00
Patrick Zimmermann	9bcdb79e7b	Merge master.	2013-02-28 22:55:36 +01:00
Andreas Preikschat	40de8647cf	renamed general settings to core ... Fixes: https://launchpad.net/bugs/1133237	2013-02-28 21:47:59 +01:00
Andreas Preikschat	43874d0090	fixed bug #902964 (Libreoffice deprecated commandline args) ... Fixes: https://launchpad.net/bugs/902964	2013-02-28 20:55:33 +01:00
Andreas Preikschat	7feab25c3f	always log the exception	2013-02-28 15:43:14 +01:00
Andreas Preikschat	dfa2eb1afe	fixed exception form not shown	2013-02-28 15:15:17 +01:00
Andreas Preikschat	c3e01dd719	fixed docs	2013-02-27 14:01:42 +01:00
Andreas Preikschat	20e26e7ea1	attempt to fix test; naming errors	2013-02-27 13:41:04 +01:00
Andreas Preikschat	51eb93fe75	added test	2013-02-27 13:03:17 +01:00
Andreas Preikschat	25b1584a9d	r2194 + conflict	2013-02-27 12:33:03 +01:00
Andreas Preikschat	5b6f6ddee1	removed not needed lines	2013-02-27 12:31:06 +01:00
Andreas Preikschat	0f8836ac54	removed not needed imports	2013-02-27 12:29:24 +01:00
Andreas Preikschat	4d1d912aaa	merged settingsmanager with applocation; moved applocation	2013-02-27 12:24:50 +01:00
Andreas Preikschat	00451ebfe0	moved SettingsManager	2013-02-27 12:04:05 +01:00
Tim Bentley	26ba57456f	Head + conflicts	2013-02-26 17:27:30 +00:00
Andreas Preikschat	7b0b14f962	Central Settings clean-up and tidy up ... bzr-revno: 2191	2013-02-26 17:20:32 +00:00
Andreas Preikschat	5a5845ccd1	added commented line	2013-02-26 16:41:36 +01:00
Andreas Preikschat	25373944b2	started work on converting old image settings	2013-02-26 12:23:57 +01:00
Andreas Preikschat	31f28a7570	fixed same short lines	2013-02-24 19:13:50 +01:00
Andreas Preikschat	44ebc1fe27	Update vendor vlc.py ... bzr-revno: 2190	2013-02-22 17:22:47 +00:00
Tim Bentley	8c29f8d4e5	minor changes	2013-02-22 07:15:07 +00:00
Tim Bentley	0a1ebfbdb9	Head + merge issues	2013-02-21 21:33:06 +00:00
Andreas Preikschat	db2b4ccd61	head + conflicts	2013-02-21 22:26:24 +01:00
Tim Bentley	fb466d25a2	Head	2013-02-21 21:21:33 +00:00
Tim Bentley	d0f36bb2e3	Head	2013-02-21 21:18:39 +00:00
Tim Bentley	4bc2c301e2	Stage renames	2013-02-21 21:18:26 +00:00
Tim Bentley	2516417ee5	fix conflict	2013-02-21 19:16:05 +00:00
Tim Bentley	197a423c29	fix cursor busy off	2013-02-21 17:30:18 +00:00
Tim Bentley	20c3157d6d	final fixes	2013-02-21 17:05:56 +00:00
Raoul Snyman	fe0f4d74b2	HEAD	2013-02-21 10:54:37 +02:00
Tim Bentley	ffb10c0149	More cleanups of slide controller and friends	2013-02-20 20:43:20 +00:00
Tim Bentley	ad7d78ff26	More cleanups	2013-02-20 19:31:51 +00:00
Andreas Preikschat	c8a84969cc	fixed log verbosity	2013-02-20 10:03:53 +01:00
Andreas Preikschat	cfc1b5f84d	sorted entries; fix	2013-02-20 09:15:34 +01:00
Andreas Preikschat	26599b0f73	clean up	2013-02-20 08:29:03 +01:00
Andreas Preikschat	b6efe5393d	do not react on ESC/Enter/Return event when closing the dialog	2013-02-20 08:27:51 +01:00
Andreas Preikschat	8d164cd21e	clean up	2013-02-20 08:02:48 +01:00
Andreas Preikschat	4e3a4f1e59	changed doc for can_shortcuts	2013-02-20 07:45:00 +01:00
Tim Bentley	5ca6d36935	Clean up custom plugin	2013-02-19 21:23:56 +00:00
Tim Bentley	6d732cf3ba	Cleanups	2013-02-19 19:50:14 +00:00
Andreas Preikschat	c2b5c65756	fixed up _is_shortcut_available method	2013-02-19 19:36:43 +01:00
Andreas Preikschat	269e5f5901	added actionList tests; removed useless test	2013-02-19 19:29:32 +01:00
Andreas Preikschat	29194b5e1e	fixed bug #1128376 (Configure shortcuts has two items called settings) ... Fixes: https://launchpad.net/bugs/112837	2013-02-19 14:57:14 +01:00
Andreas Preikschat	20d687524a	fixed missing items	2013-02-19 14:09:00 +01:00
Andreas Preikschat	0f44fb3dd5	added actions test file (not started yet); fixed short lines	2013-02-19 13:53:24 +01:00
Andreas Preikschat	ca23aedb5d	fixed shortcut dialog	2013-02-19 11:50:36 +01:00
Andreas Preikschat	b6f6cc916e	added listView shortkeys	2013-02-19 10:56:36 +01:00
Andreas Preikschat	38c2c2db5e	make diff more readable	2013-02-19 10:33:07 +01:00
Andreas Preikschat	53f93d6342	r2187 + conflicts	2013-02-19 10:16:54 +01:00
Andreas Preikschat	781da422b6	started to remove forgotten shortcut kwargs	2013-02-19 10:13:49 +01:00
Andreas Preikschat	fe11fd9365	r2187	2013-02-19 08:21:39 +01:00
Andreas Preikschat	cc97b4d127	updated vlc.py	2013-02-19 08:16:56 +01:00
Patrick Zimmermann	0df1f3932a	Replace QObject.connect calls with a smarter more pythonic syntax. Courtesy of TRB143++.	2013-02-18 23:26:27 +01:00
Patrick Zimmermann	92b42a6bb5	Merge master.	2013-02-18 23:04:38 +01:00
Tim Bentley	4b30d6cd29	Openup servicemanager again	2013-02-18 21:36:36 +00:00
Raoul Snyman	74fc1d3988	HEAD	2013-02-18 23:05:08 +02:00
Raoul Snyman	c0653676e7	HEAD	2013-02-18 22:59:44 +02:00
Tim Bentley	4cb0b33fca	Cleanup pluginmanager	2013-02-18 20:57:14 +00:00
Tim Bentley	7b03764a4a	code cleanups	2013-02-18 20:41:08 +00:00
Tim Bentley	89b7083a69	Head	2013-02-18 20:40:40 +00:00
Tim Bentley	b7c43aa65e	Minor code clean up and add more tests ... bzr-revno: 2187	2013-02-18 20:39:48 +00:00
Tim Bentley	e8b123925f	Bootstrap cleanup	2013-02-18 19:59:35 +00:00
Patrick Zimmermann	570b8e1f45	Merge master.	2013-02-18 19:56:26 +01:00
Patrick Zimmermann	10d9b506a6	Even more variables adapted to PEP8. Sentencify lots of comments.	2013-02-18 19:46:50 +01:00
Tim Bentley	de6ce12092	Mark 1	2013-02-17 21:28:45 +00:00
Andreas Preikschat	480b666918	cleaned pluginmanager constructor	2013-02-17 13:57:52 +01:00
Tim Bentley	2fab6cfb39	Head	2013-02-16 20:45:36 +00:00
Tim Bentley	e921e63e35	Head	2013-02-16 20:43:47 +00:00
Andreas Preikschat	ead6da8cbf	Added UiStrings test ... Added FormattingTags test bzr-revno: 2183	2013-02-16 20:41:33 +00:00
Andreas Preikschat	73cce9ad13	r2182	2013-02-16 19:50:55 +01:00
Tim Bentley	a463314b7a	Add Service Item Tests	2013-02-16 18:24:31 +00:00
Tim Bentley	8dc7c6ae65	Head	2013-02-16 13:25:18 +00:00
Tim Bentley	310f6032ed	tidy ups	2013-02-16 13:24:56 +00:00
Andreas Preikschat	a20f309824	r2181	2013-02-16 13:44:47 +01:00
Raoul Snyman	f4a2855094	Removed an unecessary variable.	2013-02-16 14:11:51 +02:00
Raoul Snyman	a8fafc3363	HEAD	2013-02-16 14:01:10 +02:00
Andreas Preikschat	a40defdeab	r2181	2013-02-16 12:46:12 +01:00
Tim Bentley	616684d9ad	Merge and fixes	2013-02-16 10:40:05 +00:00
Andreas Preikschat	7c9506af4a	- fixed Bug #1100277 (Songs don't load with latest build) ... - added nose to check_dependencies.py - fixed version number compare in create_separated_list bzr-revno: 2178	2013-02-16 06:48:52 +00:00
Philip Ridout	53beeed257	Fix bug #1067251: Correct focus of theme manager's dialogs ... - Fix a bug where the line edit in certain dialogs was not focused on show. - Add a test bzr-revno: 2177 Fixes: https://launchpad.net/bugs/1067251	2013-02-15 21:24:01 +02:00
Tim Bentley	c6ad115b10	More Signal removals	2013-02-14 21:50:10 +00:00
Tim Bentley	bd0ff619a9	Clean up settings and alerts	2013-02-14 21:31:17 +00:00
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
Andreas Preikschat	6b2274645a	added test for UiStrings, started with FormattingTags tests	2013-02-14 15:54:45 +01:00
Arjan Schrijver	cc9464ea74	Merge HEAD	2013-02-13 20:27:10 +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
Raoul Snyman	98311d9ad1	Add an interface test for the find_plugins method. ... Not sure if this should be an interface test or a scenario test, but it does very little mocking, tries to let the bits of OpenLP run for real, and checks that all the plugins are imported. Remove the superfluous argument to the find_plugins method.	2013-02-11 23:16:30 +02:00
Raoul Snyman	1dacaf2487	HEAD	2013-02-11 21:52:07 +02:00
Raoul Snyman	b5f3e46ad4	Pedantics.	2013-02-11 19:41:32 +02:00
Raoul Snyman	42e0eea6e7	Tidy up a little.	2013-02-11 15:46:08 +02:00
Raoul Snyman	f822aed40f	Add some tests around the PluginManager class.	2013-02-11 15:22:13 +02:00
Raoul Snyman	a2125e0954	Add some comments to make things clearer.	2013-02-11 11:43:26 +02:00
Raoul Snyman	230c06c83c	Change the importing of plugins to use the "imp" module in an effort to get around the UNO import errors.	2013-02-11 11:34:24 +02:00
Arjan Schrijver	0ca05faa5e	Merge HEAD	2013-02-11 10:21:46 +01:00
Andreas Preikschat	6eba926a70	improved hide menu behaviour	2013-02-10 20:08:37 +01:00
Arjan Schrijver	3717e7fa20	- Enhanced 'choose group' dialog layout (thanks Raoul) ... - Revert back to old QListWidget and use QTreeWidget only for images plugin - Renamed dialogs to comply to coding standards - Added image group icon - Enabled animation on image groups - Removed special 'Imported' folder and allow toplevel images instead	2013-02-10 17:11:12 +01: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
Andreas Preikschat	8bb88f3c9f	fixed bug 1112587 ... Fixes: https://launchpad.net/bugs/1112587	2013-02-10 13:29:42 +01:00
Raoul Snyman	0f7f17f79c	Various code cleanups. ... - Renamed variables to python_style - Renamed some functions to python_style - PEP8 compliance cleanup	2013-02-10 12:39:28 +02: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
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
phill-ridout	589d335d39	Changed filerenamefor to registry. ... Started on test for filerenameform	2013-02-07 21:55:22 +00:00
Tim Bentley	d1f7900ed4	fixes	2013-02-07 21:50:25 +00:00
Andreas Preikschat	28ea251866	fixed servicemanager bugs preventing saving/opening a service	2013-02-07 19:00:40 +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	818bd4a435	fixed version number compare	2013-02-06 20:49:39 +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
phill-ridout	6e17ff9d9e	Set lineEdit focus when displaying form	2013-02-05 19:57:08 +00:00
Andreas Preikschat	ede9bb70d9	attempt to fix bug #1100277 ... Fixes: https://launchpad.net/bugs/1100277	2013-02-05 18:36:43 +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	7cf10df7e8	converted print statements	2013-02-04 23:05:19 +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
Tim Bentley	b7b19a4180	Fix up Registry function processing	2013-02-04 19:25:12 +00:00
Tim Bentley	ca5e46a2b1	Add test idea for the registry	2013-02-03 21:46:56 +00:00
Arjan Schrijver	adb7aac7cf	Merge HEAD	2013-02-03 20:34:53 +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
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	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
Raoul Snyman	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
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
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
Tim Bentley	aa14303003	standards for thememanager and more Registry	2013-02-01 21:48:06 +00:00
Raoul Snyman	c891edc40c	Last of the dialogs	2013-02-01 23:34:23 +02:00
Raoul Snyman	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
Raoul Snyman	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
Raoul Snyman	18034a2f6a	Linting cleanups.	2013-02-01 21:58:18 +02:00
Arjan Schrijver	3f4df4f22c	Merge HEAD	2013-02-01 13:01:24 +01: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	c7aa0cd0f1	removed commented line	2013-01-31 19:46:19 +01:00
Patrick Zimmermann	2fbcd321cc	Merge trunk.	2013-01-31 19:18:19 +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
Arjan Schrijver	d95aef4b97	- Scroll images list automatically when dragging ... - Expand group where new images were added - Select dropped images - More code style fixes - Reverted earlier change to validateAndLoad	2013-01-30 20:33:22 +01:00
Andreas Preikschat	827f978970	moved setting	2013-01-30 20:16:51 +01:00
Andreas Preikschat	f7e44c4563	fixed spelling	2013-01-30 20:14:39 +01:00
Andreas Preikschat	8b037d16d7	fixed moved setting	2013-01-30 20:11:58 +01:00
Andreas Preikschat	f048abe326	fixed old missing setting	2013-01-30 20:05:52 +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	af1000bc4d	fixed data path missing	2013-01-30 19:05:56 +01:00
Andreas Preikschat	6822834c86	r2160	2013-01-30 18:56:00 +01:00
Arjan Schrijver	260a6815c2	Lots of code style fixes	2013-01-30 11:57:06 +01:00
Tim Bentley	0a1f91af8b	Review fixes	2013-01-29 17:19:19 +00:00
Arjan Schrijver	42a75e545e	Implemented drag&drop from external directly into an image group	2013-01-29 14:21:07 +01:00
Arjan Schrijver	34455239ef	Implemented drag&drop between image groups	2013-01-29 13:02:20 +01:00
Arjan Schrijver	d09b9edcc9	Fixed two comments	2013-01-28 20:52:26 +01: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