1950 commits

Author	SHA1	Message	Date
cc9cii	ccf840da2b	Merge branch 'master' into autocalc ... Conflicts: apps/opencs/view/world/dialoguesubview.cpp	2015-06-18 22:08:27 +10:00
cc9cii	ad04046243	Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663. ... - Currently does not auto-update when race, class or skills tables change.	2015-06-18 22:02:08 +10:00
Marc Zinnschlag	12e0873446	Merge remote-tracking branch 'smbas/feature-info-tables-sorting'	2015-06-18 10:31:44 +02:00
Marc Zinnschlag	63d46f7e66	removed an unused variable	2015-06-18 10:26:35 +02:00
Marc Zinnschlag	0b32b24d60	Merge remote-tracking branch 'smbas/fix-enumdelegates'	2015-06-18 10:21:27 +02:00
Stanislav Bas	c60fed89ac	Enable sorting for Info tables	2015-06-17 23:50:18 +03:00
Stanislav Bas	a6624ca576	Cache topic/journal first rows in InfoTableProxyModel	2015-06-17 23:46:51 +03:00
Stanislav Bas	2e40b68862	Add a custom proxy model for Info tables	2015-06-17 22:47:39 +03:00
Stanislav Bas	1e368de289	Adjust columns of nested tables when a dialog subview is opened	2015-06-16 21:47:27 +03:00
Stanislav Bas	6cfee630aa	Proper size hint for DataDisplayDelegate	2015-06-16 21:25:06 +03:00
Stanislav Bas	2c1ca33a20	Refactor Enum- and DataDisplayDelegate code	2015-06-16 15:39:54 +03:00
Stanislav Bas	0ffb2bc6bc	Proper size hint for EnumDelegate	2015-06-16 14:18:47 +03:00
Marc Zinnschlag	62c5f185d7	Merge remote-tracking branch 'cc9cii/master'	2015-06-16 12:30:21 +02:00
cc9cii	6a47ea9a67	fix typo	2015-06-16 13:09:44 +10:00
cc9cii	cccf6c6bdd	Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.	2015-06-16 12:48:45 +10:00
Stanislav Bas	d906a9d7d1	DataDisplayDelegate doesn't draw a text outside a table cell	2015-06-16 00:19:51 +03:00
scrawl	609e146a22	Build fixes for windows	2015-06-15 16:48:18 +02:00
Marc Zinnschlag	675884ba30	Merge remote-tracking branch 'smbas/feature-soundgen-verifier'	2015-06-15 16:25:11 +02:00
Marc Zinnschlag	e17f7ac81a	Merge remote-tracking branch 'cc9cii/master'	2015-06-14 12:50:10 +02:00
Stanislav Bas	281088c93b	Add check for an empty sound field to SoundGens verifier	2015-06-13 19:47:39 +03:00
Stanislav Bas	2c15ad5e0c	Add SoundGens verifier	2015-06-13 19:08:31 +03:00
cc9cii	5b6984d8d8	Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656.	2015-06-13 22:24:22 +10:00
Marc Zinnschlag	c560f8b8a2	Merge remote-tracking branch 'smbas/fix-regionmap-colors'	2015-06-13 11:33:12 +02:00
cc9cii	b81454d226	Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.	2015-06-13 14:37:47 +10:00
Stanislav Bas	650e37dba1	RegionMap uses proper colors	2015-06-12 22:31:12 +03:00
scrawl	e13a938896	Add support to build with Qt5 (Task #2665) ... Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.	2015-06-12 15:13:42 +02:00
scrawl	cf95d3fc35	Refactor cmake scripts, reducing the amount of find_package(Boost)	2015-06-12 01:45:19 +02:00
scrawl	fc5176dc38	Refactor cmake scripts, reducing the amount of find_package(Qt4)	2015-06-11 23:38:08 +02:00
scrawl	d03880fbf0	Compile fix for old boost versions	2015-06-11 23:25:26 +02:00
scrawl	6051c47eef	Fix for incorrect QString -> path conversion	2015-06-11 22:36:19 +02:00
Marc Zinnschlag	8d22d26669	Merge remote-tracking branch 'cc9cii/scrollbar-fix'	2015-06-10 18:51:14 +02:00
cc9cii	893ad11be1	Fix missing columns in tables. Should resolve Bug #2624. ... - Using Flag_Table in filterAcceptsColumn() does not work. - Workaround by not allowing nested columns in sorting and filtering.	2015-06-08 08:04:18 +10:00
Marc Zinnschlag	d90aff4303	Merge remote-tracking branch 'smbas/feature-id-completion'	2015-06-07 08:52:44 +02:00
Stanislav Bas	d63b01dde3	Checkboxes in the table view use a combobox editor	2015-06-06 15:41:25 +03:00
cc9cii	5c37079f0c	Include only the columns that are visible for sorting. Should resolve Bug #2611.	2015-06-05 12:19:21 +10:00
Stanislav Bas	bd46ddcf47	Correct the return type in IdTree::data() for Display_Role	2015-06-03 15:51:34 +03:00
Stanislav Bas	b25cc6bc55	IdCompletionManager uses Display type instread of ColumnId for creating completers	2015-06-03 12:01:13 +03:00
Stanislav Bas	4e759370de	Change Display_String to the proper display type where appropriate	2015-06-03 00:02:53 +03:00
Stanislav Bas	f84c36b500	CommandDelegate: extract a display type from a model if it isn't specified	2015-06-03 00:00:39 +03:00
Stanislav Bas	2c4025ec72	Rename the method isCompleterExistFor() to hasCompleterFor()	2015-06-02 00:26:31 +03:00
Marc Zinnschlag	b866e11873	Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'	2015-06-01 16:49:28 +02:00
Stanislav Bas	dbe61115b2	Fix the mistyping header guard in the idcompletiondelegate.hpp	2015-05-31 18:22:43 +03:00
Stanislav Bas	e636101725	Add missing new lines at the ends of files	2015-05-31 18:18:49 +03:00
Stanislav Bas	9e405b69fa	Create the custom completer popup to avoid the problem with the wrong height of the default popup	2015-05-31 16:43:28 +03:00
Stanislav Bas	994c6833bc	Add missing columns for the ID completion	2015-05-30 23:54:16 +03:00
Stanislav Bas	e943d17b29	Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes	2015-05-30 22:01:21 +03:00
Stanislav Bas	602f33bd91	Add ColumnId role to the IdTree data methods	2015-05-30 21:30:25 +03:00
Stanislav Bas	5e8718d8b2	Add the ID completion delegate factory to the delegate factory collection	2015-05-30 18:37:13 +03:00
Stanislav Bas	33e36ee922	Add the ID completion delegate	2015-05-30 15:51:33 +03:00
Stanislav Bas	19cc6b83e5	Integrate the Id completion manager into the Document class	2015-05-30 15:40:23 +03:00