[Igarden-commit] Garden/source/Document MaterialPictSelectDialog.cpp, 1.19.2.10, 1.19.2.11 MaterialPictSelectDialog.h, 1.10.2.3, 1.10.2.4

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialPictSelectDialog.cpp MaterialPictSelectDialog.h 
Log Message:
Lock picture metadata fields for pictures loaded by the application (ex: from a web site)

Index: MaterialPictSelectDialog.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.h,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -d -r1.10.2.3 -r1.10.2.4
*** MaterialPictSelectDialog.h	12 Apr 2008 19:04:59 -0000	1.10.2.3
--- MaterialPictSelectDialog.h	12 Apr 2008 21:25:07 -0000	1.10.2.4
***************
*** 48,52 ****
  	virtual void		GetDefaultPictureProperties(String &title, String &copyright, String &creator, long &locationChoice);
  	virtual long		CreateLocationChoice();
! 	
  	virtual void		OKClicked(XGDialog *dlog);
  	
--- 48,53 ----
  	virtual void		GetDefaultPictureProperties(String &title, String &copyright, String &creator, long &locationChoice);
  	virtual long		CreateLocationChoice();
! 	virtual bool		IsMetadataLocked();
! 
  	virtual void		OKClicked(XGDialog *dlog);
  	

Index: MaterialPictSelectDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
diff -C2 -d -r1.19.2.10 -r1.19.2.11
*** MaterialPictSelectDialog.cpp	12 Apr 2008 19:04:59 -0000	1.19.2.10
--- MaterialPictSelectDialog.cpp	12 Apr 2008 21:25:06 -0000	1.19.2.11
***************
*** 359,362 ****
--- 359,364 ----
  			_defaultPictEntry = newEntry;			
  			ChangeDefaultPicture(_defaultPicture);
+ 			SaveCurrentPictureProperties();
+ 			UpdateTitle();
  			RebuildBottomPane();
  		}
***************
*** 405,408 ****
--- 407,418 ----
  }
  
+ //*******************************************
+ ///	IsMetadataLocked
+ //
+ bool MaterialPictureSelectDialog::IsMetadataLocked()
+ {
+ 	const char *url = _defaultPictEntry.GetExternalURL();
+ 	return(url != NULL && (strlen(url) != 0));
+ }