[Igarden-commit] Garden/source/Document MaterialPictSelectDialog.cpp, 1.19.2.8, 1.19.2.9 PictureCell.cpp, 1.10.2.13, 1.10.2.14

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialPictSelectDialog.cpp PictureCell.cpp 
Log Message:
If column set is read-only, then open a read-only version of the picture selection dialog
Rcalculate scroll parameters when column set changes

Index: PictureCell.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/PictureCell.cpp,v
retrieving revision 1.10.2.13
retrieving revision 1.10.2.14
diff -C2 -d -r1.10.2.13 -r1.10.2.14
*** PictureCell.cpp	30 Mar 2008 21:59:12 -0000	1.10.2.13
--- PictureCell.cpp	11 Apr 2008 10:39:00 -0000	1.10.2.14
***************
*** 251,267 ****
  CGWorld* PictureCell::GetDefaultPicture(PictureInfo &entry)
  {
! 	if((_mat != NULL) && (_defaultPicture == NULL))
  	{
  		if(_mat->GetDefaultPictureTag(entry))
  		{
! 			long		nativeHeight, nativeWidth;
! 			CGWorld		*gworld;
! 			XGFileSpecifier	spec;
! 			
! 			CalcPathPictureSpec(spec, entry.GetLocalPath(), '/');
! 			gworld = RGCompression::DecompressFile(spec, 0, 0, &nativeHeight, &nativeWidth);
! 			SetDefaultPicture(gworld, entry);
  		}
  	}
  
  	return _defaultPicture;
--- 251,275 ----
  CGWorld* PictureCell::GetDefaultPicture(PictureInfo &entry)
  {
! 	if(_mat != NULL)
  	{
  		if(_mat->GetDefaultPictureTag(entry))
  		{
! 			if(_defaultPicture == NULL)
! 			{
! 				long		nativeHeight, nativeWidth;
! 				CGWorld		*gworld;
! 				XGFileSpecifier	spec;
! 				
! 				CalcPathPictureSpec(spec, entry.GetLocalPath(), '/');
! 				gworld = RGCompression::DecompressFile(spec, 0, 0, &nativeHeight, &nativeWidth);
! 				SetDefaultPicture(gworld, entry);
! 			}
  		}
  	}
+ 	else
+ 	{
+ 		entry.Clear();
+ 		_defaultPicture = NULL;
+ 	}
  
  	return _defaultPicture;

Index: MaterialPictSelectDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
diff -C2 -d -r1.19.2.8 -r1.19.2.9
*** MaterialPictSelectDialog.cpp	19 Mar 2008 01:33:15 -0000	1.19.2.8
--- MaterialPictSelectDialog.cpp	11 Apr 2008 10:39:00 -0000	1.19.2.9
***************
*** 60,63 ****
--- 60,64 ----
  	me = new MaterialPictureSelectDialog(proc, parent);
  	me->_cell = cell;
+ 	me->SetReadOnly(cell->IsReadOnly());
  	me->SetAlternateExitKeys(exitChars);
  	finished = me->Run(kPicturePickerDialog);
***************
*** 236,239 ****
--- 237,242 ----
  	pictureLoadInfo_t	info;
  
+ 	PRECONDITION(!_cell->IsReadOnly());
+ 
  	info.row = _cell->GetRow();
  	info.loadAll = true;
***************
*** 246,249 ****
--- 249,254 ----
  void MaterialPictureSelectDialog::SetDefaultPictureToIndexed(long newSelect)
  {
+ 	PRECONDITION(!_cell->IsReadOnly());
+ 
  	if(newSelect < GetNumPictures())
  	{
***************
*** 273,279 ****
--- 278,286 ----
  	XGFileSpecifier			spec;
  	bool					foundPicture = false;
+ 	bool					handled;
  	XGFileHandle			inHdl, outHdl;
  	
  	PictureSelectDialog::HandlePaste();
+ 
  	uidName.Generate();
  	uidName.ConvertToString(uidStr);