[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1380
Date       : Wed Jun 28 12:15:11 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/xpfrgn.cpp
   M /Trunk/XaraLX/Kernel/xpfrgn.h
   M /Trunk/XaraLX/wxOil/helptabs.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/helppath-strings.xrc
   M /Trunk/XaraLX/wxOil/xrc/EN/xpfres-strings.xrc

Added transparency mixture warning when rasterising layers for plugin filter export


Diff:
Index: Trunk/XaraLX/Kernel/xpfrgn.h
===================================================================
--- Trunk/XaraLX/Kernel/xpfrgn.h	(revision 1379)
+++ Trunk/XaraLX/Kernel/xpfrgn.h	(revision 1380)
@@ -190,10 +190,12 @@
 	BOOL IsCommonType() { return(m_bCommonType); }
 	void UpdateCommonType(UINT32 Type);
 	UINT32 GetCommonType();
+	BOOL UsesNonAlpha() { return(m_bUsesNonAlpha); }
 
 protected:
 	BOOL m_bCommonType;
 	UINT32 m_CommonType;
+	BOOL m_bUsesNonAlpha;
 };
 
 
Index: Trunk/XaraLX/Kernel/xpfrgn.cpp
===================================================================
--- Trunk/XaraLX/Kernel/xpfrgn.cpp	(revision 1379)
+++ Trunk/XaraLX/Kernel/xpfrgn.cpp	(revision 1380)
@@ -2213,6 +2213,21 @@
 				return(TRUE);
 			}
 		}
+		else
+		{
+			if (TransInfo.UsesNonAlpha())
+			{
+				if (pFirstNode == pLastNode && IS_A(pFirstNode, Layer))
+				{
+					Layer* pLayer = (Layer*)pFirstNode;
+					String_256 LayerName = pLayer->GetLayerID();
+					String_256 WarningMsg;
+					WarningMsg.MakeMsg(_R(IDS_XPF_MIXEDTRANSLAYER), &LayerName);
+					Error::SetError(_R(IDS_XPF_MIXEDTRANSLAYER),WarningMsg,0);
+					InformWarning();		
+				}
+			}
+		}
 	}
 	else
 	{
Index: Trunk/XaraLX/wxOil/helptabs.cpp
===================================================================
--- Trunk/XaraLX/wxOil/helptabs.cpp	(revision 1379)
+++ Trunk/XaraLX/wxOil/helptabs.cpp	(revision 1380)
@@ -1381,6 +1381,10 @@
 			_R(IDM_OVERWRITE_INJECT),
 			0,
 
+	_R(IDS_HELPPATH_Plugin_Filters),
+			_R(IDS_XPF_MIXEDTRANSLAYER),
+			0,
+
 	// End of table.
 	0
 };
Index: Trunk/XaraLX/wxOil/xrc/EN/xpfres-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xpfres-strings.xrc	(revision 1379)
+++ Trunk/XaraLX/wxOil/xrc/EN/xpfres-strings.xrc	(revision 1380)
@@ -173,6 +173,12 @@
 					<label>Plugin filter reported an error but didn't provide a message</label>
 				</object>
 			</object>
+			<object class="sizeritem">
+				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
+				<object class="wxStaticText" name="IDS_XPF_MIXEDTRANSLAYER">
+					<label>Layer '#1%S' contains a mixture of transparency types that may not be represented correctly using the current settings of the filter.  Please see the help page for details of how to avoid this situation.</label>
+				</object>
+			</object>
 		</object>
 	</object>
 </resource>
Index: Trunk/XaraLX/wxOil/xrc/EN/helppath-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/helppath-strings.xrc	(revision 1379)
+++ Trunk/XaraLX/wxOil/xrc/EN/helppath-strings.xrc	(revision 1380)
@@ -2076,6 +2076,12 @@
 			</object>
 			<object class="sizeritem">
 				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
+				<object class="wxStaticText" name="IDS_HELPPATH_Plugin_Filters">
+					<label>IDH_Plugin_Filters</label>
+				</object>
+			</object>
+			<object class="sizeritem">
+				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
 				<object class="wxStaticText" name="Tips">
 					<label></label>
 				</object>


Xara