[Igarden-commit] Garden/source/Preferences PersistentTags.h, 1.11.2.1, 1.11.2.2 PersistentTags.cpp, 1.12.2.1, 1.12.2.2 GlobalTags.cpp, 1.9.2.1, 1.9.2.2 DocumentFormatPrefsPanel.cpp, 1.1.2.1, 1.1.2.2

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Preferences
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25815

Modified Files:
      Tag: Release_branch_v1
	PersistentTags.h PersistentTags.cpp GlobalTags.cpp 
	DocumentFormatPrefsPanel.cpp 
Log Message:
Save and restore aerial view pictures (with preference)

Index: GlobalTags.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Preferences/GlobalTags.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** GlobalTags.cpp	3 Dec 2006 02:08:49 -0000	1.9.2.1
--- GlobalTags.cpp	7 Dec 2006 01:22:52 -0000	1.9.2.2
***************
*** 62,65 ****
--- 62,67 ----
  	oldValue = _newPrefs->GetBoolean(vc->FieldName(kUseCompoundFileFormat), true);
  	_newPrefs->SetBoolean(vc->FieldName(kUseCompoundFileFormat), oldValue);
+ 	oldValue = _newPrefs->GetBoolean(vc->FieldName(kIncludeAerialInFile), true);
+ 	_newPrefs->SetBoolean(vc->FieldName(kIncludeAerialInFile), oldValue);
  
  	

Index: PersistentTags.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Preferences/PersistentTags.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** PersistentTags.h	3 Dec 2006 02:08:14 -0000	1.11.2.1
--- PersistentTags.h	7 Dec 2006 01:22:52 -0000	1.11.2.2
***************
*** 57,61 ****
  	kUseInternetPref,
  	kUseInternetAskedPref,
! 	kUseCompoundFileFormat
  } stateTags_t;
  
--- 57,62 ----
  	kUseInternetPref,
  	kUseInternetAskedPref,
! 	kUseCompoundFileFormat,
! 	kIncludeAerialInFile
  } stateTags_t;
  

Index: PersistentTags.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Preferences/PersistentTags.cpp,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** PersistentTags.cpp	3 Dec 2006 02:08:14 -0000	1.12.2.1
--- PersistentTags.cpp	7 Dec 2006 01:22:52 -0000	1.12.2.2
***************
*** 113,116 ****
--- 113,117 ----
  	vc3->AddProperty(kUseInternetAskedPref, "UseInternetAsked", kBoolField);
  	vc3->AddProperty(kUseCompoundFileFormat, "CompoundFileFormat", kBoolField);
+ 	vc3->AddProperty(kIncludeAerialInFile, "IncludeAerialInFile", kBoolField);
  
  	vc3->AddProperty(kSpringFrostSiteData, "springFrost", kDateField);

Index: DocumentFormatPrefsPanel.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Preferences/Attic/DocumentFormatPrefsPanel.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** DocumentFormatPrefsPanel.cpp	3 Dec 2006 01:58:44 -0000	1.1.2.1
--- DocumentFormatPrefsPanel.cpp	7 Dec 2006 01:22:52 -0000	1.1.2.2
***************
*** 19,22 ****
--- 19,23 ----
  #include "DocumentFormatPrefsPanel.h"
  #include <XGRadioButton.h>
+ #include <XGCheckButton.h>
  #include "Preferences.h"
  #include "RGPanelSet.h"
***************
*** 26,29 ****
--- 27,31 ----
  const short		item_CompoundDoc			= 1;
  const short		item_XMLDoc					= 2;
+ const short		item_IncludeBackground		= 3;
  
  // ---------------------------------------------------------------------------
***************
*** 80,83 ****
--- 82,86 ----
  #pragma unused(win)
  	XGRadioButton	*compound, *xml;
+ 	XGCheckButton	*aerial;
  	PanelSet		*set;
  	XGView			*current;
***************
*** 93,98 ****
--- 96,103 ----
  			compound = dynamic_cast<XGRadioButton*>(current->FindViewByID(item_CompoundDoc));
  			xml = dynamic_cast<XGRadioButton*>(current->FindViewByID(item_XMLDoc));
+ 			aerial = dynamic_cast<XGCheckButton*>(current->FindViewByID(item_IncludeBackground));
  			AssertValidView(compound);
  			AssertValidView(xml);
+ 			AssertValidView(aerial);
  			
  			if(arg == item_CompoundDoc)
***************
*** 100,103 ****
--- 105,109 ----
  				compound->SetValue(1);
  				xml->SetValue(0);
+ 				aerial->EnableView();
  			}
  			else
***************
*** 105,112 ****
--- 111,127 ----
  				xml->SetValue(1);
  				compound->SetValue(0);
+ 				aerial->DisableView();
  			}
  			_prefs->SetBoolPref(kUseCompoundFileFormat, compound->GetValue());
  			return 0;
  			break;
+ 			
+ 		case item_IncludeBackground:
+ 			aerial = dynamic_cast<XGCheckButton*>(current->FindViewByID(item_IncludeBackground));
+ 			AssertValidView(aerial);
+ 			aerial->SetValue(!aerial->GetValue());
+ 			_prefs->SetBoolPref(kIncludeAerialInFile, aerial->GetValue());
+ 			return 0;
+ 			break;
  	}
  	
***************
*** 122,134 ****
--- 137,153 ----
  #pragma unused(dialog)
  	XGRadioButton	*compound, *xml;
+ 	XGCheckButton	*aerial;
  	
  	compound = dynamic_cast<XGRadioButton*>(panelView->FindViewByID(item_CompoundDoc));
  	xml = dynamic_cast<XGRadioButton*>(panelView->FindViewByID(item_XMLDoc));
+ 	aerial = dynamic_cast<XGCheckButton*>(panelView->FindViewByID(item_IncludeBackground));
  	AssertValidView(compound);
  	AssertValidView(xml);
+ 	AssertValidView(aerial);
  	if(_prefs->GetBoolPref(kUseCompoundFileFormat))
  	{
  		compound->SetValue(1);
  		xml->SetValue(0);
+ 		aerial->EnableView();
  	}
  	else
***************
*** 136,140 ****
--- 155,162 ----
  		compound->SetValue(0);
  		xml->SetValue(1);
+ 		aerial->DisableView();
  	}
+ 	
+ 	aerial->SetValue(_prefs->GetBoolPref(kIncludeAerialInFile));
  }