r16273 by jghali - merge trunk revisions up to r16271

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 18 03:27:21 CET 2011


Author: jghali
Date: Tue Jan 18 02:27:21 2011
New Revision: 16273

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16273
Log:
merge trunk revisions up to r16271

Added:
    branches/ScribusOIF/scribus/ui/arcvectorbase.ui
      - copied unchanged from r16269, trunk/Scribus/scribus/ui/arcvectorbase.ui
    branches/ScribusOIF/scribus/ui/arcvectordialog.cpp
      - copied unchanged from r16269, trunk/Scribus/scribus/ui/arcvectordialog.cpp
    branches/ScribusOIF/scribus/ui/arcvectordialog.h
      - copied unchanged from r16269, trunk/Scribus/scribus/ui/arcvectordialog.h
Modified:
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/canvasmode_editarc.cpp
    branches/ScribusOIF/scribus/canvasmode_editarc.h
    branches/ScribusOIF/scribus/pdflib_core.cpp
    branches/ScribusOIF/scribus/pdflib_core.h
    branches/ScribusOIF/scribus/scpaths.cpp
    branches/ScribusOIF/scribus/ui/colorlistbox.cpp
    branches/ScribusOIF/win32/vc9/Scribus.vcproj

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Tue Jan 18 02:27:21 2011
@@ -67,6 +67,7 @@
 SET(SCRIBUS_UI_SRC
   ui/aboutplugins.ui
   ui/aligndistribute.ui
+  ui/arcvectorbase.ui
   ui/charselect.ui
   ui/charselectenhanced.ui
   ui/cmsprefsbase.ui
@@ -164,6 +165,7 @@
   canvasgesture_rulermove.h
   canvasmode.h
   canvasmode_edit.h
+  canvasmode_editarc.h
   canvasmode_measurements.h
   canvasmode_normal.h
   chartablemodel.h
@@ -235,6 +237,7 @@
   ui/annot.h
   ui/annota.h
   ui/applytemplatedialog.h
+  ui/arcvectordialog.h
   ui/arrowchooser.h
   ui/autoform.h
   ui/autoformbuttongroup.h
@@ -633,6 +636,7 @@
   ui/annot.cpp
   ui/annota.cpp
   ui/applytemplatedialog.cpp
+  ui/arcvectordialog.cpp
   ui/arrowchooser.cpp
   ui/autoform.cpp
   ui/autoformbuttongroup.cpp

Modified: branches/ScribusOIF/scribus/canvasmode_editarc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/canvasmode_editarc.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editarc.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_editarc.cpp Tue Jan 18 02:27:21 2011
@@ -105,8 +105,11 @@
 	QPointF mPoint = item->PoLine.pointQF(0);
 	double nWidth = mPoint.x() - widthPoint.x();
 	double nHeight = mPoint.y() - heightPoint.y();
+	double nSweep = endAngle - startAngle;
+	if (nSweep < 0)
+		nSweep += 360;
 	pp.moveTo(mPoint);
-	pp.arcTo(QRectF(mPoint.x() - nWidth, mPoint.y() - nHeight, nWidth * 2, nHeight * 2), startAngle, endAngle - startAngle);
+	pp.arcTo(QRectF(mPoint.x() - nWidth, mPoint.y() - nHeight, nWidth * 2, nHeight * 2), startAngle, nSweep);
 	pp.closeSubpath();
 	psx->drawPath(pp);
 	psx->setPen(p1bd);
@@ -152,6 +155,7 @@
 
 void CanvasMode_EditArc::activate(bool fromGesture)
 {
+	VectorDialog = new ArcVectorDialog(m_ScMW);
 	m_canvas->m_viewMode.m_MouseButtonPressed = false;
 	m_canvas->resetRenderMode();
 	m_doc->DragP = false;
@@ -169,15 +173,64 @@
 	heightPoint = QPointF(centerPoint.x(), centerPoint.y() - item->arcHeight / 2.0);
 	startAngle = item->arcStartAngle;
 	endAngle = startAngle + item->arcSweepAngle;
+	QLineF res = QLineF(centerPoint, startPoint);
+	QLineF swe = QLineF(centerPoint, endPoint);
+	double nSweep = swe.angle() - res.angle();
+	if (nSweep < 0)
+		nSweep += 360;
+	VectorDialog->setValues(res.angle(), nSweep, item->arcHeight, item->arcWidth);
+	VectorDialog->show();
 	setModeCursor();
 	if (fromGesture)
 	{
 		m_view->update();
 	}
+	connect(VectorDialog, SIGNAL(NewVectors(double, double, double, double)), this, SLOT(applyValues(double, double, double, double)));
+}
+
+void CanvasMode_EditArc::applyValues(double start, double end, double height, double width)
+{
+	PageItem *currItem = m_doc->m_Selection->itemAt(0);
+	PageItem_Arc *item = currItem->asArc();
+	QPointF mPoint = item->PoLine.pointQF(0);
+	QRectF upRect = QRectF(QPointF(0, 0), QPointF(currItem->width(), currItem->height())).normalized();
+	QRectF upRect2 = QRectF(mPoint.x() - item->arcWidth / 2.0, mPoint.y() - item->arcHeight / 2.0, item->arcWidth, item->arcHeight);
+	upRect = upRect2.united(upRect);
+	upRect.translate(currItem->xPos(), currItem->yPos());
+	item->arcWidth = width;
+	item->arcHeight = height;
+	QTransform bb;
+	bb.scale(item->arcHeight / item->arcWidth, 1.0);
+	QLineF inp = QLineF(QPointF(width / 2.0, height / 2.0), QPointF(width, height / 2.0));
+	inp.setAngle(start);
+	QLineF res = bb.map(inp);
+	inp.setAngle(start + end);
+	QLineF ena = bb.map(inp);
+	startAngle = res.angle();
+	endAngle = ena.angle();
+	double nSweep = endAngle - startAngle;
+	if (nSweep < 0)
+		nSweep += 360;
+	QPainterPath pp;
+	pp.moveTo(mPoint);
+	pp.arcTo(QRectF(mPoint.x() - item->arcWidth / 2.0, mPoint.y() - item->arcHeight / 2.0, item->arcWidth, item->arcHeight), startAngle, nSweep);
+	pp.closeSubpath();
+	currItem->PoLine.fromQPainterPath(pp);
+	m_doc->AdjustItemSize(currItem);
+	item->arcStartAngle = startAngle;
+	item->arcSweepAngle = endAngle - startAngle;
+	startPoint = currItem->PoLine.pointQF(2);
+	endPoint = currItem->PoLine.pointQF(currItem->PoLine.size() - 4);
+	centerPoint = currItem->PoLine.pointQF(0);
+	widthPoint = QPointF(centerPoint.x() - item->arcWidth / 2.0, centerPoint.y());
+	heightPoint = QPointF(centerPoint.x(), centerPoint.y() - item->arcHeight / 2.0);
+	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));
 }
 
 void CanvasMode_EditArc::deactivate(bool forGesture)
 {
+	VectorDialog->close();
+	delete VectorDialog;
 	m_view->redrawMarker->hide();
 	m_arcPoint = noPointDefined;
 }
