r19378 by craig - Fix spelling error

scribus-commit scribus-commit at lists.scribus.net
Sun Jul 27 21:59:02 UTC 2014


Author: craig
Date: Sun Jul 27 21:59:01 2014
New Revision: 19378

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19378
Log:
Fix spelling error

Modified:
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/prefsstructs.h
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/modetoolbar.cpp
    trunk/Scribus/scribus/ui/prefs_itemtools.cpp

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Sun Jul 27 21:59:01 2014
@@ -127,8 +127,8 @@
 		else
 			RecordP.addPoint(FPoint(newXF, newYF));
 		QPolygon& redrawPolygon(m_canvas->newRedrawPolygon());
-		double mx = sin(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
-		double my = cos(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
+		double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+		double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
 		for (int px = 0; px < RecordP.size()-1; ++px)
 		{
 			FPoint clp = RecordP.point(px);
@@ -246,13 +246,13 @@
 			UndoTransaction *createTransaction = NULL;
 			if(UndoManager::undoEnabled())
 				createTransaction = new UndoTransaction(UndoManager::instance()->beginTransaction());
-			uint z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().calligrapicPenLineWidth, m_doc->itemToolPrefs().calligrapicPenFillColor, m_doc->itemToolPrefs().calligrapicPenLineColor, true);
+			uint z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs().calligraphicPenLineWidth, m_doc->itemToolPrefs().calligraphicPenFillColor, m_doc->itemToolPrefs().calligraphicPenLineColor, true);
 			currItem = m_doc->Items->at(z);
 			currItem->PoLine.resize(0);
 			QList<QPointF> clipU;
 			QList<QPointF> clipL;
-			double mx = sin(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
-			double my = cos(m_doc->itemToolPrefs().calligrapicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligrapicPenWidth / 2.0);
+			double mx = sin(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
+			double my = cos(m_doc->itemToolPrefs().calligraphicPenAngle / 180.0 * M_PI) * (m_doc->itemToolPrefs().calligraphicPenWidth / 2.0);
 			for (int px = 0; px < RecordP.size()-1; ++px)
 			{
 				FPoint clp = RecordP.point(px);
@@ -277,9 +277,9 @@
 			currItem->ClipEdited = true;
 			currItem->FrameType = 3;
 			currItem->OwnPage = m_doc->OnPage(currItem);
-			currItem->PLineArt = Qt::PenStyle(m_doc->itemToolPrefs().calligrapicPenStyle);
-			currItem->setFillShade(m_doc->itemToolPrefs().calligrapicPenFillColorShade);
-			currItem->setLineShade(m_doc->itemToolPrefs().calligrapicPenLineColorShade);
+			currItem->PLineArt = Qt::PenStyle(m_doc->itemToolPrefs().calligraphicPenStyle);
+			currItem->setFillShade(m_doc->itemToolPrefs().calligraphicPenFillColorShade);
+			currItem->setLineShade(m_doc->itemToolPrefs().calligraphicPenLineColorShade);
 			currItem->setFillEvenOdd(true);
 			m_view->resetMousePressed();
 			currItem->checkChanges();

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sun Jul 27 21:59:01 2014
@@ -2252,14 +2252,14 @@
 	doc->itemToolPrefs().shapeLineColorShade     = attrs.valueAsInt("PENSHADE", 100);
 	doc->itemToolPrefs().lineColorShade  = attrs.valueAsInt("LINESHADE", 100);
 	doc->itemToolPrefs().shapeFillColorShade      = attrs.valueAsInt("BRUSHSHADE", 100);
-	doc->itemToolPrefs().calligrapicPenFillColor = attrs.valueAsString("calligrapicPenFillColor", "Black");
-	doc->itemToolPrefs().calligrapicPenLineColor = attrs.valueAsString("calligrapicPenLineColor", "Black");
-	doc->itemToolPrefs().calligrapicPenFillColorShade = attrs.valueAsInt("calligrapicPenFillColorShade", 100);
-	doc->itemToolPrefs().calligrapicPenLineColorShade = attrs.valueAsInt("calligrapicPenLineColorShade", 100);
-	doc->itemToolPrefs().calligrapicPenLineWidth = attrs.valueAsDouble("calligrapicPenLineWidth", 1.0);
-	doc->itemToolPrefs().calligrapicPenAngle = attrs.valueAsDouble("calligrapicPenAngle", 0.0);
-	doc->itemToolPrefs().calligrapicPenWidth = attrs.valueAsDouble("calligrapicPenWidth", 10.0);
-	doc->itemToolPrefs().calligrapicPenStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("calligrapicPenStyle"));
+	doc->itemToolPrefs().calligraphicPenFillColor = attrs.valueAsString("calligraphicPenFillColor", "Black");
+	doc->itemToolPrefs().calligraphicPenLineColor = attrs.valueAsString("calligraphicPenLineColor", "Black");
+	doc->itemToolPrefs().calligraphicPenFillColorShade = attrs.valueAsInt("calligraphicPenFillColorShade", 100);
+	doc->itemToolPrefs().calligraphicPenLineColorShade = attrs.valueAsInt("calligraphicPenLineColorShade", 100);
+	doc->itemToolPrefs().calligraphicPenLineWidth = attrs.valueAsDouble("calligraphicPenLineWidth", 1.0);
+	doc->itemToolPrefs().calligraphicPenAngle = attrs.valueAsDouble("calligraphicPenAngle", 0.0);
+	doc->itemToolPrefs().calligraphicPenWidth = attrs.valueAsDouble("calligraphicPenWidth", 10.0);
+	doc->itemToolPrefs().calligraphicPenStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("calligraphicPenStyle"));
 	doc->opToolPrefs().dispX       = attrs.valueAsDouble("dispX", 10.0);
 	doc->opToolPrefs().dispY       = attrs.valueAsDouble("dispY", 10.0);
 	doc->opToolPrefs().constrain   = attrs.valueAsDouble("constrain", 15.0);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Sun Jul 27 21:59:01 2014
@@ -380,14 +380,14 @@
 	docu.writeAttribute("MARGC",m_Doc->guidesPrefs().marginColor.name());
 	docu.writeAttribute("RANDF", static_cast<int>(m_Doc->marginColored()));
 	docu.writeAttribute("currentProfile", m_Doc->curCheckProfile());
-	docu.writeAttribute("calligrapicPenFillColor", m_Doc->itemToolPrefs().calligrapicPenFillColor);
-	docu.writeAttribute("calligrapicPenLineColor", m_Doc->itemToolPrefs().calligrapicPenLineColor);
-	docu.writeAttribute("calligrapicPenFillColorShade", m_Doc->itemToolPrefs().calligrapicPenFillColorShade);
-	docu.writeAttribute("calligrapicPenLineColorShade", m_Doc->itemToolPrefs().calligrapicPenLineColorShade);
-	docu.writeAttribute("calligrapicPenLineWidth", m_Doc->itemToolPrefs().calligrapicPenLineWidth);
-	docu.writeAttribute("calligrapicPenAngle", m_Doc->itemToolPrefs().calligrapicPenAngle);
-	docu.writeAttribute("calligrapicPenWidth", m_Doc->itemToolPrefs().calligrapicPenWidth);
-	docu.writeAttribute("calligrapicPenStyle", m_Doc->itemToolPrefs().calligrapicPenStyle);
+	docu.writeAttribute("calligraphicPenFillColor", m_Doc->itemToolPrefs().calligraphicPenFillColor);
+	docu.writeAttribute("calligraphicPenLineColor", m_Doc->itemToolPrefs().calligraphicPenLineColor);
+	docu.writeAttribute("calligraphicPenFillColorShade", m_Doc->itemToolPrefs().calligraphicPenFillColorShade);
+	docu.writeAttribute("calligraphicPenLineColorShade", m_Doc->itemToolPrefs().calligraphicPenLineColorShade);
+	docu.writeAttribute("calligraphicPenLineWidth", m_Doc->itemToolPrefs().calligraphicPenLineWidth);
+	docu.writeAttribute("calligraphicPenAngle", m_Doc->itemToolPrefs().calligraphicPenAngle);
+	docu.writeAttribute("calligraphicPenWidth", m_Doc->itemToolPrefs().calligraphicPenWidth);
+	docu.writeAttribute("calligraphicPenStyle", m_Doc->itemToolPrefs().calligraphicPenStyle);
 
 	writeCheckerProfiles(docu);
 	writeJavascripts(docu);

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Sun Jul 27 21:59:01 2014
@@ -229,14 +229,14 @@
 	appPrefs.itemToolPrefs.textTabFillChar = "";
 	appPrefs.itemToolPrefs.textTabWidth = 36.0;
 	// defaults for calligraphic pen
-	appPrefs.itemToolPrefs.calligrapicPenFillColor = "Black";
-	appPrefs.itemToolPrefs.calligrapicPenLineColor = "Black";
-	appPrefs.itemToolPrefs.calligrapicPenFillColorShade = 100;
-	appPrefs.itemToolPrefs.calligrapicPenLineColorShade = 100;
-	appPrefs.itemToolPrefs.calligrapicPenLineWidth = 1.0;
-	appPrefs.itemToolPrefs.calligrapicPenAngle = 0.0;
-	appPrefs.itemToolPrefs.calligrapicPenWidth = 10.0;
-	appPrefs.itemToolPrefs.calligrapicPenStyle = Qt::SolidLine;
+	appPrefs.itemToolPrefs.calligraphicPenFillColor = "Black";
+	appPrefs.itemToolPrefs.calligraphicPenLineColor = "Black";
+	appPrefs.itemToolPrefs.calligraphicPenFillColorShade = 100;
+	appPrefs.itemToolPrefs.calligraphicPenLineColorShade = 100;
+	appPrefs.itemToolPrefs.calligraphicPenLineWidth = 1.0;
+	appPrefs.itemToolPrefs.calligraphicPenAngle = 0.0;
+	appPrefs.itemToolPrefs.calligraphicPenWidth = 10.0;
+	appPrefs.itemToolPrefs.calligraphicPenStyle = Qt::SolidLine;
 
 	appPrefs.opToolPrefs.dispX = 10.0;
 	appPrefs.opToolPrefs.dispY = 10.0;
@@ -1104,9 +1104,9 @@
 
 bool PrefsManager::isToolColor(const struct ItemToolPrefs& settings, const QString& name)
 {
-	if (settings.calligrapicPenLineColor == name)
+	if (settings.calligraphicPenLineColor == name)
 		return true;
-	if (settings.calligrapicPenFillColor == name)
+	if (settings.calligraphicPenFillColor == name)
 		return true;
 	if (settings.textColor == name)
 		return true;
@@ -1154,10 +1154,10 @@
 		names.append(settings.imageFillColor);
 	if (!names.contains(settings.imageStrokeColor))
 		names.append(settings.imageStrokeColor);
-	if (!names.contains(settings.calligrapicPenFillColor))
-		names.append(settings.calligrapicPenFillColor);
-	if (!names.contains(settings.calligrapicPenLineColor))
-		names.append(settings.calligrapicPenLineColor);
+	if (!names.contains(settings.calligraphicPenFillColor))
+		names.append(settings.calligraphicPenFillColor);
+	if (!names.contains(settings.calligraphicPenLineColor))
+		names.append(settings.calligraphicPenLineColor);
 	return names;
 }
 
@@ -1186,10 +1186,10 @@
 		settings.imageFillColor = replaceMap[settings.imageFillColor];
 	if (replaceMap.contains(settings.imageStrokeColor))
 		settings.imageStrokeColor = replaceMap[settings.imageStrokeColor];
-	if (replaceMap.contains(settings.calligrapicPenFillColor))
-		settings.calligrapicPenFillColor = replaceMap[settings.calligrapicPenFillColor];
-	if (replaceMap.contains(settings.calligrapicPenLineColor))
-		settings.calligrapicPenLineColor = replaceMap[settings.calligrapicPenLineColor];
+	if (replaceMap.contains(settings.calligraphicPenFillColor))
+		settings.calligraphicPenFillColor = replaceMap[settings.calligraphicPenFillColor];
+	if (replaceMap.contains(settings.calligraphicPenLineColor))
+		settings.calligraphicPenLineColor = replaceMap[settings.calligraphicPenLineColor];
 }
 
 void PrefsManager::setColorSet(const ColorList& colorSet)
@@ -1223,10 +1223,10 @@
 	QString penPict = appPrefs.itemToolPrefs.imageStrokeColor;
 	if (!tmpSet.contains(penPict) && penPict != CommonStrings::None)
 		tmpSet[penPict] = appPrefs.colorPrefs.DColors[penPict];
-	QString brushCpen = appPrefs.itemToolPrefs.calligrapicPenFillColor;
+	QString brushCpen = appPrefs.itemToolPrefs.calligraphicPenFillColor;
 	if (!tmpSet.contains(brushCpen) && brushCpen != CommonStrings::None)
 		tmpSet[brushCpen] = appPrefs.colorPrefs.DColors[brushCpen];
-	QString brushCpen2 = appPrefs.itemToolPrefs.calligrapicPenLineColor;
+	QString brushCpen2 = appPrefs.itemToolPrefs.calligraphicPenLineColor;
 	if (!tmpSet.contains(brushCpen2) && brushCpen2 != CommonStrings::None)
 		tmpSet[brushCpen2] = appPrefs.colorPrefs.DColors[brushCpen2];
 	appPrefs.colorPrefs.DColors = tmpSet;
@@ -1525,14 +1525,14 @@
 	dcItemTools.setAttribute("LineEndArrow", appPrefs.itemToolPrefs.lineEndArrow);
 	dcItemTools.setAttribute("FontFace",appPrefs.itemToolPrefs.textFont);
 	dcItemTools.setAttribute("FontSize",appPrefs.itemToolPrefs.textSize / 10.0);
-	dcItemTools.setAttribute("CalligrapicPenFillColor", appPrefs.itemToolPrefs.calligrapicPenFillColor);
-	dcItemTools.setAttribute("CalligrapicPenLineColor", appPrefs.itemToolPrefs.calligrapicPenLineColor);
-	dcItemTools.setAttribute("CalligrapicPenFillColorShade", appPrefs.itemToolPrefs.calligrapicPenFillColorShade);
-	dcItemTools.setAttribute("CalligrapicPenLineColorShade", appPrefs.itemToolPrefs.calligrapicPenLineColorShade);
-	dcItemTools.setAttribute("CalligrapicPenLineWidth", appPrefs.itemToolPrefs.calligrapicPenLineWidth);
-	dcItemTools.setAttribute("CalligrapicPenAngle", appPrefs.itemToolPrefs.calligrapicPenAngle);
-	dcItemTools.setAttribute("CalligrapicPenWidth", appPrefs.itemToolPrefs.calligrapicPenWidth);
-	dcItemTools.setAttribute("CalligrapicPenStyle",appPrefs.itemToolPrefs.calligrapicPenStyle);
+	dcItemTools.setAttribute("CalligraphicPenFillColor", appPrefs.itemToolPrefs.calligraphicPenFillColor);
+	dcItemTools.setAttribute("CalligraphicPenLineColor", appPrefs.itemToolPrefs.calligraphicPenLineColor);
+	dcItemTools.setAttribute("CalligraphicPenFillColorShade", appPrefs.itemToolPrefs.calligraphicPenFillColorShade);
+	dcItemTools.setAttribute("CalligraphicPenLineColorShade", appPrefs.itemToolPrefs.calligraphicPenLineColorShade);
+	dcItemTools.setAttribute("CalligraphicPenLineWidth", appPrefs.itemToolPrefs.calligraphicPenLineWidth);
+	dcItemTools.setAttribute("CalligraphicPenAngle", appPrefs.itemToolPrefs.calligraphicPenAngle);
+	dcItemTools.setAttribute("CalligraphicPenWidth", appPrefs.itemToolPrefs.calligraphicPenWidth);
+	dcItemTools.setAttribute("CalligraphicPenStyle",appPrefs.itemToolPrefs.calligraphicPenStyle);
 	elem.appendChild(dcItemTools);
 
 	QDomElement dcOperatorTools=docu.createElement("OperatorTools");
@@ -2078,14 +2078,14 @@
 
 		if (dc.tagName()=="ItemTools")
 		{
-			appPrefs.itemToolPrefs.calligrapicPenFillColor = dc.attribute("CalligrapicPenFillColor", "Black");
-			appPrefs.itemToolPrefs.calligrapicPenLineColor = dc.attribute("CalligrapicPenLineColor", "Black");
-			appPrefs.itemToolPrefs.calligrapicPenFillColorShade = dc.attribute("CalligrapicPenFillColorShade", "100").toInt();
-			appPrefs.itemToolPrefs.calligrapicPenLineColorShade = dc.attribute("CalligrapicPenLineColorShade", "100").toInt();
-			appPrefs.itemToolPrefs.calligrapicPenLineWidth = ScCLocale::toDoubleC(dc.attribute("CalligrapicPenLineWidth"), 1.0);
-			appPrefs.itemToolPrefs.calligrapicPenAngle = ScCLocale::toDoubleC(dc.attribute("CalligrapicPenAngle"), 0.0);
-			appPrefs.itemToolPrefs.calligrapicPenWidth = ScCLocale::toDoubleC(dc.attribute("CalligrapicPenWidth"), 10.0);
-			appPrefs.itemToolPrefs.calligrapicPenStyle = dc.attribute("CalligrapicPenStyle").toInt();
+			appPrefs.itemToolPrefs.calligraphicPenFillColor = dc.attribute("CalligraphicPenFillColor", "Black");
+			appPrefs.itemToolPrefs.calligraphicPenLineColor = dc.attribute("CalligraphicPenLineColor", "Black");
+			appPrefs.itemToolPrefs.calligraphicPenFillColorShade = dc.attribute("CalligraphicPenFillColorShade", "100").toInt();
+			appPrefs.itemToolPrefs.calligraphicPenLineColorShade = dc.attribute("CalligraphicPenLineColorShade", "100").toInt();
+			appPrefs.itemToolPrefs.calligraphicPenLineWidth = ScCLocale::toDoubleC(dc.attribute("CalligraphicPenLineWidth"), 1.0);
+			appPrefs.itemToolPrefs.calligraphicPenAngle = ScCLocale::toDoubleC(dc.attribute("CalligraphicPenAngle"), 0.0);
+			appPrefs.itemToolPrefs.calligraphicPenWidth = ScCLocale::toDoubleC(dc.attribute("CalligraphicPenWidth"), 10.0);
+			appPrefs.itemToolPrefs.calligraphicPenStyle = dc.attribute("CalligraphicPenStyle").toInt();
 			appPrefs.itemToolPrefs.shapeLineColor = dc.attribute("ShapeLineColor");
 			appPrefs.itemToolPrefs.shapeFillColor = dc.attribute("ShapeFillColor", CommonStrings::None);
 			appPrefs.itemToolPrefs.lineColor = dc.attribute("LineColor");

Modified: trunk/Scribus/scribus/prefsstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Sun Jul 27 21:59:01 2014
@@ -245,14 +245,14 @@
 	int imageLowResType; //! Preview type for an image frame
 	bool imageUseEmbeddedPath; //! Use embedded path, eg from an EPS etc.
 	/* Calligraphic Pen Tool */
-	QString calligrapicPenFillColor; //! Default calligrapicPen fill color
-	QString calligrapicPenLineColor; //! Default calligrapicPen line color
-	int calligrapicPenFillColorShade; //! Default calligrapicPen fill shade
-	int calligrapicPenLineColorShade; //! Default calligrapicPen line shade
-	double calligrapicPenLineWidth; //! Width of line
-	double calligrapicPenAngle;		//! Angle of the calligraphics Brush
-	double calligrapicPenWidth;		//! Width of the calligraphics Brush
-	int calligrapicPenStyle; //! Line style of the calligraphics Brush
+	QString calligraphicPenFillColor; //! Default calligrapicPen fill color
+	QString calligraphicPenLineColor; //! Default calligrapicPen line color
+	int calligraphicPenFillColorShade; //! Default calligrapicPen fill shade
+	int calligraphicPenLineColorShade; //! Default calligrapicPen line shade
+	double calligraphicPenLineWidth; //! Width of line
+	double calligraphicPenAngle;		//! Angle of the calligraphics Brush
+	double calligraphicPenWidth;		//! Width of the calligraphics Brush
+	int calligraphicPenStyle; //! Line style of the calligraphics Brush
 	/* Arc Tool */
 	double arcStartAngle;	//! angle where the arc starts
 	double arcSweepAngle;	//! angle the arc spans

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Jul 27 21:59:01 2014
@@ -2447,8 +2447,8 @@
 	nsEditor->setDoc(doc);
 	symbolPalette->setDoc(doc);
 	inlinePalette->setDoc(doc);
-	modeToolBar->Angle->setValue(doc->itemToolPrefs().calligrapicPenAngle);
-	modeToolBar->PWidth->setValue(doc->itemToolPrefs().calligrapicPenWidth);
+	modeToolBar->Angle->setValue(doc->itemToolPrefs().calligraphicPenAngle);
+	modeToolBar->PWidth->setValue(doc->itemToolPrefs().calligraphicPenWidth);
 	// Give plugins a chance to react on changing the current document
 	PluginManager& pluginManager(PluginManager::instance());
 	QStringList pluginNames(pluginManager.pluginNames(false));

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Jul 27 21:59:01 2014
@@ -492,10 +492,10 @@
 	docPrefsData.itemToolPrefs.textFillColor = appPrefsData.itemToolPrefs.textFillColor;
 	if (appPrefsData.itemToolPrefs.textLineColor != CommonStrings::None)
 		PageColors.insert(appPrefsData.itemToolPrefs.textLineColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.textLineColor]);
-	if (appPrefsData.itemToolPrefs.calligrapicPenFillColor != CommonStrings::None)
-		PageColors.insert(appPrefsData.itemToolPrefs.calligrapicPenFillColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.calligrapicPenFillColor]);
-	if (appPrefsData.itemToolPrefs.calligrapicPenLineColor != CommonStrings::None)
-		PageColors.insert(appPrefsData.itemToolPrefs.calligrapicPenLineColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.calligrapicPenLineColor]);
+	if (appPrefsData.itemToolPrefs.calligraphicPenFillColor != CommonStrings::None)
+		PageColors.insert(appPrefsData.itemToolPrefs.calligraphicPenFillColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.calligraphicPenFillColor]);
+	if (appPrefsData.itemToolPrefs.calligraphicPenLineColor != CommonStrings::None)
+		PageColors.insert(appPrefsData.itemToolPrefs.calligraphicPenLineColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.calligraphicPenLineColor]);
 
 	
 	ParagraphStyle pstyle;

