r15614 by jghali - some bug fixes for group palette

[scribus-commit]

Author: jghali
Date: Thu Oct 21 22:27:10 2010
New Revision: 15614

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15614
Log:
some bug fixes for group palette

Modified:
    branches/ScribusOIF/scribus/ui/propertiespalette.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette.h
    branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_group.h

Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15614&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Thu Oct 21 22:27:10 2010
@@ -829,7 +829,7 @@
 		setDoc(i->doc());
 
 	disconnect(TabStack, SIGNAL(currentChanged(int)) , this, SLOT(SelTab(int)));
-	disconnect(linePal , SIGNAL(lineModeChanges(int)), this, SLOT(NewLineMode(int)));
+	disconnect(linePal , SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
 
 	HaveItem = false;
 	CurItem = i;
@@ -893,7 +893,7 @@
 	Revert->setChecked(CurItem->reversed());
 	setTextFlowMode(CurItem->textFlowMode());
 
-	connect(linePal , SIGNAL(lineModeChanges(int)), this, SLOT(NewLineMode(int)));
+	connect(linePal , SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
 
 //CB replaces old emits from PageItem::emitAllToGUI()
 	disconnect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
@@ -2382,59 +2382,6 @@
 	shapePal->setLocked(isLocked);
 }
 
-void PropertiesPalette::setGroupTransparency(double trans)
-{
-	if ((HaveDoc) && (HaveItem))
-	{
-		CurItem->setFillTransparency(trans);
-		CurItem->update();
-		emit DocChanged();
-	}
-}
-
-void PropertiesPalette::setGroupBlending(int blend)
-{
-	if ((HaveDoc) && (HaveItem))
-	{
-		CurItem->setFillBlendmode(blend);
-		CurItem->update();
-		emit DocChanged();
-	}
-}
-
-void PropertiesPalette::setGroupGradMask(int typ)
-{
-	if ((HaveDoc) && (HaveItem))
-	{
-		CurItem->GrMask = typ;
-		if ((typ > 0) && (typ < 7))
-			CurItem->updateGradientVectors();
-		CurItem->update();
-		emit DocChanged();
-	}
-}
-
-void PropertiesPalette::setGroupPatternMask(QString pattern)
-{
-	if ((HaveDoc) && (HaveItem))
-	{
-		CurItem->setPatternMask(pattern);
-		CurItem->update();
-		emit DocChanged();
-	}
-}
-
-void PropertiesPalette::setGroupPatternMaskProps(double imageScaleX, double imageScaleY, double offsetX, double offsetY, double rotation, double skewX, double skewY, bool mirrorX, bool mirrorY)
-{
-	if ((HaveDoc) && (HaveItem))
-	{
-		CurItem->setMaskTransform(imageScaleX, imageScaleY, offsetX, offsetY, rotation, skewX, skewY);
-		CurItem->setMaskFlip(mirrorX, mirrorY);
-		CurItem->update();
-		emit DocChanged();
-	}
-}
-
 void PropertiesPalette::handleShapeEdit2()
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())

Modified: branches/ScribusOIF/scribus/ui/propertiespalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15614&path=/branches/ScribusOIF/scribus/ui/propertiespalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.h Thu Oct 21 22:27:10 2010
@@ -195,11 +195,6 @@
 	void handlePathOffs();
 	void handleOverprint(int);
 	void NewLanguage();
-	void setGroupTransparency(double trans);
-	void setGroupBlending(int blend);
-	void setGroupGradMask(int typ);
-	void setGroupPatternMask(QString pattern);
-	void setGroupPatternMaskProps(double imageScaleX, double imageScaleY, double offsetX, double offsetY, double rotation, double skewX, double skewY, bool mirrorX, bool mirrorY);
 	void flop(int);
 
 protected slots:

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15614&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp Thu Oct 21 22:27:10 2010
@@ -221,11 +221,11 @@
 	m_haveDoc  = true;
 	m_haveItem = false;
 
