r16190 by fschmid - First small steps improving "Mesh Gradient" editing.

[scribus-commit]

Author: fschmid
Date: Fri Dec 31 08:56:06 2010
New Revision: 16190

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16190
Log:
First small steps improving "Mesh Gradient" editing.

Modified:
    trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
    trunk/Scribus/scribus/ui/cpalette.cpp

Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16190&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp Fri Dec 31 08:56:06 2010
@@ -424,6 +424,8 @@
 		double newX = mousePointDoc.x();
 		double newY = mousePointDoc.y();
 		PageItem *currItem = m_doc->m_Selection->itemAt(0);
+		FPoint npf = FPoint(mousePointDoc.x(), mousePointDoc.y(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1, true);
+		m_canvas->displayXYHUD(m->globalPos(), npf.x(), npf.y());
 		FPoint npx(Mxp - newX, Myp - newY, 0, 0, currItem->rotation(), 1, 1, true);
 		if (selectedMeshPoints.count() > 0)
 		{
@@ -804,5 +806,4 @@
 	upRect = QRectF(QPointF(0, 0), QPointF(currItem->width(), currItem->height())).normalized();
 	upRect.translate(currItem->xPos(), currItem->yPos());
 	m_doc->regionsChanged()->update(upRect.adjusted(-10.0 - currItem->width() / 2.0, -10.0 - currItem->height() / 2.0, 10.0 + currItem->width() / 2.0, 10.0 + currItem->height() / 2.0));
-
-}
+}

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16190&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Fri Dec 31 08:56:06 2010
@@ -233,7 +233,7 @@
 	else
 		tabWidgetStroke->setCurrentIndex(0);
 	setMeshPoint();
-	editMeshColors->setEnabled(true);
+	editMeshColors->setEnabled(!CGradDia->isVisible());
 	gradEditButton->setEnabled(true);
 	connect(namedGradient, SIGNAL(activated(const QString &)), this, SLOT(setNamedGradient(const QString &)));
 	connect(namedGradientStroke, SIGNAL(activated(const QString &)), this, SLOT(setNamedGradientStroke(const QString &)));