Modified: trunk/Scribus/scribus/ui/modetoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/ui/modetoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/modetoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/modetoolbar.cpp Sun Jul 27 21:59:01 2014
@@ -115,8 +115,8 @@
 
 void ModeToolBar::newCalValues()
 {
-	m_ScMW->doc->itemToolPrefs().calligrapicPenAngle = Angle->value();
-	m_ScMW->doc->itemToolPrefs().calligrapicPenWidth = PWidth->value();
+	m_ScMW->doc->itemToolPrefs().calligraphicPenAngle = Angle->value();
+	m_ScMW->doc->itemToolPrefs().calligraphicPenWidth = PWidth->value();
 }
 
 void ModeToolBar::GetPolyProps()

Modified: trunk/Scribus/scribus/ui/prefs_itemtools.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19378&path=/trunk/Scribus/scribus/ui/prefs_itemtools.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_itemtools.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_itemtools.cpp Sun Jul 27 21:59:01 2014
@@ -190,14 +190,14 @@
 	lineWidthSpinBox->setValue(prefsData->itemToolPrefs.lineWidth);
 	//
 	//Calligraphic Pen Tool
-	calPenFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenFillColor);
-	calPenFillShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenFillColorShade);
-	calPenColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligrapicPenLineColor);
-	calPenLineShadingSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineColorShade);
-	calPenStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.calligrapicPenStyle) - 1);
-	calPenLineWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenLineWidth);
-	calPenAngleSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenAngle);
-	calPenWidthSpinBox->setValue(prefsData->itemToolPrefs.calligrapicPenWidth);
+	calPenFillColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligraphicPenFillColor);
+	calPenFillShadingSpinBox->setValue(prefsData->itemToolPrefs.calligraphicPenFillColorShade);
+	calPenColorComboBox->initColorList(colorList, m_doc, prefsData->itemToolPrefs.calligraphicPenLineColor);
+	calPenLineShadingSpinBox->setValue(prefsData->itemToolPrefs.calligraphicPenLineColorShade);
+	calPenStyleComboBox->setCurrentIndex(static_cast<int>(prefsData->itemToolPrefs.calligraphicPenStyle) - 1);
+	calPenLineWidthSpinBox->setValue(prefsData->itemToolPrefs.calligraphicPenLineWidth);
+	calPenAngleSpinBox->setValue(prefsData->itemToolPrefs.calligraphicPenAngle);
+	calPenWidthSpinBox->setValue(prefsData->itemToolPrefs.calligraphicPenWidth);
 
 	// Arc Tool
 	arcDisplay->restoreDefaults(&prefsData->itemToolPrefs);
