r14320 by fschmid - Stabilizing new features, some fixes for the transparency palette.

[scribus-commit]

Revision: 14320
Author: fschmid
Date: 2009-11-20T23:59:14.707289Z
Commit message: Stabilizing new features, some fixes for the transparency palette.

Changeset: 
M  /trunk/Scribus/scribus/plugins/xarimplugin/importxar.cpp
M  /trunk/Scribus/scribus/ui/transparencypalette.cpp

Diffs:
Index: scribus/ui/transparencypalette.cpp
===================================================================
--- scribus/ui/transparencypalette.cpp	(revision 14319)
+++ scribus/ui/transparencypalette.cpp	(revision 14320)
@@ -239,14 +239,14 @@
 	if (namedGradient->currentIndex() == 0)
 	{
 		gradEdit->setGradient(currentItem->mask_gradient);
-		currentItem->setGradient("");
+		currentItem->setGradientMask("");
 		gradEdit->setGradientEditable(true);
 	}
 	else
 	{
 		gradEdit->setGradient(gradientList->value(name));
 		gradEdit->setGradientEditable(false);
-		currentItem->setGradient(name);
+		currentItem->setGradientMask(name);
 	}
 	if (gradientType->currentIndex() == 0)
 	{
Index: scribus/plugins/xarimplugin/importxar.cpp
===================================================================
--- scribus/plugins/xarimplugin/importxar.cpp	(revision 14319)
+++ scribus/plugins/xarimplugin/importxar.cpp	(revision 14320)
@@ -367,7 +367,7 @@
 	XarColorMap.insert(-5, color);
 	if (!m_Doc->PageColors.contains("Blue"))
 	{
-		m_Doc->PageColors.insert("Blue", ScColor(255, 0, 0));
+		m_Doc->PageColors.insert("Blue", ScColor(0, 0, 255));
 		importedColors.append("Blue");
 	}
 	color.name = "Blue";