[Igarden-commit] Garden/source/SiteData SiteDataDialog.h, 1.3, 1.3.2.1 SiteDataDialog.cpp, 1.14, 1.14.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	SiteDataDialog.h SiteDataDialog.cpp 
Log Message:
Fully implement planting regions for choosing the quick pick list 

Index: SiteDataDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SiteData/SiteDataDialog.cpp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** SiteDataDialog.cpp	11 Feb 2006 16:47:55 -0000	1.14
--- SiteDataDialog.cpp	13 Dec 2006 12:14:45 -0000	1.14.2.1
***************
*** 19,22 ****
--- 19,23 ----
  #include	"SiteDataDialog.h"
  #include	<GlobalTags.h>
+ #include <XCoreUtils.h>
  #include "CGardenForm.h"
  #include "DateSelectDialog.h"
***************
*** 43,46 ****
--- 44,48 ----
  
  const int kSiteDialog = 137;
+ const int kRegionStrings = 3053;
  
  const int kSiteOK = 1;
***************
*** 54,60 ****
--- 56,64 ----
  const int kSiteZoneLookup = 9;
  const int kSiteZoneFoundText = 10;
+ const int kSiteRegionMenu = 12;
  const int kSiteZoneStaticText1 = 21;
  const int kSiteZoneStaticText2 = 22;
  
+ using namespace yaaf;
  
  // ---------------------------------------------------------------------------
***************
*** 72,80 ****
  	RGDateTime			outDate;
  	XGStaticText		*springText, *fallText;
! 	XGPopControl		*zonePop;
  	XGStaticText		*foundText;
  	String				bufObj;
  	long				n, count;
  	String				value;
  	
  	switch (msg) {
--- 76,85 ----
  	RGDateTime			outDate;
  	XGStaticText		*springText, *fallText;
! 	XGPopControl		*zonePop, *regionPop;
  	XGStaticText		*foundText;
  	String				bufObj;
  	long				n, count;
  	String				value;
+ 	char				shortMsg[256], longMsg[256];
  	
  	switch (msg) {
***************
*** 151,154 ****
--- 156,172 ----
  							view->HideView();
  					}
+ 						
+ 					regionPop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSiteRegionMenu));
+ 					for(n = 0; ; n++)
+ 					{
+ 						if(GetResourceMessage(kRegionStrings, n, shortMsg, longMsg))
+ 						{
+ 							regionPop->Insert(n, longMsg);
+ 							if(strcmp(shortMsg, result->_regionKey.c_str()) == 0)
+ 								regionPop->SetValue(n);
+ 						}
+ 						else
+ 							break;
+ 					}
  					return 0;
  				default:
***************
*** 165,168 ****
--- 183,192 ----
  					result->_zone = zonePop->GetValue() << 1L;
  					break;
+ 				case kSiteRegionMenu:
+ 					zonePop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSiteRegionMenu));
+ 					AssertValidView(zonePop);
+ 					GetResourceMessage(kRegionStrings, zonePop->GetValue(), shortMsg, longMsg);
+ 					result->_regionKey.SetCString(shortMsg);
+ 					break;
  			}
  			break;
***************
*** 299,302 ****
--- 323,327 ----
  		dialog._hasSpringFrost = prefs->GetDatePref(kSpringFrostSiteData, dialog._springFrost);
  		dialog._hasFallFrost = prefs->GetDatePref(kFallFrostSiteData, dialog._fallFrost);
+ 		prefs->GetStrPref(kRegionSiteData, dialog._regionKey);
  			
  		ok = XGDialog::ModalDialog(kSiteDialog, SiteDialogProc, &dialog);
***************
*** 308,311 ****
--- 333,337 ----
  			if(dialog._hasFallFrost)
  				prefs->SetDatePref(kFallFrostSiteData, dialog._fallFrost);
+ 			prefs->SetStrPref(kRegionSiteData, dialog._regionKey.c_str());
  		}
  	}

Index: SiteDataDialog.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SiteData/SiteDataDialog.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** SiteDataDialog.h	5 Jan 2005 11:35:14 -0000	1.3
--- SiteDataDialog.h	13 Dec 2006 12:14:45 -0000	1.3.2.1
***************
*** 49,52 ****
--- 49,53 ----
  		bool				_hasSpringFrost;
  		bool				_hasFallFrost;
+ 		String				_regionKey;
  		
  };