1329 commits

Author	SHA1	Message	Date
scrawl	67bd6cd708	Remove empty line at the beginning of files ... git ls-files -z | xargs -0 sed -i '1{/^$/d}'	2015-08-18 23:06:12 +02:00
Marc Zinnschlag	1b663f01af	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
Marc Zinnschlag	e2377396a7	inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)	2015-08-13 12:53:00 +02:00
Marc Zinnschlag	904ad94952	added merge operation (doesn't do anything yet)	2015-08-13 12:03:20 +02:00
Marc Zinnschlag	708cacdec4	disable merge menu item when a merge is already in progress	2015-08-08 16:47:58 +02:00
Marc Zinnschlag	23ccee0124	Merge remote-tracking branch 'dieho/master' ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp	2015-08-08 11:00:44 +02:00
Marc Zinnschlag	7f10a7f24f	Merge remote-tracking branch 'smbas/feature-mgef-verifier'	2015-08-08 10:50:38 +02:00
Marc Zinnschlag	4fd3097c1c	improved adjuster widget problem reporting	2015-08-06 12:58:52 +02:00
Marc Zinnschlag	b83f9445a9	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
Marc Zinnschlag	469a896ca1	make non-editable fields in dialogue sub view selectable (Fixes #2818)	2015-08-06 08:45:38 +02:00
taras.kudryavtsev	8ae7c63c45	#2730 and #2725	2015-08-04 16:58:44 +03:00
Stanislav Bas	cbc8309289	Don't allow empty value of School field in Magic Effects table	2015-08-04 16:19:00 +03:00
Stanislav Bas	6b3de5c720	Activate editing of nested table cells by a double click	2015-08-02 22:53:40 +03:00
Stanislav Bas	1590a04d03	Close EditWidget when a proper row removed	2015-08-02 22:39:41 +03:00
Marc Zinnschlag	6a9218ee07	replaced State_Compiling (not requried anymore) with State_Merging	2015-07-30 11:49:24 +02:00
Marc Zinnschlag	2c1cee38b4	Merge remote-tracking branch 'smbas/feature-extended-configurator'	2015-07-28 07:56:12 +02:00
Stanislav Bas	03c2e11961	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
Stanislav Bas	2471e4d67a	Rework Table to use rowAdded() signal of a proxy model	2015-07-26 20:09:31 +03:00
Marc Zinnschlag	fcf9ae42f4	Merge remote-tracking branch 'smbas/fix-table-proxy-bugs'	2015-07-24 10:29:08 +02:00
Rohit Nirmal	6d2d32485f	Fix building OpenCS with Qt 5.	2015-07-23 22:22:22 -05:00
Stanislav Bas	f5b1447c92	IdTableProxyModel refreshes the filter when the source model data or rows changed	2015-07-23 21:05:00 +03:00
Marc Zinnschlag	b2ab0122ab	Merge branch 'scriptbuttons'	2015-07-18 17:37:43 +02:00
Marc Zinnschlag	f1ac440b78	do not allow editing of deleted scripts	2015-07-18 17:00:00 +02:00
Marc Zinnschlag	8763a3b3c3	make compilation delay configurable via a user setting	2015-07-18 15:32:38 +02:00
Marc Zinnschlag	73b6df8280	put script compilation in script subview behind a timer	2015-07-18 13:09:17 +02:00
scrawl	58720e6a28	Fix the OpenCS rendering crash on exit (Fixes #2735)	2015-07-18 03:52:48 +02:00
Marc Zinnschlag	5febb96012	do not try to jump to source location for errors that do not have a source location	2015-07-17 13:59:50 +02:00
Marc Zinnschlag	f665919046	consider column when jumping to error in source text	2015-07-17 13:53:22 +02:00
Marc Zinnschlag	0abd29a3b4	jump to line in source text when clicking on an error in error table	2015-07-17 13:42:25 +02:00
Marc Zinnschlag	100af80388	made error table read only	2015-07-17 13:06:51 +02:00
Marc Zinnschlag	56ed0926bd	improved error table layout	2015-07-17 12:45:08 +02:00
Marc Zinnschlag	eab1ec9160	consider script warning settings for script subview	2015-07-17 11:52:59 +02:00
Marc Zinnschlag	9b12b4f1e2	refactored mapping from message severity enum to string	2015-07-16 14:46:02 +02:00
Marc Zinnschlag	2d8a78726d	improved error reporting	2015-07-16 14:09:14 +02:00
Marc Zinnschlag	2016ff773f	display script errors in script subview	2015-07-16 12:36:20 +02:00
Marc Zinnschlag	df027b3498	hooked up script subview buttons to bottom box (enables add and clone)	2015-07-14 13:52:48 +02:00
Marc Zinnschlag	cf1fb76bb4	fixed deleted button sensitivity state	2015-07-14 13:34:13 +02:00
Marc Zinnschlag	0860c27b03	improving consistency of subview layouts	2015-07-14 11:49:41 +02:00
Marc Zinnschlag	2202973c24	replaced the script subview status bar with a bottom box (including a status bar)	2015-07-14 10:05:45 +02:00
Marc Zinnschlag	fc6c14614b	added user settings option to toggle toolbars in single-record subviews	2015-07-13 12:52:18 +02:00
Marc Zinnschlag	b97a4cee44	added button bar to script subview	2015-07-11 16:09:13 +02:00
MiroslavR	13f289d1a5	Fix calculation of selected blocks in ScriptEdit	2015-07-06 16:35:45 +02:00
Stanislav Bas	47d21ff4b3	Add edit locking to ExtendedCommandConfigurator	2015-07-05 22:49:48 +03:00
Stanislav Bas	3c6bc74062	Close the extended configurator when all respective records were removed outside	2015-07-05 22:10:37 +03:00
Stanislav Bas	6162a46fbe	Update to upstream/master. Resolve the merge conflict	2015-07-05 16:15:48 +03:00
Marc Zinnschlag	ea1ddb5c9f	Merge remote-tracking branch 'smbas/feature-dialogue-edit-id'	2015-07-05 14:44:33 +02:00
Stanislav Bas	4fbd24206b	ExtendedCommandConfigurator: layout changes	2015-07-04 20:47:10 +03:00
Stanislav Bas	880bc31ddf	TableBottomBox: Creator/Configurator can be closed via Escape	2015-07-04 20:30:02 +03:00
Stanislav Bas	c1b06538dc	Add Edit 'ID' action for nested fields	2015-07-04 19:55:48 +03:00
Stanislav Bas	30fd711a47	TableEditIdAction: prevent creation of a UniversalId with Type_None	2015-07-04 19:39:53 +03:00
Stanislav Bas	86dc5a2c67	Add Edit 'ID' action for nested tables	2015-07-04 19:27:59 +03:00
Stanislav Bas	464e674a81	Rework Table (view) code to use a TableEditIdAction	2015-07-04 18:51:39 +03:00
Stanislav Bas	6b34845168	Create a separate class for Edit 'ID' action to use in tables' context menus	2015-07-04 18:49:32 +03:00
Stanislav Bas	1f826476ff	Fix build error	2015-07-04 02:02:22 +03:00
Stanislav Bas	ff3c9a6fb2	ExtendedCommandConfigurator: the perform button is now the default for the widget	2015-07-03 23:35:00 +03:00
Stanislav Bas	e664ef7578	ExtendedCommandConfigurator: the perform button takes the name of the command that is executed	2015-07-03 23:15:26 +03:00
Stanislav Bas	05cc130212	The configuration panel gets a focus when opening	2015-07-03 22:31:38 +03:00
Stanislav Bas	95d16b24c0	ExtendedCommandConfigurator: disable the perform button when all tables are unchecked	2015-07-03 22:25:56 +03:00
Stanislav Bas	260f6f22ae	TableBottomBox adjusts its size according to the current widget size	2015-07-03 22:07:37 +03:00
Stanislav Bas	d73fd471c3	IdContextMenu: don't add Edit action if it's already in the context menu	2015-07-03 19:07:44 +03:00
Stanislav Bas	61ab0ba482	Prevent the Edit 'ID' action for the current ID of the dialogue subview	2015-07-03 18:48:13 +03:00
Stanislav Bas	149cb9d004	IdContextMenu: if the ID field is empty show the standard context menu (if available)	2015-07-03 16:51:47 +03:00
Stanislav Bas	e8e34f37dd	Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)	2015-07-03 16:24:08 +03:00
Stanislav Bas	47b66b57ae	Create a context menu handler for dialogue editors with ID information	2015-07-03 15:37:10 +03:00
Marc Zinnschlag	382cdb8c60	implemented sorting in report views (Fixes #2540)	2015-07-03 10:45:08 +02:00
Stanislav Bas	12bf3694bd	Rework widget layout of ExtendedCommandConfigurator	2015-07-02 22:05:45 +03:00
Stanislav Bas	b8772c6902	Add the ability to configure extended commands for tables	2015-07-02 20:44:59 +03:00
Stanislav Bas	ba762ec1c1	Add the configuration widget to the bottom box	2015-07-02 17:21:47 +03:00
Stanislav Bas	1949fe4bf9	Add the configuration widget for extended commands	2015-07-02 15:47:12 +03:00
Stanislav Bas	51a2d4ef5a	Merge remote-tracking branch 'upstream/master'	2015-06-30 13:50:33 +03:00
Marc Zinnschlag	d3bcf0711c	Merge remote-tracking branch 'smbas/feature-cloning-enhancements'	2015-06-30 10:40:28 +02:00
Stanislav Bas	e2103287aa	Not accepted drag event must be ignored	2015-06-30 01:08:42 +03:00
scrawl	1956e2c988	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt	2015-06-28 00:38:39 +02:00
Stanislav Bas	e4d52ff9b0	Deleted records can be cloned	2015-06-28 00:31:41 +03:00
Stanislav Bas	9d274ee156	Merge branch 'master' into feature-cloning-enhancements	2015-06-27 22:02:31 +03:00
Stanislav Bas	81c7ce5b06	Add the proper getErrors() method to CellCreator. ... Fix the impossibility of the Exterior Cell creation.	2015-06-27 21:59:16 +03:00
Marc Zinnschlag	15bb2855a9	disable prev/next buttons if there is no previous/next record	2015-06-27 16:57:45 +02:00
Marc Zinnschlag	e27a75bd10	added user setting for cyclic prev/next	2015-06-27 15:56:41 +02:00
Marc Zinnschlag	95522fcad2	more general cleanup	2015-06-27 15:29:54 +02:00
Marc Zinnschlag	9aa153984a	fixed inconsistent handling of deleted records in dialogue; general cleanup	2015-06-27 15:02:50 +02:00
Marc Zinnschlag	a8c26ec0c1	moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar	2015-06-27 14:42:22 +02:00
Marc Zinnschlag	d5e6d8a58b	disable dialogue subview buttons while document is locked	2015-06-27 14:25:48 +02:00
Marc Zinnschlag	6769479358	moved code for initiating record cloning from DialogueSubView to RecordButtonBar	2015-06-27 13:47:07 +02:00
Marc Zinnschlag	7f1129df3b	cleaned up DialogueSubView constructor; moved bottom box below button bar	2015-06-27 12:53:46 +02:00
Marc Zinnschlag	49dc30683f	refactored dialogue subview button bar into a new class	2015-06-27 12:49:56 +02:00
Stanislav Bas	cbb124ab4f	Close the creator when the original record is removed (in clone mode)	2015-06-27 12:26:19 +03:00
Stanislav Bas	cad4ce4e0f	Cell type can be changed when cloning a cell	2015-06-27 11:47:59 +03:00
Stanislav Bas	5761ec428d	Creating/cloning Cell sets the proper Interior flag	2015-06-26 23:38:20 +03:00
Marc Zinnschlag	fdf6645dbc	Merge remote-tracking branch 'smbas/fix-info-tables'	2015-06-26 18:47:16 +02:00
Marc Zinnschlag	654e7428aa	Merge remote-tracking branch 'smbas/master'	2015-06-26 18:39:40 +02:00
Marc Zinnschlag	2dada1a162	Merge branch 'meta'	2015-06-26 18:37:39 +02:00
Marc Zinnschlag	4487bda702	size limits for meta data strings	2015-06-26 18:19:00 +02:00
Marc Zinnschlag	1e033fa8fe	added meta data dialogue sub view	2015-06-26 16:11:00 +02:00
Marc Zinnschlag	57015f3666	fixed handling of numeric read-only fields in dialogue sub views	2015-06-26 15:50:36 +02:00
Marc Zinnschlag	10fbe6aada	split DialogueSubView in SimpleDialogueSubView and DialogueSubView	2015-06-26 15:17:47 +02:00
Stanislav Bas	feeb9ea8b0	Merge remote-tracking branch 'upstream/master'	2015-06-26 12:10:51 +03:00
Stanislav Bas	867ce686ae	Proper conversion to QString for DropLineEdit::dropEvent()	2015-06-25 19:30:53 +03:00
Marc Zinnschlag	69db0179ca	update refresh menu item on stateChanged signal instead of when opening the menu	2015-06-25 13:05:57 +02:00
Marc Zinnschlag	6fbdbb11d5	added refrash menu item to report table (Fixes #2620)	2015-06-25 12:03:40 +02:00
Stanislav Bas	d282bead23	InfoCreator accepts drops of Topic/Journal ID	2015-06-25 11:24:19 +03:00