[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1572
Date       : Thu Jul 27 16:41:09 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/wxOil/imgmgkft.cpp
   M /Trunk/XaraLX/wxOil/imgmgkft.h

Fix dialog title on imagemagick export


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1571)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1572)
@@ -737,10 +737,7 @@
 		// Set up the title of the dialog box according to the passed in string which
 		// is the name of the filter plus export bitmap options.
 		String_256 Temp = ""; //*(m_pExportOptions->GetFilterName());
-		if( m_pBmpFilter->GetFilterType() != IMAGEMAGICK )
-			Temp.Load(m_pExportOptions->GetFilterNameStrID()); // which is safer than the ptr into whatever
-		else
-			Temp.Load( _R(IDS_IMAGEMAGICK_FILTERNAME) ); 
+		Temp.Load(m_pExportOptions->GetFilterNameStrID()); // which is safer than the ptr into whatever
 		Temp += String_256(_R(IDN_EXPORTBMPOPTS));
 
 		DialogManager::SetTitlebarName(WindowID, &Temp); // set the title bar for the window
Index: Trunk/XaraLX/wxOil/imgmgkft.cpp
===================================================================
--- Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1571)
+++ Trunk/XaraLX/wxOil/imgmgkft.cpp	(revision 1572)
@@ -166,10 +166,11 @@
 				options
 
 ********************************************************************************************/
-ImageMagickExportOptions::ImageMagickExportOptions(const FilterType FilterID, const StringBase* pFilterName) :
+ImageMagickExportOptions::ImageMagickExportOptions(const FilterType FilterID, const StringBase* pFilterName, ResourceID FilterTypeID) :
 						MaskedFilterExportOptions(_R(IDD_EXPORTBMPOPTS), FilterID, pFilterName)
 {
 	FilterName = *pFilterName;
+	m_FilterTypeID = FilterTypeID;
 
 	// if we don't already have the static hash, generate one
 	// We never delete this (harmless)
@@ -1236,7 +1237,7 @@
 ********************************************************************************************/
 BitmapExportOptions* ImageMagickFilter::CreateExportOptions() const
 {
-	ImageMagickExportOptions* pImageMagickOptions = new ImageMagickExportOptions(IMAGEMAGICK, &FilterName);
+	ImageMagickExportOptions* pImageMagickOptions = new ImageMagickExportOptions(IMAGEMAGICK, &FilterName, FilterNameID);
 	return (BitmapExportOptions*)pImageMagickOptions;
 }
 
Index: Trunk/XaraLX/wxOil/imgmgkft.h
===================================================================
--- Trunk/XaraLX/wxOil/imgmgkft.h	(revision 1571)
+++ Trunk/XaraLX/wxOil/imgmgkft.h	(revision 1572)
@@ -140,7 +140,7 @@
 CC_DECLARE_DYNCREATE(ImageMagickExportOptions)
 
 public:
-	ImageMagickExportOptions(const FilterType FilterID, const StringBase* pFilterName);
+	ImageMagickExportOptions(const FilterType FilterID, const StringBase* pFilterName, ResourceID FilterTypeID);
 	ImageMagickExportOptions() {};
 
 	virtual BOOL	GetSupportsImageMap() { return TRUE; }
@@ -148,7 +148,7 @@
 	virtual BOOL	RetrieveDefaults();
 	virtual BOOL	SetAsDefaults() const;
 	
-	virtual UINT32 GetFilterNameStrID() { return _R(IDS_FILTERNAME_ImageMagick);}
+	virtual UINT32 GetFilterNameStrID() { return m_FilterTypeID;}
 
 	virtual UINT32 * GetConfigPtr(const TCHAR * FilterName) const
 	{
@@ -173,6 +173,7 @@
 
 protected:
 	String_256 FilterName;
+	ResourceID m_FilterTypeID;
 
 	static	IMFilterStringToUINT32 * s_pHash;
 };


Xara