cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								76feca6974 
								
							 
						 
						
							
							
								
								Merge branch 'master' into jump-to-modified  
							
							
							
						 
						
							2015-05-30 09:27:08 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								9ad69d9085 
								
							 
						 
						
							
							
								
								Allow wheel events in dialogue spin box types only when they have focus.  Should resolve Feature  #2585 .  
							
							
							
						 
						
							2015-05-29 05:44:35 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								6821cb4133 
								
							 
						 
						
							
							
								
								Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items.  Should resolve Bug  #2586 .  
							
							... 
							
							
							
							- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model. 
							
						 
						
							2015-05-29 05:40:20 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								baaf801521 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/loadcell-fix'  
							
							
							
						 
						
							2015-05-27 19:31:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								674a124bc6 
								
							 
						 
						
							
							
								
								Don't use local type as a template parameter.  
							
							
							
						 
						
							2015-05-27 22:27:32 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								3a31468af0 
								
							 
						 
						
							
							
								
								Pathgrid record verifier.  Feature  #2000 .  
							
							
							
						 
						
							2015-05-27 22:12:11 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								6966555377 
								
							 
						 
						
							
							
								
								Object verifier check to see if the script used by that object actually exists.  Should resolve Bug  #2582 .  
							
							
							
						 
						
							2015-05-27 15:55:00 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								b7044ac119 
								
							 
						 
						
							
							
								
								Fix crash loading some addon files.  Should resolve Bug  #2583 .  
							
							... 
							
							
							
							- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers. 
							
						 
						
							2015-05-27 10:27:57 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								99dbd82a44 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'  
							
							
							
						 
						
							2015-05-26 14:37:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ae1a606876 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/selective-refresh'  
							
							
							
						 
						
							2015-05-26 14:32:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								f06ddd47c4 
								
							 
						 
						
							
							
								
								Return the correct range for a given topic.  Should resolve Bug  #2569 .  
							
							
							
						 
						
							2015-05-26 17:38:22 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								aafcaf32c5 
								
							 
						 
						
							
							
								
								Qualify the scope of Flag_Dialogue. (another one)  
							
							
							
						 
						
							2015-05-26 16:12:54 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								2f29c2c077 
								
							 
						 
						
							
							
								
								Qualify the scope of Flag_Dialogue.  
							
							
							
						 
						
							2015-05-26 13:58:58 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								ec808843c3 
								
							 
						 
						
							
							
								
								Do not rebuild the dialogue subview unless required. Should resolve Bug  #2581 .  
							
							... 
							
							
							
							The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview.  Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list 
							
						 
						
							2015-05-26 13:35:10 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								95f740ec40 
								
							 
						 
						
							
							
								
								Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children.  Should resolve Bug  #2578 .  
							
							
							
						 
						
							2015-05-25 22:28:41 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5f41ef4809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/master'  
							
							
							
						 
						
							2015-05-25 11:10:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								3c82e6d034 
								
							 
						 
						
							
							
								
								Retrieve the correct index for the type of record being un-deleted.  
							
							
							
						 
						
							2015-05-25 16:36:42 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								e6d2821b78 
								
							 
						 
						
							
							
								
								Refresh table filters when the model is updated.  Should resolve Bug  #2579 .  
							
							
							
						 
						
							2015-05-25 09:15:07 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								6402b82823 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/master'  
							
							
							
						 
						
							2015-05-24 21:15:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								07ce7b95cf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/npc-additional-data'  
							
							
							
						 
						
							2015-05-24 21:15:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								22420c3a83 
								
							 
						 
						
							
							
								
								Close DialogueSubView if the corresponding record is deleted.  Should resolve Bug  #2575 .  
							
							... 
							
							
							
							- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active) 
							
						 
						
							2015-05-24 23:19:06 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								c721e340d8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into npc-additional-data  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp 
							
						 
						
							2015-05-24 19:24:27 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								21af1913e1 
								
							 
						 
						
							
							
								
								Ensure ColumnId names are unique.  
							
							
							
						 
						
							2015-05-24 19:18:54 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								53b4c15d85 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'smbas/master'  
							
							
							
						 
						
							2015-05-23 16:02:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								b58b7a89ed 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'rohit-n/reorder2'  
							
							
							
						 
						
							2015-05-23 09:19:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								a5183aefbe 
								
							 
						 
						
							
							
								
								Add record state tracking to the ModifyCommand ( Fix   #2555 )  
							
							
							
						 
						
							2015-05-22 23:53:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								396fba7fa9 
								
							 
						 
						
							
							
								
								Silence -Wreorder warnings, and remove -Wno-reorder.  
							
							
							
						 
						
							2015-05-21 22:46:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								d27b92e9f1 
								
							 
						 
						
							
							
								
								Avoid gaps between local indexes in RefIdData after removal of records ( Fix   #2545 )  
							
							
							
						 
						
							2015-05-22 00:57:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								aecd9a275e 
								
							 
						 
						
							
							
								
								Remove debugging comments.  
							
							
							
						 
						
							2015-05-22 06:09:55 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								2fc964ca73 
								
							 
						 
						
							
							
								
								Grey out disabled entries rather than hiding them.  
							
							
							
						 
						
							2015-05-21 13:11:07 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								1d0b8587a1 
								
							 
						 
						
							
							
								
								Use HasWater bit flag rather than mWaterInt bool.  
							
							
							
						 
						
							2015-05-20 21:14:17 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								b27a879352 
								
							 
						 
						
							
							
								
								Add the remaining Cell data for editing with dialogue subview. Should resolve Bug  #2551 .  
							
							... 
							
							
							
							- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus 
							
						 
						
							2015-05-19 22:01:40 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								aeec1be8b3 
								
							 
						 
						
							
							
								
								Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable.  
							
							
							
						 
						
							2015-05-19 19:19:52 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								0ecfd9119f 
								
							 
						 
						
							
							
								
								Add the remaining Race data for editing with dialogue subview. Should resolve Bug  #2546 .  
							
							
							
						 
						
							2015-05-19 06:56:38 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5176e3d84b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar'  
							
							
							
						 
						
							2015-05-18 16:46:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								7494340b66 
								
							 
						 
						
							
							
								
								Add the remaining NPC data for editing with dialogue subview. Should resolve Bug  #2547 .  
							
							
							
						 
						
							2015-05-18 22:08:36 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								cfcfb17320 
								
							 
						 
						
							
							
								
								Updates to optional horizontal scrollbar.  
							
							... 
							
							
							
							- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences 
							
						 
						
							2015-05-18 07:12:02 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								7b207a7954 
								
							 
						 
						
							
							
								
								added shortcut for closing subviews ( Fixes   #2558 )  
							
							
							
						 
						
							2015-05-17 14:31:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								93c3bb3716 
								
							 
						 
						
							
							
								
								fixed subview-closing related crash ( Fixes   #2564 )  
							
							
							
						 
						
							2015-05-17 14:27:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								e9ca022162 
								
							 
						 
						
							
							
								
								Add an optional horizontal scrollbar to the main view window.  Should resolve Feature  #2549 .  
							
							... 
							
							
							
							- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further. 
							
						 
						
							2015-05-17 20:45:13 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								60a835c16d 
								
							 
						 
						
							
							
								
								stop script editor from eating undo/redo shortcuts ( Fixes   #2506 )  
							
							
							
						 
						
							2015-05-16 10:18:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								4b57f6c821 
								
							 
						 
						
							
							
								
								Modifying an object instance (e.g. 3D edit) triggers the instances table to scroll to the corresponding record.  Should resolve Feature  #2554 .  
							
							
							
						 
						
							2015-05-16 08:05:12 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								27000fb36b 
								
							 
						 
						
							
							
								
								don't reject single precision float values in value filters ( Fixes   #2533 )  
							
							
							
						 
						
							2015-05-15 14:09:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								28617c8beb 
								
							 
						 
						
							
							
								
								Update table size status for removed rows.  
							
							
							
						 
						
							2015-05-15 12:33:31 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								f92d801faf 
								
							 
						 
						
							
							
								
								Jump to the added/cloned record (or undeleted record in case of undo).  Should resolve Feature  #2541 .  Controlled by radio buttons on user preferences settings.  
							
							
							
						 
						
							2015-05-15 12:32:29 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c9d519f36c 
								
							 
						 
						
							
							
								
								focus search input field when opening search subview ( Fixes   #2534 )  
							
							
							
						 
						
							2015-05-14 14:48:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								538e550b2b 
								
							 
						 
						
							
							
								
								Fix for Bug  #2543 .  Spells magic effect id typo.  
							
							
							
						 
						
							2015-05-13 10:30:44 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								2b84598e85 
								
							 
						 
						
							
							
								
								Remove duplicated but reversed map.  
							
							
							
						 
						
							2015-05-10 20:52:29 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								ab21c0551c 
								
							 
						 
						
							
							
								
								Provide a default encoding when changing to "Function".  
							
							
							
						 
						
							2015-05-10 13:34:45 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								587efcfe9d 
								
							 
						 
						
							
							
								
								Use better initial value type. Fix exception while saving values.  
							
							
							
						 
						
							2015-05-10 07:49:18 +10:00