@@ -307,18 +307,18 @@
 	prefsData->itemToolPrefs.lineStartArrow = lineStartArrowComboBox->currentIndex();
 	prefsData->itemToolPrefs.lineEndArrow = lineEndArrowComboBox->currentIndex();
 	//Calligraphic Pen Tool
-	prefsData->itemToolPrefs.calligrapicPenFillColor = calPenFillColorComboBox->currentText();
-	if (prefsData->itemToolPrefs.calligrapicPenFillColor == CommonStrings::tr_NoneColor)
-		prefsData->itemToolPrefs.calligrapicPenFillColor = CommonStrings::None;
-	prefsData->itemToolPrefs.calligrapicPenLineColor = calPenColorComboBox->currentText();
-	if (prefsData->itemToolPrefs.calligrapicPenLineColor == CommonStrings::tr_NoneColor)
-		prefsData->itemToolPrefs.calligrapicPenLineColor = CommonStrings::None;
-	prefsData->itemToolPrefs.calligrapicPenFillColorShade = calPenFillShadingSpinBox->value();
-	prefsData->itemToolPrefs.calligrapicPenLineColorShade = calPenLineShadingSpinBox->value();
-	prefsData->itemToolPrefs.calligrapicPenStyle = static_cast<Qt::PenStyle>(calPenStyleComboBox->currentIndex()) + 1;
-	prefsData->itemToolPrefs.calligrapicPenLineWidth = calPenLineWidthSpinBox->value();
-	prefsData->itemToolPrefs.calligrapicPenAngle = calPenAngleSpinBox->value();
-	prefsData->itemToolPrefs.calligrapicPenWidth = calPenWidthSpinBox->value();
+	prefsData->itemToolPrefs.calligraphicPenFillColor = calPenFillColorComboBox->currentText();
+	if (prefsData->itemToolPrefs.calligraphicPenFillColor == CommonStrings::tr_NoneColor)
+		prefsData->itemToolPrefs.calligraphicPenFillColor = CommonStrings::None;
+	prefsData->itemToolPrefs.calligraphicPenLineColor = calPenColorComboBox->currentText();
+	if (prefsData->itemToolPrefs.calligraphicPenLineColor == CommonStrings::tr_NoneColor)
+		prefsData->itemToolPrefs.calligraphicPenLineColor = CommonStrings::None;
+	prefsData->itemToolPrefs.calligraphicPenFillColorShade = calPenFillShadingSpinBox->value();
+	prefsData->itemToolPrefs.calligraphicPenLineColorShade = calPenLineShadingSpinBox->value();
+	prefsData->itemToolPrefs.calligraphicPenStyle = static_cast<Qt::PenStyle>(calPenStyleComboBox->currentIndex()) + 1;
+	prefsData->itemToolPrefs.calligraphicPenLineWidth = calPenLineWidthSpinBox->value();
+	prefsData->itemToolPrefs.calligraphicPenAngle = calPenAngleSpinBox->value();
+	prefsData->itemToolPrefs.calligraphicPenWidth = calPenWidthSpinBox->value();
 
 	//Arc Tool
 	arcDisplay->saveGuiToPrefs(&prefsData->itemToolPrefs);




More information about the scribus-commit mailing list