@@ -248,6 +301,8 @@
 		else if (m_arcPoint == useControlWidth)
 			widthPoint = QPointF(widthPoint.x() + (newX - Mxp), widthPoint.y());
 		double nSweep = endAngle - startAngle;
+		if (nSweep < 0)
+			nSweep += 360;
 		double nWidth = sPoint.x() - widthPoint.x();
 		double nHeight = sPoint.y() - heightPoint.y();
 		pp.moveTo(sPoint);
@@ -256,9 +311,23 @@
 		FPointArray ar;
 		ar.fromQPainterPath(pp);
 		if (m_arcPoint == useControlStart)
+		{
 			startPoint = ar.pointQF(2);
+			QLineF stLinA = QLineF(smPoint, itemMatrix.map(startPoint));
+			m_canvas->displayRotHUD(m->globalPos(), 360.0 - stLinA.angle());
+		}
 		else if (m_arcPoint == useControlSweep)
+		{
 			endPoint = ar.pointQF(ar.size() - 4);
+			QLineF stLinA = QLineF(smPoint, itemMatrix.map(endPoint));
+			m_canvas->displayRotHUD(m->globalPos(), 360.0 - stLinA.angle());
+		}
+		QLineF res = QLineF(centerPoint, startPoint);
+		QLineF swe = QLineF(centerPoint, endPoint);
+		nSweep = swe.angle() - res.angle();
+		if (nSweep < 0)
+			nSweep += 360;
+		VectorDialog->setValues(res.angle(), nSweep, nHeight * 2, nWidth * 2);
 		currItem->update();
 		QRectF upRect;
 		upRect = QRectF(QPointF(0, 0), QPointF(currItem->width(), currItem->height())).normalized();