-	connect(this->TpalGroup, SIGNAL(NewTrans(double)), this, SLOT(setGroupTransparency(double)));
-	connect(this->TpalGroup, SIGNAL(NewBlend(int)), this, SLOT(setGroupBlending(int)));
-	connect(this->TpalGroup, SIGNAL(NewGradient(int)), this, SLOT(setGroupGradMask(int)));
-	connect(this->TpalGroup, SIGNAL(NewPattern(QString)), this, SLOT(setGroupPatternMask(QString)));
-	connect(this->TpalGroup, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), this, SLOT(setGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool)));
+	connect(this->TpalGroup, SIGNAL(NewTrans(double))   , this, SLOT(handleGroupTransparency(double)));
+	connect(this->TpalGroup, SIGNAL(NewBlend(int))      , this, SLOT(handleGroupBlending(int)));
+	connect(this->TpalGroup, SIGNAL(NewGradient(int))   , this, SLOT(handleGroupGradMask(int)));
+	connect(this->TpalGroup, SIGNAL(NewPattern(QString)), this, SLOT(handleGroupPatternMask(QString)));
+	connect(this->TpalGroup, SIGNAL(NewPatternProps(double, double, double, double, double, double, double, bool, bool)), this, SLOT(handleGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool)));
 
 	connect(m_doc->m_Selection, SIGNAL(selectionChanged()), this, SLOT(handleSelectionChanged()));
 	connect(m_doc             , SIGNAL(docChanged())      , this, SLOT(handleSelectionChanged()));
@@ -471,6 +471,59 @@
 	}
 }
 
+void PropertiesPalette_Group::handleGroupTransparency(double trans)
+{
+	if ((m_haveDoc) && (m_haveItem))
+	{
+		m_item->setFillTransparency(trans);
+		m_item->update();
+		emit DocChanged();
+	}
+}
+
+void PropertiesPalette_Group::handleGroupBlending(int blend)
+{
+	if ((m_haveDoc) && (m_haveItem))
+	{
+		m_item->setFillBlendmode(blend);
+		m_item->update();
+		emit DocChanged();
+	}
+}
+
+void PropertiesPalette_Group::handleGroupGradMask(int typ)
+{
+	if ((m_haveDoc) && (m_haveItem))
+	{
+		m_item->GrMask = typ;
+		if ((typ > 0) && (typ < 7))
+			m_item->updateGradientVectors();
+		m_item->update();
+		emit DocChanged();
+	}
+}
+
+void PropertiesPalette_Group::handleGroupPatternMask(QString pattern)
+{
+	if ((m_haveDoc) && (m_haveItem))
+	{
+		m_item->setPatternMask(pattern);
+		m_item->update();
+		emit DocChanged();
+	}
+}
+
+void PropertiesPalette_Group::handleGroupPatternMaskProps(double imageScaleX, double imageScaleY, double offsetX, double offsetY, double rotation, double skewX, double skewY, bool mirrorX, bool mirrorY)
+{
+	if ((m_haveDoc) && (m_haveItem))
+	{
+		m_item->setMaskTransform(imageScaleX, imageScaleY, offsetX, offsetY, rotation, skewX, skewY);
+		m_item->setMaskFlip(mirrorX, mirrorY);
+		m_item->update();
+		emit DocChanged();
+	}
+}
+
 void PropertiesPalette_Group::handleNewShape(int frameType, int count, qreal *points)
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15614&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_group.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_group.h Thu Oct 21 22:27:10 2010
@@ -103,6 +103,12 @@
 
 private slots:
 
+	void handleGroupTransparency(double trans);
+	void handleGroupBlending(int blend);
+	void handleGroupGradMask(int typ);
+	void handleGroupPatternMask(QString pattern);
+	void handleGroupPatternMaskProps(double, double, double, double, double, double, double, bool, bool);
+
 	void handleTextFlow();
 	void handleNewShape(int f, int c, qreal *vals);
 	void handleShapeEdit2();