Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								21b16f8425 
								
							 
						 
						
							
							
								
								Merge branch 'tables'  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp 
							
						 
						
							2014-10-10 16:11:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ff530a2e19 
								
							 
						 
						
							
							
								
								added missing magic effect table columns  
							
							
							
						 
						
							2014-09-30 12:33:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								33cd04b37d 
								
							 
						 
						
							
							
								
								added missing sound gen table columns  
							
							
							
						 
						
							2014-09-25 11:40:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								66852d5392 
								
							 
						 
						
							
							
								
								Code cleanup and revert incorrect settings.  
							
							
							
						 
						
							2014-09-24 22:41:49 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								ffae816aab 
								
							 
						 
						
							
							
								
								Max subviews setting working.  However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.  
							
							
							
						 
						
							2014-09-23 17:01:08 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								d9b0c81299 
								
							 
						 
						
							
							
								
								Show status bar setting working (feature  #854 ). Turns out signals were not needed, may need to clean up later.  
							
							
							
						 
						
							2014-09-18 16:05:32 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								227eb12295 
								
							 
						 
						
							
							
								
								Added document name to showModifiedDocumentMessageBox.  
							
							
							
						 
						
							2014-09-10 20:29:47 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								89f7608022 
								
							 
						 
						
							
							
								
								Refactor for better legibility.  
							
							
							
						 
						
							2014-09-10 14:40:41 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								77171b788b 
								
							 
						 
						
							
							
								
								Made popup messagebox non-modal.  
							
							
							
						 
						
							2014-09-10 14:03:25 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								fdc20c595d 
								
							 
						 
						
							
							
								
								Fix gcc compile error.  
							
							
							
						 
						
							2014-09-09 21:24:54 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								4471fe771e 
								
							 
						 
						
							
							
								
								Fix logic errors.  
							
							
							
						 
						
							2014-09-09 21:09:37 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								84f5784575 
								
							 
						 
						
							
							
								
								Remove document when closing the last view.  Should resolve Bug  #1292 .  
							
							
							
						 
						
							2014-09-09 13:04:48 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								ad8d722763 
								
							 
						 
						
							
							
								
								Close documents rather than views.  
							
							
							
						 
						
							2014-09-09 10:05:06 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								cedf1171e3 
								
							 
						 
						
							
							
								
								Cleanup comments.  
							
							
							
						 
						
							2014-09-07 18:37:33 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								dba352fd6f 
								
							 
						 
						
							
							
								
								Check all views before exiting.  
							
							
							
						 
						
							2014-09-07 18:35:50 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								37a2b48fa2 
								
							 
						 
						
							
							
								
								added missing type columns to body part table  
							
							
							
						 
						
							2014-07-01 14:28:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ab8bee4d1a 
								
							 
						 
						
							
							
								
								added enchantment type column to enchantment table  
							
							
							
						 
						
							2014-07-01 09:42:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bd252d0aec 
								
							 
						 
						
							
							
								
								display record count in loading window  
							
							
							
						 
						
							2014-06-26 11:41:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								95d24492de 
								
							 
						 
						
							
							
								
								display load error messages in loading window  
							
							
							
						 
						
							2014-05-10 13:18:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								492620c8cf 
								
							 
						 
						
							
							
								
								handle exceptions thrown during loading and report them to the user  
							
							
							
						 
						
							2014-05-06 09:39:39 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								0b309d9ef4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into load  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/view/doc/viewmanager.cpp 
							
						 
						
							2014-05-03 14:36:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e0e2ad8316 
								
							 
						 
						
							
							
								
								content file loading progress bar  
							
							
							
						 
						
							2014-05-03 13:01:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8dc6ad5059 
								
							 
						 
						
							
							
								
								moved new flag from setupData function to Document constructor  
							
							
							
						 
						
							2014-04-29 14:27:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5f1d2f72f6 
								
							 
						 
						
							
							
								
								added basic loading GUI  
							
							
							
						 
						
							2014-04-29 14:17:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								4b607d658f 
								
							 
						 
						
							
							
								
								Re-link user settings to editor main application  
							
							
							
						 
						
							2014-04-22 22:19:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9d7695ea88 
								
							 
						 
						
							
							
								
								added missing columns to topic info table  
							
							
							
						 
						
							2013-11-05 11:41:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								767cb54e7c 
								
							 
						 
						
							
							
								
								added missing columns to journal info table  
							
							
							
						 
						
							2013-10-31 12:54:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								75c5316ad7 
								
							 
						 
						
							
							
								
								added dialogue type column to topics table  
							
							
							
						 
						
							2013-10-20 17:26:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1c4a4b4f26 
								
							 
						 
						
							
							
								
								generalised RefIdTypeDelegate into IdTypeDelegate  
							
							
							
						 
						
							2013-09-22 13:39:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ecedb60169 
								
							 
						 
						
							
							
								
								splitting new game and new addon functions (new game currently not working)  
							
							
							
						 
						
							2013-09-08 12:06:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								cae5eb424d 
								
							 
						 
						
							
							
								
								cleaned up opening the settings dialogue from a view  
							
							
							
						 
						
							2013-09-08 09:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								649ef6f120 
								
							 
						 
						
							
							
								
								moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)  
							
							
							
						 
						
							2013-09-02 11:58:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								bb049806df 
								
							 
						 
						
							
							
								
								Repo permissions commit  fix   #2  
							
							
							
						 
						
							2013-07-10 21:13:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								9d95a38934 
								
							 
						 
						
							
							
								
								Implementing delegate for referenceables table Type column  
							
							... 
							
							
							
							Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class 
							
						 
						
							2013-06-29 08:54:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a73b97d125 
								
							 
						 
						
							
							
								
								Fixed broken references and other bugs  
							
							... 
							
							
							
							Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data 
							
						 
						
							2013-06-21 23:23:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								101c147217 
								
							 
						 
						
							
							
								
								Final changes for record status icon feature, incl. window size user  
							
							... 
							
							
							
							preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements 
							
						 
						
							2013-06-20 18:06:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								700d55f1fb 
								
							 
						 
						
							
							
								
								Fixed / implemented missing features for RecordStatusDelegate  
							
							... 
							
							
							
							Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table 
							
						 
						
							2013-06-15 06:40:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								35fb9b669a 
								
							 
						 
						
							
							
								
								Final details implemented  
							
							... 
							
							
							
							Png icons, alignments fixed. 
							
						 
						
							2013-05-29 06:38:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c626e2b257 
								
							 
						 
						
							
							
								
								Merge branch 'ref'  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/view/doc/view.hpp 
							
						 
						
							2013-05-19 14:59:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ca33d66ed9 
								
							 
						 
						
							
							
								
								added missing columns for weapon records  
							
							
							
						 
						
							2013-05-19 14:44:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								54f56b0515 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'graffy76/usersettings'  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp 
							
						 
						
							2013-05-16 18:04:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								13242c2bd5 
								
							 
						 
						
							
							
								
								Eliminated code centering the initial view in the middle of the screen  
							
							
							
						 
						
							2013-05-16 10:14:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								889a87982e 
								
							 
						 
						
							
							
								
								added missing columns for creatures  
							
							
							
						 
						
							2013-05-16 16:27:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								28f2a7d2b4 
								
							 
						 
						
							
							
								
								added missing column for clothing records  
							
							
							
						 
						
							2013-05-15 11:37:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								fce9939f83 
								
							 
						 
						
							
							
								
								added missing columns for armor record  
							
							
							
						 
						
							2013-05-14 14:33:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								929b38ff6a 
								
							 
						 
						
							
							
								
								added missing columns for apparati records  
							
							
							
						 
						
							2013-05-13 12:51:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f6203cac2a 
								
							 
						 
						
							
							
								
								update for master  
							
							
							
						 
						
							2013-05-07 20:33:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ae0a7d5bcd 
								
							 
						 
						
							
							
								
								added cost and type columns to spell table  
							
							
							
						 
						
							2013-04-09 11:53:47 +02:00