@@ -339,9 +408,12 @@
 		double nHeight = mPoint.y() - heightPoint.y();
 		item->arcWidth = nWidth * 2.0;
 		item->arcHeight = nHeight * 2.0;
+		double nSweep = endAngle - startAngle;
+		if (nSweep < 0)
+			nSweep += 360;
 		QPainterPath pp;
 		pp.moveTo(mPoint);
-		pp.arcTo(QRectF(mPoint.x() - item->arcWidth / 2.0, mPoint.y() - item->arcHeight / 2.0, item->arcWidth, item->arcHeight), startAngle, endAngle - startAngle);
+		pp.arcTo(QRectF(mPoint.x() - item->arcWidth / 2.0, mPoint.y() - item->arcHeight / 2.0, item->arcWidth, item->arcHeight), startAngle, nSweep);
 		pp.closeSubpath();
 		currItem->PoLine.fromQPainterPath(pp);
 		m_doc->AdjustItemSize(currItem);

Modified: branches/ScribusOIF/scribus/canvasmode_editarc.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/canvasmode_editarc.h
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editarc.h (original)
+++ branches/ScribusOIF/scribus/canvasmode_editarc.h Tue Jan 18 02:27:21 2011
@@ -28,6 +28,7 @@
 
 #include "canvasmode.h"
 #include "fpointarray.h"
+#include "ui/arcvectordialog.h"
 
 class PageItem;
 class ScribusMainWindow;
@@ -38,6 +39,7 @@
 
 class CanvasMode_EditArc :  public CanvasMode
 {	
+	Q_OBJECT
 public:
 	CanvasMode_EditArc(ScribusView* view);
 
@@ -78,6 +80,10 @@
 	double startAngle;
 	double endAngle;
 	eArcPoint m_arcPoint;
+	ArcVectorDialog* VectorDialog;
+
+private slots:
+	void applyValues(double start, double end, double height, double width);
 };
 
 

Modified: branches/ScribusOIF/scribus/pdflib_core.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/pdflib_core.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pdflib_core.cpp (original)
+++ branches/ScribusOIF/scribus/pdflib_core.cpp Tue Jan 18 02:27:21 2011
@@ -66,6 +66,7 @@
 #include "page.h"
 #include "pageitem.h"
 #include "pageitem_textframe.h"
+#include "pageitem_group.h"
 #include "pdfoptions.h"
 #include "prefscontext.h"
 #include "prefsmanager.h"
@@ -3351,7 +3352,21 @@
 	getBleeds(ActPageP, bleedLeft, bleedRight);
 	double maxBoxX = ActPageP->width()+bleedRight+bleedLeft;
 	double maxBoxY = ActPageP->height()+Options.bleeds.Top+Options.bleeds.Bottom;
