993 commits

Author	SHA1	Message	Date
Marc Zinnschlag	5b9e90744e	Merge branch 'load'	2014-05-10 13:49:25 +02:00
Marc Zinnschlag	6fdbd4d3f9	minor adjustment to UniversalId	2014-05-10 13:49:19 +02:00
Marc Zinnschlag	96ca9500ca	generate error messages when encounting non-critical problems during load	2014-05-10 13:47:22 +02:00
Marc Zinnschlag	79d59153c1	improved layout of loading window	2014-05-10 13:29:28 +02:00
Marc Zinnschlag	95d24492de	display load error messages in loading window	2014-05-10 13:18:40 +02:00
Marc Zinnschlag	aadaf7827d	added load error log	2014-05-10 12:04:36 +02:00
Marc Zinnschlag	cf90da6cd8	minor fix	2014-05-08 15:23:29 +02:00
Marc Zinnschlag	6eff5ecaad	Merge branch 'operations' into load ... Conflicts: apps/opencs/main.cpp apps/opencs/model/doc/document.cpp	2014-05-08 13:17:24 +02:00
Marc Zinnschlag	205306ee3d	changed message passing format from QString to a UniversalId/std::string pair	2014-05-08 12:42:29 +02:00
graffy76	0e7d40de6a	Merge branch 'master' of https://github.com/OpenMW/openmw ... upstream merge	2014-05-07 22:00:08 -05:00
graffy76	cd7983adb5	Decoupled setting definitions from the Setting class. QSettings ... implementation is now fully responsible for managing user settings.	2014-05-07 21:59:26 -05:00
Marc Zinnschlag	21142711f0	Merge remote-tracking branch 'graffy76/master'	2014-05-07 10:35:11 +02:00
graffy76	e47e3de3d2	Removed unneeded includes, cleaned up code, added comments	2014-05-06 21:58:50 -05:00
graffy76	8fb96e1be3	Removed error code for missing opencs.ini files.	2014-05-06 19:22:45 -05:00
graffy76	a17cb1f389	Fixed opencs.ini formatting	2014-05-06 07:37:52 -05:00
Marc Zinnschlag	a30d816982	fixed a mixup in CSMTools::Tools constructor/destructor	2014-05-06 11:44:20 +02:00
Marc Zinnschlag	492620c8cf	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
graffy76	5cba828cc9	Removed unneeded code from setting manager. Moved some code to user ... settings	2014-05-05 06:26:00 -05:00
graffy76	74fa115d20	fixed check for missing ini files	2014-05-05 06:07:41 -05:00
graffy76	475214ab62	Implmented QSettings for loading / saving file definitions. Also ... renamed opencs.cfg to opencs.ini to follow Ini format standards	2014-05-05 05:56:03 -05:00
Marc Zinnschlag	df97a1b57f	Merge remote-tracking branch 'sirherrbatka/Feature#1274'	2014-05-04 17:11:43 +02:00
Marek Kochanowicz	f51f826dad	fixed compilation	2014-05-04 15:13:03 +02:00
Marc Zinnschlag	7f78c29bb5	Merge remote-tracking branch 'sirherrbatka/Feature#1274' ... Conflicts: apps/opencs/view/world/table.cpp	2014-05-04 14:03:56 +02:00
Marek Kochanowicz	4a502226e6	added flag to distingiush widgets	2014-05-04 12:41:06 +02:00
graffy76	3f737bbb44	implemented QDial into RangeView class	2014-05-03 22:02:16 -05:00
graffy76	4f876574c1	Implemented slider widget in rangeView class	2014-05-03 21:50:08 -05:00
graffy76	0a3ab3dcd1	Commented out "proxy selection test" demo page in user settings	2014-05-03 19:48:04 -05:00
graffy76	35d1502308	Merge branch 'master' of https://github.com/OpenMW/openmw ... merge	2014-05-03 19:16:42 -05:00
graffy76	1c26741c56	Implemented rangeview with spinbox as only control. Simplified setting ... class constructor.	2014-05-03 18:58:43 -05:00
graffy76	bc6197c552	Added custom spin box class	2014-05-03 18:57:34 -05:00
Marek Kochanowicz	00b21449a2	replaced type_cell with type_scene	2014-05-03 19:47:13 +02:00
Marc Zinnschlag	e9c2f24faa	intercept close button clicks in loading window	2014-05-03 17:14:17 +02:00
Marc Zinnschlag	3fdd72f204	added cancel button to loading window	2014-05-03 16:44:50 +02:00
Marc Zinnschlag	6bc5869222	record loading progress bar	2014-05-03 15:33:35 +02:00
Marc Zinnschlag	6692d2dc72	split up load function in a start and continue part	2014-05-03 15:05:02 +02:00
Marc Zinnschlag	0b309d9ef4	Merge branch 'master' into load ... Conflicts: apps/opencs/view/doc/viewmanager.cpp	2014-05-03 14:36:06 +02:00
Marek Kochanowicz	5e99381019	Drag and drop works.	2014-05-03 14:00:30 +02:00
Marc Zinnschlag	e0e2ad8316	content file loading progress bar	2014-05-03 13:01:29 +02:00
Marc Zinnschlag	e09218f164	moved load code from Document to Loader class	2014-05-03 12:07:05 +02:00
Marek Kochanowicz	7f1df878f6	make getDropType static and public.	2014-05-02 20:28:28 +02:00
Marek Kochanowicz	c2b070f097	trying to do it right.	2014-05-01 19:17:33 +02:00
Marek Kochanowicz	ea1aaef8ca	replace paged with unpaged (and vice versa)	2014-05-01 18:25:28 +02:00
Marek Kochanowicz	d00dbf47d5	working on worldspace drops	2014-05-01 15:09:47 +02:00
Marc Zinnschlag	ab94e70724	more cleanup of document setup	2014-05-01 13:04:48 +02:00
Marek Kochanowicz	57131332f4	fixing minor issues	2014-05-01 12:34:54 +02:00
Marek Kochanowicz	9e01a54d72	minor correction	2014-04-30 15:17:20 +02:00
Marek Kochanowicz	6aaa15b2e8	paged worldspace drop	2014-04-30 15:03:46 +02:00
Marek Kochanowicz	19dac9dc86	that would be it	2014-04-30 14:27:11 +02:00
Marek Kochanowicz	4d79f00e28	enable dragging on the region map cells	2014-04-30 13:32:54 +02:00
Marek Kochanowicz	eeb18b533e	moved editlock to the dragrecordtable	2014-04-29 21:41:57 +02:00