-	PutDoc("/BBox [ "+FToStr(-bleedLeft)+" "+FToStr(-Options.bleeds.Bottom)+" "+FToStr(maxBoxX)+" "+FToStr(maxBoxY)+" ]\n");
+	if (controlItem != NULL)
+	{
+		double scaleW, scaleH;
+		if (controlItem->groupWidth > controlItem->width())
+			scaleW = controlItem->groupWidth / controlItem->width();
+		else
+			scaleW = 1.0 / (controlItem->groupWidth / controlItem->width());
+		if (controlItem->groupHeight > controlItem->height())
+			scaleH = controlItem->groupHeight / controlItem->height();
+		else
+			scaleH = 1.0 / (controlItem->groupHeight / controlItem->height());
+		PutDoc("/BBox [ "+FToStr(0)+" "+FToStr(-controlItem->height() * scaleH)+" "+FToStr(controlItem->groupWidth * scaleW)+" "+FToStr(controlItem->groupHeight * scaleH)+" ]\n");
+	}
+	else
+		PutDoc("/BBox [ "+FToStr(-bleedLeft)+" "+FToStr(-Options.bleeds.Bottom)+" "+FToStr(maxBoxX)+" "+FToStr(maxBoxY)+" ]\n");
 	PutDoc("/Group "+QString::number(Gobj)+" 0 R\n");
 	if (Options.Compress)
 		data = CompressStr(&data);
@@ -3465,6 +3480,8 @@
 bool PDFLibCore::PDF_ProcessItem(QString& output, PageItem* ite, const Page* pag, uint PNr, bool embedded, bool pattern)
 {
 	QString tmp(""), tmpOut;
+	if (ite->isGroup())
+		ite->asGroupFrame()->adjustXYPosition();
 	ite->setRedrawBounding();
 	double bLeft, bRight, bBottom, bTop;
 	getBleeds(pag, bLeft, bRight, bBottom, bTop);
@@ -4243,8 +4260,8 @@
 				QTransform trans;
 				trans.scale(ite->width() / ite->groupWidth, ite->height() / ite->groupHeight);
 				trans.translate(0.0, -ite->height());
-			//	trans.translate(ite->groupItemList.at(0)->gXpos, -ite->groupItemList.at(0)->gYpos);
 				tmp += FToStr(trans.m11())+" "+FToStr(trans.m12())+" "+FToStr(trans.m21())+" "+FToStr(trans.m22())+" "+FToStr(trans.dx())+" "+FToStr(trans.dy())+" cm\n";
+				groupStackPos.push(QPointF(ite->xPos(), ite->height()));
 				for (int em = 0; em < ite->groupItemList.count(); ++em)
 				{
 					PageItem* embedded = ite->groupItemList.at(em);
@@ -4268,6 +4285,7 @@
 					tmpD += PDF_ProcessTableItem(embedded, pag);
 					tmpD += "Q\n";
 				}
+				groupStackPos.pop();
 				if (Options.Version >= PDFOptions::PDFVersion_14 || Options.Version == PDFOptions::PDFVersion_X4)
 					tmp += Write_TransparencyGroup(ite->fillTransparency(), ite->fillBlendmode(), tmpD, ite);
 				else
@@ -6233,8 +6251,16 @@
 	QTransform mpa;
 	if ((inPattern == 0) && (kind != 2))
 	{
-		mpa.translate(currItem->xPos() - ActPageP->xOffset(), ActPageP->height() - (currItem->yPos() - ActPageP->yOffset()));
-		mpa.rotate(-currItem->rotation());
+		if (groupStackPos.count() != 0)
+		{
+			mpa.translate(currItem->xPos() - groupStackPos.top().x(), groupStackPos.top().y() - currItem->gYpos);
+			mpa.rotate(-currItem->rotation());
+		}
+		else
+		{
+			mpa.translate(currItem->xPos() - ActPageP->xOffset(), ActPageP->height() - (currItem->yPos() - ActPageP->yOffset()));
+			mpa.rotate(-currItem->rotation());
+		}
 	}
 	double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, patternSpace;
 	bool mirrorX, mirrorY;
@@ -6626,8 +6652,16 @@
 	QTransform mpa;
 	if (inPattern == 0)
 	{
-		mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
-		mpa.rotate(-c->rotation());
+		if (groupStackPos.count() != 0)
+		{
+			mpa.translate(c->xPos() - groupStackPos.top().x(), groupStackPos.top().y() - c->gYpos);
+			mpa.rotate(-c->rotation());
+		}
+		else
+		{
+			mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
+			mpa.rotate(-c->rotation());
+		}
 	}
 	PutDoc("/Matrix ["+FToStr(mpa.m11())+" "+FToStr(mpa.m12())+" "+FToStr(mpa.m21())+" "+FToStr(mpa.m22())+" "+FToStr(mpa.dx())+" "+FToStr(mpa.dy())+"]\n");
 	PutDoc("/Shading "+QString::number(shadeObject)+" 0 R\n");
@@ -7027,8 +7061,16 @@
 	QTransform mpa;
 	if (inPattern == 0)
 	{
-		mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
-		mpa.rotate(-c->rotation());
+		if (groupStackPos.count() != 0)
+		{
+			mpa.translate(c->xPos() - groupStackPos.top().x(), groupStackPos.top().y() - c->gYpos);
+			mpa.rotate(-c->rotation());
+		}
+		else
+		{
+			mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
+			mpa.rotate(-c->rotation());
+		}
 	}
 	PutDoc("/Matrix ["+FToStr(mpa.m11())+" "+FToStr(mpa.m12())+" "+FToStr(mpa.m21())+" "+FToStr(mpa.m22())+" "+FToStr(mpa.dx())+" "+FToStr(mpa.dy())+"]\n");
 	PutDoc("/Shading "+QString::number(shadeObject)+" 0 R\n");
@@ -7350,8 +7392,16 @@
 	QTransform mpa;
 	if (inPattern == 0)
 	{
-		mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
-		mpa.rotate(-c->rotation());
+		if (groupStackPos.count() != 0)
+		{
+			mpa.translate(c->xPos() - groupStackPos.top().x(), groupStackPos.top().y() - c->gYpos);
+			mpa.rotate(-c->rotation());
+		}
+		else
+		{
+			mpa.translate(c->xPos() - ActPageP->xOffset(), ActPageP->height() - (c->yPos() - ActPageP->yOffset()));
+			mpa.rotate(-c->rotation());
+		}
 	}
 	PutDoc("/Matrix ["+FToStr(mpa.m11())+" "+FToStr(mpa.m12())+" "+FToStr(mpa.m21())+" "+FToStr(mpa.m22())+" "+FToStr(mpa.dx())+" "+FToStr(mpa.dy())+"]\n");
 	PutDoc("/Shading "+QString::number(shadeObject)+" 0 R\n");
@@ -7458,8 +7508,16 @@
 	bool spotMode = false;
 	if (inPattern == 0)
 	{
-		mpa.translate(currItem->xPos() - ActPageP->xOffset(), ActPageP->height() - (currItem->yPos() - ActPageP->yOffset()));
-		mpa.rotate(-currItem->rotation());
+		if (groupStackPos.count() != 0)
+		{
+			mpa.translate(currItem->xPos() - groupStackPos.top().x(), groupStackPos.top().y() - currItem->gYpos);
+			mpa.rotate(-currItem->rotation());
+		}
+		else
+		{
+			mpa.translate(currItem->xPos() - ActPageP->xOffset(), ActPageP->height() - (currItem->yPos() - ActPageP->yOffset()));
+			mpa.rotate(-currItem->rotation());
+		}
 	}
 	if (Gskew == 90)
 		Gskew = 1;

Modified: branches/ScribusOIF/scribus/pdflib_core.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/pdflib_core.h
==============================================================================
--- branches/ScribusOIF/scribus/pdflib_core.h (original)
+++ branches/ScribusOIF/scribus/pdflib_core.h Tue Jan 18 02:27:21 2011
@@ -12,6 +12,7 @@
 #include <QDataStream>
 #include <QPixmap>
 #include <QList>
+#include <QStack>
 #include <string>
 #include <vector>
 
@@ -302,6 +303,7 @@
 	double bleedDisplacementY;
 	QMap<QString, QMap<uint, uint> > Type3Fonts;
 	QString xmpPacket;
+	QStack<QPointF> groupStackPos;
 
 protected slots:
 	void cancelRequested();

Modified: branches/ScribusOIF/scribus/scpaths.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/scpaths.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scpaths.cpp (original)
+++ branches/ScribusOIF/scribus/scpaths.cpp Tue Jan 18 02:27:21 2011
@@ -279,7 +279,7 @@
 	sep=';';
 #endif
 	QStringList dirs;
-#if defined(Q_OS_MAC) or defined(Q_OS_UNIX)
+#if defined(Q_OS_MAC) || defined(Q_OS_UNIX)
 	QStringList env(QProcess::systemEnvironment());
 	QString path_data;
 	foreach (QString line, env)

Modified: branches/ScribusOIF/scribus/ui/colorlistbox.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/scribus/ui/colorlistbox.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/colorlistbox.cpp (original)
+++ branches/ScribusOIF/scribus/ui/colorlistbox.cpp Tue Jan 18 02:27:21 2011
@@ -446,13 +446,14 @@
 
 bool ColorListBox::viewportEvent(QEvent *event)
 {
+	/* commented out because of random crashes in the colorcombobox of the gradient editor
 	if (event->type() == QEvent::ToolTip)
 	{
 		if (cList != NULL)
 		{
 			QHelpEvent *helpEvent = static_cast<QHelpEvent *>(event);
 			QListWidgetItem* it = itemAt(helpEvent->pos());
-			if (it != 0)
+			if (it != NULL)
 			{
 				event->accept();
 				QString tipText = "";
@@ -477,7 +478,8 @@
 			}
 		}
 	}
-	else if (event->type() == QEvent::MouseButtonPress)
+	else */
+	if (event->type() == QEvent::MouseButtonPress)
 	{
 		QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
 		if (mouseEvent->button() == Qt::RightButton)

Modified: branches/ScribusOIF/win32/vc9/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16273&path=/branches/ScribusOIF/win32/vc9/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/Scribus.vcproj Tue Jan 18 02:27:21 2011
@@ -349,6 +349,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\arcvectordialog.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\arrowchooser.cpp"
 				>
 			</File>
@@ -2212,6 +2216,24 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\arcvectordialog.h"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\arrowchooser.h"
 				>
 				<FileConfiguration
@@ -2460,6 +2482,20 @@
 			<File
 				RelativePath="..\..\scribus\canvasmode_editarc.h"
 				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\scribus\canvasmode_editgradient.h"
@@ -7861,6 +7897,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\ui_arcvectorbase.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\ui_charselect.h"
 				>
 			</File>
@@ -8254,6 +8294,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\moc_arcvectordialog.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\moc_arrowchooser.cpp"
 				>
 			</File>
@@ -8295,6 +8339,10 @@
 			</File>
 			<File
 				RelativePath="..\..\scribus\moc_canvasmode_edit.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\scribus\moc_canvasmode_editarc.cpp"
 				>
 			</File>
 			<File
@@ -9307,6 +9355,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\ui\arcvectorbase.ui"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\ui\charselect.ui"
 				>
 			</File>




More information about the scribus-commit mailing list