r14014 by cbradney - Clarified some more prefs variables to make even more sense
scribus-commit
scribus-commit at lists.scribus.net
Mon Sep 21 20:36:17 CEST 2009
Revision: 14014
Author: cbradney
Date: 2009-09-21T18:37:16.456217Z
Commit message: Clarified some more prefs variables to make even more sense
Changeset:
M /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M /trunk/Scribus/scribus/pageitem.cpp
M /trunk/Scribus/scribus/scribusXml.cpp
M /trunk/Scribus/scribus/ui/prefs.cpp
M /trunk/Scribus/scribus/plugins/pctimplugin/importpct.cpp
M /trunk/Scribus/scribus/ui/reformdoc.cpp
M /trunk/Scribus/scribus/scribusdoc.cpp
M /trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
M /trunk/Scribus/scribus/plugins/wmfimplugin/wmfimport.cpp
M /trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
M /trunk/Scribus/scribus/canvasmode_create.cpp
M /trunk/Scribus/scribus/plugins/aiimplugin/importai.cpp
M /trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
M /trunk/Scribus/scribus/ui/tabtools.cpp
M /trunk/Scribus/scribus/canvasmode_legacy.cpp
M /trunk/Scribus/scribus/scribusview.cpp
M /trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
M /trunk/Scribus/scribus/fileloader.cpp
M /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
M /trunk/Scribus/scribus/prefsmanager.cpp
M /trunk/Scribus/scribus/plugins/wpgimplugin/importwpg.cpp
M /trunk/Scribus/scribus/plugins/psimport/importps.cpp
M /trunk/Scribus/scribus/plugins/xfigimplugin/importxfig.cpp
M /trunk/Scribus/scribus/prefsstructs.h
M /trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
M /trunk/Scribus/scribus/plugins/cvgimplugin/importcvg.cpp
M /trunk/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
M /trunk/Scribus/scribus/ui/smlinestyle.cpp
M /trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
Diffs:
Index: scribus/fileloader.cpp
===================================================================
--- scribus/fileloader.cpp (revision 14013)
+++ scribus/fileloader.cpp (revision 14014)
@@ -385,9 +385,9 @@
vg.setDropCapLines(pg.attribute("DROPLIN", "2").toInt());
vg.setDropCapOffset(ScCLocale::toDoubleC(pg.attribute("DROPDIST"), 0.0));
vg.charStyle().setFeatures(static_cast<StyleFlag>(pg.attribute("EFFECT", "0").toInt()).featureList());
- vg.charStyle().setFillColor(pg.attribute("FCOLOR", currDoc->itemToolPrefs.shapeBrush));
+ vg.charStyle().setFillColor(pg.attribute("FCOLOR", currDoc->itemToolPrefs.shapeFillColor));
vg.charStyle().setFillShade(pg.attribute("FSHADE", "100").toInt());
- vg.charStyle().setStrokeColor(pg.attribute("SCOLOR", currDoc->itemToolPrefs.shapePen));
+ vg.charStyle().setStrokeColor(pg.attribute("SCOLOR", currDoc->itemToolPrefs.shapeLineColor));
vg.charStyle().setStrokeShade(pg.attribute("SSHADE", "100").toInt());
if (static_cast<bool>(pg.attribute("BASE", "0").toInt()))
vg.setLineSpacingMode(ParagraphStyle::BaselineGridLineSpacing);
Index: scribus/canvasmode_create.cpp
===================================================================
--- scribus/canvasmode_create.cpp (revision 14013)
+++ scribus/canvasmode_create.cpp (revision 14014)
@@ -586,33 +586,33 @@
case 0:
if (modifiers == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->FrameType = 0;
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->FrameType = 0;
}
break;
case 1:
if (modifiers == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->FrameType = 1;
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->FrameType = 1;
}
break;
default:
if (modifiers == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
m_doc->AdjustItemSize(m_doc->Items->at(z));
m_doc->setRedrawBounding(m_doc->Items->at(z));
@@ -621,7 +621,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, true);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, true);
m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
m_doc->AdjustItemSize(m_doc->Items->at(z));
m_doc->setRedrawBounding(m_doc->Items->at(z));
@@ -650,7 +650,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
+ z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
}
break;
case modeDrawImage:
@@ -661,28 +661,28 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
+ z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
}
break;
case modeDrawText:
if (modifiers == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
+ z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textFont, true);
}
break;
case modeDrawRegularPolygon:
{
if (modifiers == Qt::ShiftModifier)
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.lineColor, true);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.lineColor, true);
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.lineColor, true);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.lineColor, true);
}
currItem = m_doc->Items->at(z);
QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyCorners, m_doc->itemToolPrefs.polyUseFactor, m_doc->itemToolPrefs.polyFactorValue2, m_doc->itemToolPrefs.polyRotation, m_doc->itemToolPrefs.polyCurvature);
@@ -718,7 +718,7 @@
case modeInsertPDFTextAnnotation:
case modeInsertPDFLinkAnnotation:
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
currItem = m_doc->Items->at(z);
currItem->setIsAnnotation(true);
currItem->AutoName = false;
@@ -819,7 +819,7 @@
{
for (int cc = 0; cc < Cols; ++cc)
{
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, true);
currItem = m_doc->Items->at(z);
currItem->isTableItem = true;
currItem->setTextFlowMode(PageItem::TextFlowUsesBoundingBox);
@@ -870,7 +870,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
+ z = m_doc->itemAdd(PageItem::OSGFrame, PageItem::Unspecified, Rxp, Ryp, Rxpd, Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
}
currItem = m_doc->Items->at(z);
currItem->setIsAnnotation(true);
Index: scribus/canvasmode_legacy.cpp
===================================================================
--- scribus/canvasmode_legacy.cpp (revision 14013)
+++ scribus/canvasmode_legacy.cpp (revision 14014)
@@ -1587,14 +1587,14 @@
case 0:
if (m->modifiers() == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->FrameType = 0;
SetupDrawNoResize(z);
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->FrameType = 0;
SetupDraw(z);
}
@@ -1602,14 +1602,14 @@
case 1:
if (m->modifiers() == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->FrameType = 1;
SetupDrawNoResize(z);
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->FrameType = 1;
SetupDraw(z);
}
@@ -1617,7 +1617,7 @@
default:
if (m->modifiers() == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
m_doc->setRedrawBounding(m_doc->Items->at(z));
m_doc->Items->at(z)->FrameType = m_doc->SubMode+2;
@@ -1626,7 +1626,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
m_doc->Items->at(z)->SetFrameShape(m_doc->ValCount, m_doc->ShapeValues);
m_doc->setRedrawBounding(m_doc->Items->at(z));
m_doc->Items->at(z)->FrameType = m_doc->SubMode+2;
@@ -1647,7 +1647,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::LatexFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
SetupDraw(z);
}
break;
@@ -1663,7 +1663,7 @@
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.imageFillColor, CommonStrings::None, !m_canvas->m_viewMode.m_MouseButtonPressed);
SetupDraw(z);
}
break;
@@ -1673,13 +1673,13 @@
selectPage(m);
if (m->modifiers() == Qt::ShiftModifier)
{
- z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAddArea(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
SetupDrawNoResize(z);
}
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
SetupDraw(z);
}
break;
@@ -2004,11 +2004,11 @@
break;
selectPage(m);
if (m->modifiers() == Qt::ShiftModifier)
- z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAddArea(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
else
{
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.shapeBrush, m_doc->itemToolPrefs.shapePen, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.shapeFillColor, m_doc->itemToolPrefs.shapeLineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
}
currItem = m_doc->Items->at(z);
QPainterPath path = RegularPolygon(currItem->width(), currItem->height(), m_doc->itemToolPrefs.polyCorners, m_doc->itemToolPrefs.polyUseFactor, m_doc->itemToolPrefs.polyFactorValue2, m_doc->itemToolPrefs.polyRotation, m_doc->itemToolPrefs.polyCurvature);
@@ -2082,7 +2082,7 @@
break;
selectPage(m);
m_doc->ApplyGuides(&Rxp, &Ryp);
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Rxp, Ryp, 1+Rxpd, 1+Rypd, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
currItem = m_doc->Items->at(z);
currItem->setIsAnnotation(true);
currItem->AutoName = false;
@@ -2647,8 +2647,8 @@
{
for (int cc = 0; cc < Cols; ++cc)
{
- //z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, m_doc->itemToolPrefs.textColor);
- z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ //z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeLineWidth, m_doc->itemToolPrefs.textColor);
+ z = m_doc->itemAdd(PageItem::TextFrame, PageItem::Unspecified, Tx + offX, Ty + offY, deltaX, deltaY, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.textColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
currItem = m_doc->Items->at(z);
currItem->isTableItem = true;
//currItem->setTextFlowsAroundFrame(true);
@@ -2707,7 +2707,7 @@
{
if (RecordP.size() > 1)
{
- uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.shapeWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
+ uint z = m_doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, Mxp, Myp, 1, 1, m_doc->itemToolPrefs.shapeLineWidth, CommonStrings::None, m_doc->itemToolPrefs.lineColor, !m_canvas->m_viewMode.m_MouseButtonPressed);
currItem = m_doc->Items->at(z);
currItem->PoLine.resize(0);
currItem->PoLine.addPoint(RecordP.point(0));
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp (revision 14013)
+++ scribus/scribusdoc.cpp (revision 14014)
@@ -398,9 +398,9 @@
opToolPrefs.constrain = prefsData.opToolPrefs.constrain;
PageColors.ensureBlackAndWhite();
- if (prefsData.itemToolPrefs.shapePen != CommonStrings::None)
- PageColors.insert(prefsData.itemToolPrefs.shapePen, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapePen]);
- itemToolPrefs.shapePen = prefsData.itemToolPrefs.shapePen;
+ if (prefsData.itemToolPrefs.shapeLineColor != CommonStrings::None)
+ PageColors.insert(prefsData.itemToolPrefs.shapeLineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapeLineColor]);
+ itemToolPrefs.shapeLineColor = prefsData.itemToolPrefs.shapeLineColor;
if (prefsData.itemToolPrefs.lineColor != CommonStrings::None)
PageColors.insert(prefsData.itemToolPrefs.lineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.lineColor]);
itemToolPrefs.lineColor = prefsData.itemToolPrefs.lineColor;
@@ -410,15 +410,15 @@
if (prefsData.itemToolPrefs.textStrokeColor != CommonStrings::None)
PageColors.insert(prefsData.itemToolPrefs.textStrokeColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textStrokeColor]);
itemToolPrefs.textStrokeColor = prefsData.itemToolPrefs.textStrokeColor;
- if (prefsData.itemToolPrefs.shapeBrush != CommonStrings::None)
- PageColors.insert(prefsData.itemToolPrefs.shapeBrush, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapeBrush]);
- itemToolPrefs.shapeBrush = prefsData.itemToolPrefs.shapeBrush;
+ if (prefsData.itemToolPrefs.shapeFillColor != CommonStrings::None)
+ PageColors.insert(prefsData.itemToolPrefs.shapeFillColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.shapeFillColor]);
+ itemToolPrefs.shapeFillColor = prefsData.itemToolPrefs.shapeFillColor;
if (prefsData.itemToolPrefs.imageFillColor != CommonStrings::None)
PageColors.insert(prefsData.itemToolPrefs.imageFillColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.imageFillColor]);
itemToolPrefs.imageFillColor = prefsData.itemToolPrefs.imageFillColor;
- if (prefsData.itemToolPrefs.textBackground != CommonStrings::None)
- PageColors.insert(prefsData.itemToolPrefs.textBackground, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textBackground]);
- itemToolPrefs.textBackground = prefsData.itemToolPrefs.textBackground;
+ if (prefsData.itemToolPrefs.textFillColor != CommonStrings::None)
+ PageColors.insert(prefsData.itemToolPrefs.textFillColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textFillColor]);
+ itemToolPrefs.textFillColor = prefsData.itemToolPrefs.textFillColor;
if (prefsData.itemToolPrefs.textLineColor != CommonStrings::None)
PageColors.insert(prefsData.itemToolPrefs.textLineColor, prefsData.colorPrefs.DColors[prefsData.itemToolPrefs.textLineColor]);
@@ -1893,7 +1893,7 @@
addToPage->Margins.Left+addToPage->xOffset(),
addToPage->Margins.Top+addToPage->yOffset(), pageWidth-addToPage->Margins.Right-addToPage->Margins.Left,
pageHeight-addToPage->Margins.Bottom-addToPage->Margins.Top,
- 1, CommonStrings::None, itemToolPrefs.shapePen, true);
+ 1, CommonStrings::None, itemToolPrefs.shapeLineColor, true);
Items->at(z)->isAutoText = true;
Items->at(z)->Cols = qRound(PageSp);
Items->at(z)->ColGap = PageSpa;
@@ -2613,7 +2613,7 @@
{
found = false;
// Tool preferences colors
- if ((it.key() == itemToolPrefs.shapeBrush) || (it.key() == itemToolPrefs.shapePen) || (it.key() == itemToolPrefs.imageFillColor)
+ if ((it.key() == itemToolPrefs.shapeFillColor) || (it.key() == itemToolPrefs.shapeLineColor) || (it.key() == itemToolPrefs.imageFillColor)
|| (it.key() == itemToolPrefs.lineColor) || (it.key() == itemToolPrefs.textColor))
{
if (spot)
@@ -3704,7 +3704,7 @@
w1=iafData.width;
h1=iafData.height;
}
- z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, itemToolPrefs.shapeWidth, CommonStrings::None, itemToolPrefs.textColor, true);
+ z=itemAdd(iafData.frameType, PageItem::Unspecified, x1, y1, w1, h1, itemToolPrefs.shapeLineWidth, CommonStrings::None, itemToolPrefs.textColor, true);
if (z!=-1)
{
PageItem* currItem=Items->at(z);
@@ -3778,25 +3778,25 @@
newItem->AspectRatio = itemToolPrefs.imageAspectRatio;
newItem->IProfile = CMSSettings.DefaultImageRGBProfile;
newItem->IRender = CMSSettings.DefaultIntentImages;
- newItem->setFillShade(itemToolPrefs.imageFillShade);
+ newItem->setFillShade(itemToolPrefs.imageFillColorShade);
break;
case PageItem::LatexFrame:
#ifdef HAVE_OSG
case PageItem::OSGFrame:
#endif
- newItem->setFillShade(itemToolPrefs.imageFillShade);
+ newItem->setFillShade(itemToolPrefs.imageFillColorShade);
break;
case PageItem::TextFrame:
// newItem->setFontFillShade(itemToolPrefs.textShade);
// newItem->setFontStrokeShade(itemToolPrefs.textStrokeShade);
- newItem->setFillColor(itemToolPrefs.textBackground);
- newItem->setFillShade(itemToolPrefs.textBackgroundShade);
+ newItem->setFillColor(itemToolPrefs.textFillColor);
+ newItem->setFillShade(itemToolPrefs.textFillColorShade);
newItem->setLineColor(itemToolPrefs.textLineColor);
- newItem->setLineShade(itemToolPrefs.textLineShade);
+ newItem->setLineShade(itemToolPrefs.textLineColorShade);
break;
case PageItem::Line:
newItem->PLineArt = Qt::PenStyle(itemToolPrefs.lineStyle);
- newItem->setLineShade(itemToolPrefs.lineShade);
+ newItem->setLineShade(itemToolPrefs.lineColorShade);
break;
case PageItem::Polygon:
if(frameType!=PageItem::Rectangle && frameType!=PageItem::Ellipse)
@@ -3836,9 +3836,9 @@
//ItemType Polygon
if (itemType==PageItem::Polygon || itemType==PageItem::PolyLine)
{
- newItem->PLineArt = Qt::PenStyle(itemToolPrefs.shapeLineArt);
- newItem->setFillShade(itemToolPrefs.shapeShade);
- newItem->setLineShade(itemToolPrefs.shapeShade2);
+ newItem->PLineArt = Qt::PenStyle(itemToolPrefs.shapeLineStyle);
+ newItem->setFillShade(itemToolPrefs.shapeFillColorShade);
+ newItem->setLineShade(itemToolPrefs.shapeLineColorShade);
if (itemType == PageItem::Polygon)
newItem->ContourLine = newItem->PoLine.copy();
}
@@ -5649,12 +5649,12 @@
currItem->setFillColor(itemToolPrefs.imageFillColor);
case PageItem::TextFrame:
case PageItem::PathText:
- currItem->setFillColor(itemToolPrefs.textBackground);
+ currItem->setFillColor(itemToolPrefs.textFillColor);
break;
case PageItem::Line:
case PageItem::PolyLine:
case PageItem::Polygon:
- currItem->setFillColor(itemToolPrefs.shapeBrush);
+ currItem->setFillColor(itemToolPrefs.shapeFillColor);
break;
default:
break;
@@ -10266,7 +10266,7 @@
double gh = maxy - miny;
PageItem *high = Items->at(highestItem);
undoManager->setUndoEnabled(false);
- int z = itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, itemToolPrefs.shapeBrush, itemToolPrefs.shapePen, true);
+ int z = itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, itemToolPrefs.shapeFillColor, itemToolPrefs.shapeLineColor, true);
PageItem *neu = Items->takeAt(z);
Items->insert(lowestItem, neu);
neu->setItemName( tr("Group%1").arg(GroupCounter));
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp (revision 14013)
+++ scribus/prefsmanager.cpp (revision 14014)
@@ -237,19 +237,19 @@
//FIXME
//Black here causes issues when a colour set is loaded without "Black" in it.
//"Black" is created with wrong values. Eg SVG colour set
- appPrefs.itemToolPrefs.shapePen = "Black";
- appPrefs.itemToolPrefs.shapeBrush = "Black";
- appPrefs.itemToolPrefs.shapeShade = 100;
- appPrefs.itemToolPrefs.shapeShade2 = 100;
- appPrefs.itemToolPrefs.shapeLineArt = Qt::SolidLine;
- appPrefs.itemToolPrefs.shapeWidth = 0;
+ appPrefs.itemToolPrefs.shapeLineColor = "Black";
+ appPrefs.itemToolPrefs.shapeFillColor = "Black";
+ appPrefs.itemToolPrefs.shapeLineColorShade = 100;
+ appPrefs.itemToolPrefs.shapeFillColorShade = 100;
+ appPrefs.itemToolPrefs.shapeLineStyle = Qt::SolidLine;
+ appPrefs.itemToolPrefs.shapeLineWidth = 0;
appPrefs.itemToolPrefs.lineColor = "Black";
appPrefs.itemToolPrefs.textColor = "Black";
appPrefs.itemToolPrefs.textStrokeColor = "Black";
- appPrefs.itemToolPrefs.textBackground = CommonStrings::None;
+ appPrefs.itemToolPrefs.textFillColor = CommonStrings::None;
appPrefs.itemToolPrefs.textLineColor = CommonStrings::None;
- appPrefs.itemToolPrefs.textBackgroundShade = 100;
- appPrefs.itemToolPrefs.textLineShade = 100;
+ appPrefs.itemToolPrefs.textFillColorShade = 100;
+ appPrefs.itemToolPrefs.textLineColorShade = 100;
appPrefs.itemToolPrefs.textShade = 100;
appPrefs.itemToolPrefs.textStrokeShade = 100;
appPrefs.itemToolPrefs.textTabFillChar = "";
@@ -269,7 +269,7 @@
appPrefs.displayPrefs.controlCharColor = QColor(Qt::darkRed);
appPrefs.itemToolPrefs.textColumns = 1;
appPrefs.itemToolPrefs.textColumnGap = 0.0;
- appPrefs.itemToolPrefs.lineShade = 100;
+ appPrefs.itemToolPrefs.lineColorShade = 100;
appPrefs.itemToolPrefs.lineStyle = Qt::SolidLine;
appPrefs.itemToolPrefs.lineWidth = 1;
appPrefs.itemToolPrefs.lineStartArrow = 0;
@@ -278,7 +278,7 @@
appPrefs.opToolPrefs.magMax = 3200;
appPrefs.opToolPrefs.magStep = 200;
appPrefs.itemToolPrefs.imageFillColor = CommonStrings::None;
- appPrefs.itemToolPrefs.imageFillShade = 100;
+ appPrefs.itemToolPrefs.imageFillColorShade = 100;
appPrefs.itemToolPrefs.imageScaleX = 1;
appPrefs.itemToolPrefs.imageScaleY = 1;
appPrefs.guidesPrefs.guidePlacement = true;
@@ -1064,13 +1064,13 @@
return true;
if (settings.textStrokeColor == name)
return true;
- if (settings.textBackground == name)
+ if (settings.textFillColor == name)
return true;
if (settings.textLineColor == name)
return true;
- if (settings.shapePen == name)
+ if (settings.shapeLineColor == name)
return true;
- if (settings.shapeBrush == name)
+ if (settings.shapeFillColor == name)
return true;
if (settings.lineColor == name)
return true;
@@ -1090,14 +1090,14 @@
names.append(settings.textColor);
if (!names.contains(settings.textStrokeColor))
names.append(settings.textStrokeColor);
- if (!names.contains(settings.textBackground))
- names.append(settings.textBackground);
+ if (!names.contains(settings.textFillColor))
+ names.append(settings.textFillColor);
if (!names.contains(settings.textLineColor))
names.append(settings.textLineColor);
- if (!names.contains(settings.shapePen))
- names.append(settings.shapePen);
- if (!names.contains(settings.shapeBrush))
- names.append(settings.shapeBrush);
+ if (!names.contains(settings.shapeLineColor))
+ names.append(settings.shapeLineColor);
+ if (!names.contains(settings.shapeFillColor))
+ names.append(settings.shapeFillColor);
if (!names.contains(settings.lineColor))
names.append(settings.lineColor);
if (!names.contains(settings.imageFillColor))
@@ -1116,14 +1116,14 @@
settings.textColor = replaceMap[settings.textColor];
if (replaceMap.contains(settings.textStrokeColor))
settings.textStrokeColor = replaceMap[settings.textStrokeColor];
- if (replaceMap.contains(settings.textBackground))
- settings.textBackground = replaceMap[settings.textBackground];
+ if (replaceMap.contains(settings.textFillColor))
+ settings.textFillColor = replaceMap[settings.textFillColor];
if (replaceMap.contains(settings.textLineColor))
settings.textLineColor = replaceMap[settings.textLineColor];
- if (replaceMap.contains(settings.shapePen))
- settings.shapePen = replaceMap[settings.shapePen];
- if (replaceMap.contains(settings.shapeBrush))
- settings.shapeBrush = replaceMap[settings.shapeBrush];
+ if (replaceMap.contains(settings.shapeLineColor))
+ settings.shapeLineColor = replaceMap[settings.shapeLineColor];
+ if (replaceMap.contains(settings.shapeFillColor))
+ settings.shapeFillColor = replaceMap[settings.shapeFillColor];
if (replaceMap.contains(settings.lineColor))
settings.lineColor = replaceMap[settings.lineColor];
if (replaceMap.contains(settings.imageFillColor))
@@ -1140,16 +1140,16 @@
QString strokeText = appPrefs.itemToolPrefs.textStrokeColor;
if (!tmpSet.contains(strokeText) && strokeText != CommonStrings::None)
tmpSet[strokeText] = appPrefs.colorPrefs.DColors[strokeText];
- QString textBackGround = appPrefs.itemToolPrefs.textBackground;
- if (!tmpSet.contains(textBackGround) && textBackGround != CommonStrings::None)
- tmpSet[textBackGround] = appPrefs.colorPrefs.DColors[textBackGround];
+ QString textFillColor = appPrefs.itemToolPrefs.textFillColor;
+ if (!tmpSet.contains(textFillColor) && textFillColor != CommonStrings::None)
+ tmpSet[textFillColor] = appPrefs.colorPrefs.DColors[textFillColor];
QString textLineColor = appPrefs.itemToolPrefs.textLineColor;
if (!tmpSet.contains(textLineColor) && textLineColor != CommonStrings::None)
tmpSet[textLineColor] = appPrefs.colorPrefs.DColors[textLineColor];
- QString pen = appPrefs.itemToolPrefs.shapePen;
+ QString pen = appPrefs.itemToolPrefs.shapeLineColor;
if (!tmpSet.contains(pen) && pen != CommonStrings::None)
tmpSet[pen] = appPrefs.colorPrefs.DColors[pen];
- QString brush = appPrefs.itemToolPrefs.shapeBrush;
+ QString brush = appPrefs.itemToolPrefs.shapeFillColor;
if (!tmpSet.contains(brush) && brush != CommonStrings::None)
tmpSet[brush] = appPrefs.colorPrefs.DColors[brush];
QString penLine = appPrefs.itemToolPrefs.lineColor;
@@ -1325,33 +1325,33 @@
dc3.setAttribute("StrikeThruWidth", appPrefs.typoPrefs.valueStrikeThruWidth / 10.0);
elem.appendChild(dc3);
QDomElement dc9=docu.createElement("TOOLS");
- dc9.setAttribute("PEN",appPrefs.itemToolPrefs.shapePen);
- dc9.setAttribute("BRUSH",appPrefs.itemToolPrefs.shapeBrush);
+ dc9.setAttribute("PEN",appPrefs.itemToolPrefs.shapeLineColor);
+ dc9.setAttribute("BRUSH",appPrefs.itemToolPrefs.shapeFillColor);
dc9.setAttribute("PENLINE",appPrefs.itemToolPrefs.lineColor);
dc9.setAttribute("PENTEXT",appPrefs.itemToolPrefs.textColor);
dc9.setAttribute("StrokeText",appPrefs.itemToolPrefs.textStrokeColor);
- dc9.setAttribute("TextBackGround", appPrefs.itemToolPrefs.textBackground);
+ dc9.setAttribute("TextBackGround", appPrefs.itemToolPrefs.textFillColor);
dc9.setAttribute("TextLineColor", appPrefs.itemToolPrefs.textLineColor);
- dc9.setAttribute("TextBackGroundShade", appPrefs.itemToolPrefs.textBackgroundShade);
- dc9.setAttribute("TextLineShade", appPrefs.itemToolPrefs.textLineShade);
+ dc9.setAttribute("TextBackGroundShade", appPrefs.itemToolPrefs.textFillColorShade);
+ dc9.setAttribute("TextLineShade", appPrefs.itemToolPrefs.textLineColorShade);
dc9.setAttribute("TextPenShade", appPrefs.itemToolPrefs.textShade);
dc9.setAttribute("TextStrokeShade", appPrefs.itemToolPrefs.textStrokeShade);
dc9.setAttribute("TEXTCOL",appPrefs.itemToolPrefs.textColumns);
dc9.setAttribute("TEXTGAP",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textColumnGap));
dc9.setAttribute("TabWidth",ScCLocale::toQStringC(appPrefs.itemToolPrefs.textTabWidth));
dc9.setAttribute("TabFill",appPrefs.itemToolPrefs.textTabFillChar);
- dc9.setAttribute("STIL",appPrefs.itemToolPrefs.shapeLineArt);
+ dc9.setAttribute("STIL",appPrefs.itemToolPrefs.shapeLineStyle);
dc9.setAttribute("STILLINE",appPrefs.itemToolPrefs.lineStyle);
- dc9.setAttribute("WIDTH",ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeWidth));
+ dc9.setAttribute("WIDTH",ScCLocale::toQStringC(appPrefs.itemToolPrefs.shapeLineWidth));
dc9.setAttribute("WIDTHLINE",ScCLocale::toQStringC(appPrefs.itemToolPrefs.lineWidth));
- dc9.setAttribute("PENSHADE",appPrefs.itemToolPrefs.shapeShade2);
- dc9.setAttribute("LINESHADE",appPrefs.itemToolPrefs.lineShade);
- dc9.setAttribute("BRUSHSHADE",appPrefs.itemToolPrefs.shapeShade);
+ dc9.setAttribute("PENSHADE",appPrefs.itemToolPrefs.shapeLineColorShade);
+ dc9.setAttribute("LINESHADE",appPrefs.itemToolPrefs.lineColorShade);
+ dc9.setAttribute("BRUSHSHADE",appPrefs.itemToolPrefs.shapeFillColorShade);
dc9.setAttribute("MAGMIN",appPrefs.opToolPrefs.magMin);
dc9.setAttribute("MAGMAX",appPrefs.opToolPrefs.magMax);
dc9.setAttribute("MAGSTEP",appPrefs.opToolPrefs.magStep);
dc9.setAttribute("CPICT",appPrefs.itemToolPrefs.imageFillColor);
- dc9.setAttribute("PICTSHADE",appPrefs.itemToolPrefs.imageFillShade);
+ dc9.setAttribute("PICTSHADE",appPrefs.itemToolPrefs.imageFillColorShade);
dc9.setAttribute("PICTSCX",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleX));
dc9.setAttribute("PICTSCY",ScCLocale::toQStringC(appPrefs.itemToolPrefs.imageScaleY));
dc9.setAttribute("POLYC", appPrefs.itemToolPrefs.polyCorners);
@@ -1889,28 +1889,28 @@
}
if (dc.tagName()=="TOOLS")
{
- appPrefs.itemToolPrefs.shapePen = dc.attribute("PEN");
- appPrefs.itemToolPrefs.shapeBrush = dc.attribute("BRUSH");
+ appPrefs.itemToolPrefs.shapeLineColor = dc.attribute("PEN");
+ appPrefs.itemToolPrefs.shapeFillColor = dc.attribute("BRUSH");
appPrefs.itemToolPrefs.lineColor = dc.attribute("PENLINE");
appPrefs.itemToolPrefs.textColor = dc.attribute("PENTEXT");
appPrefs.itemToolPrefs.textStrokeColor = dc.attribute("StrokeText", appPrefs.itemToolPrefs.textColor);
- appPrefs.itemToolPrefs.textBackground = dc.attribute("TextBackGround", CommonStrings::None);
+ appPrefs.itemToolPrefs.textFillColor = dc.attribute("TextBackGround", CommonStrings::None);
appPrefs.itemToolPrefs.textLineColor = dc.attribute("TextLineColor", CommonStrings::None);
- appPrefs.itemToolPrefs.textBackgroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
- appPrefs.itemToolPrefs.textLineShade = dc.attribute("TextLineShade", "100").toInt();
+ appPrefs.itemToolPrefs.textFillColorShade = dc.attribute("TextBackGroundShade", "100").toInt();
+ appPrefs.itemToolPrefs.textLineColorShade = dc.attribute("TextLineShade", "100").toInt();
appPrefs.itemToolPrefs.textShade = dc.attribute("TextPenShade", "100").toInt();
appPrefs.itemToolPrefs.textStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
appPrefs.itemToolPrefs.textColumns = dc.attribute("TEXTCOL", "1").toInt();
appPrefs.itemToolPrefs.textColumnGap = ScCLocale::toDoubleC(dc.attribute("TEXTGAP"), 0.0);
appPrefs.itemToolPrefs.textTabFillChar = dc.attribute("TabFill", "");
appPrefs.itemToolPrefs.textTabWidth = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
- appPrefs.itemToolPrefs.shapeLineArt = dc.attribute("STIL").toInt();
+ appPrefs.itemToolPrefs.shapeLineStyle = dc.attribute("STIL").toInt();
appPrefs.itemToolPrefs.lineStyle = dc.attribute("STILLINE").toInt();
- appPrefs.itemToolPrefs.shapeWidth = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 0.0);
+ appPrefs.itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 0.0);
appPrefs.itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
- appPrefs.itemToolPrefs.shapeShade2 = dc.attribute("PENSHADE").toInt();
- appPrefs.itemToolPrefs.lineShade = dc.attribute("LINESHADE").toInt();
- appPrefs.itemToolPrefs.shapeShade = dc.attribute("BRUSHSHADE").toInt();
+ appPrefs.itemToolPrefs.shapeLineColorShade = dc.attribute("PENSHADE").toInt();
+ appPrefs.itemToolPrefs.lineColorShade = dc.attribute("LINESHADE").toInt();
+ appPrefs.itemToolPrefs.shapeFillColorShade = dc.attribute("BRUSHSHADE").toInt();
appPrefs.opToolPrefs.magMin = dc.attribute("MAGMIN", "10").toInt();
appPrefs.opToolPrefs.magMax = dc.attribute("MAGMAX", "3200").toInt();
appPrefs.opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
@@ -1918,7 +1918,7 @@
if (appPrefs.opToolPrefs.magStep<100)
appPrefs.opToolPrefs.magStep=200;
appPrefs.itemToolPrefs.imageFillColor = dc.attribute("CPICT", CommonStrings::None);
- appPrefs.itemToolPrefs.imageFillShade = dc.attribute("PICTSHADE", "100").toInt();
+ appPrefs.itemToolPrefs.imageFillColorShade = dc.attribute("PICTSHADE", "100").toInt();
appPrefs.itemToolPrefs.imageScaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
appPrefs.itemToolPrefs.imageScaleY = ScCLocale::toDoubleC(dc.attribute("PICTSCY"), 1.0);
appPrefs.itemToolPrefs.imageScaleType = static_cast<bool>(dc.attribute("PSCALE", "1").toInt());
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp (revision 14013)
+++ scribus/scribusXml.cpp (revision 14014)
@@ -796,9 +796,9 @@
vg.charStyle().setFont(prefsManager->appPrefs.fontPrefs.AvailFonts[tmpf]);
vg.charStyle().setFontSize(qRound(attrAsDbl(attrs, "FONTSIZE", 12.0) * 10.0));
vg.charStyle().setFeatures(static_cast<StyleFlag>(attrAsInt(attrs, "EFFECT", 0)).featureList());
- vg.charStyle().setFillColor(attrAsString(attrs, "FCOLOR", doc->itemToolPrefs.shapeBrush));
+ vg.charStyle().setFillColor(attrAsString(attrs, "FCOLOR", doc->itemToolPrefs.shapeFillColor));
vg.charStyle().setFillShade(attrAsInt(attrs, "FSHADE", 100));
- vg.charStyle().setStrokeColor(attrAsString(attrs, "SCOLOR", doc->itemToolPrefs.shapePen));
+ vg.charStyle().setStrokeColor(attrAsString(attrs, "SCOLOR", doc->itemToolPrefs.shapeLineColor));
vg.charStyle().setStrokeShade(attrAsInt(attrs, "SSHADE", 100));
vg.charStyle().setShadowXOffset(qRound(attrAsDbl(attrs, "TXTSHX", 5.0) * 10));
vg.charStyle().setShadowYOffset(qRound(attrAsDbl(attrs, "TXTSHY", -5.0) * 10));
Index: scribus/prefsstructs.h
===================================================================
--- scribus/prefsstructs.h (revision 14013)
+++ scribus/prefsstructs.h (revision 14014)
@@ -150,34 +150,34 @@
struct ItemToolPrefs
{
/* Texttool */
- QString textFont;
- int textSize;
- QString textColor;
- int textShade;
- QString textStrokeColor;
- int textStrokeShade;
- QString textBackground;
- QString textLineColor;
- int textBackgroundShade;
- int textLineShade;
- int textColumns;
- double textColumnGap;
- QString textTabFillChar;
- double textTabWidth;
+ QString textFont; //! Default font for text frames, should be default font for default style
+ int textSize; //! Default font size
+ QString textColor; //! Default text color
+ int textShade; //! Default text color shade
+ QString textStrokeColor; //! Default text stroke color
+ int textStrokeShade; //! Default text stroke color shade
+ QString textFillColor; //! Default text frame fill color
+ QString textLineColor; //! Default text frame line color
+ int textFillColorShade; //! Default text frame fill shade
+ int textLineColorShade; //! Default text frame line shade
+ int textColumns; //! Default number of columns in a text frame
+ double textColumnGap; //! Default gap between columns of a text frame
+ QString textTabFillChar; //! Default tab fill character
+ double textTabWidth; //! Default tab width
/* ShapeTool */
- QString shapePen;
- QString shapeBrush;
- int shapeShade;
- int shapeShade2;
- int shapeLineArt;
- double shapeWidth;
+ QString shapeLineColor; //! Default shape line color
+ QString shapeFillColor; //! Default shape fill color
+ int shapeFillColorShade; //! Default shape fill color shade
+ int shapeLineColorShade; //! Default shape line color shade
+ int shapeLineStyle; //! Line style of shapes
+ double shapeLineWidth; //! Line width of shape
/* Line Tool */
- QString lineColor;
- int lineShade;
- double lineWidth;
- int lineStyle;
- int lineStartArrow;
- int lineEndArrow;
+ QString lineColor; //! Color of a line
+ int lineColorShade; //! Shade of line color
+ double lineWidth; //! Width of line
+ int lineStyle; //! Style of line
+ int lineStartArrow; //! Starting arrow, 0 = none
+ int lineEndArrow; //! Ending arrow, 0 = none
/* Regular Polygon Tool */
int polyCorners; //! Number of corners for a polygon
int polyFactorValue; //! Factor as an integer????
@@ -186,14 +186,14 @@
double polyRotation; //! Rotation of a polygon
double polyCurvature; //! Curvature of polygon
/* Image Tool */
- QString imageFillColor;
- int imageFillShade;
- double imageScaleX;
- double imageScaleY;
- bool imageScaleType;
- bool imageAspectRatio;
- int imageLowResType;
- bool imageUseEmbeddedPath;
+ QString imageFillColor; //! Default fill color of an image frame
+ int imageFillColorShade; //! Default shade of fill color of an image grame
+ double imageScaleX; //! X scale of an image within an image frame
+ double imageScaleY; //! Y scale of an image within an image frame
+ bool imageScaleType; //! Scale type of image
+ bool imageAspectRatio; //! Use stored aspect ratio for the image
+ int imageLowResType; //! Preview type for an image frame
+ bool imageUseEmbeddedPath; //! Use embedded path, eg from an EPS etc.
};
struct OperatorToolPrefs
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp (revision 14013)
+++ scribus/pageitem.cpp (revision 14014)
@@ -317,7 +317,7 @@
patternRotation = 0;
m_lineWidth = w2;
Oldm_lineWidth = w2;
- PLineArt = Qt::PenStyle(m_Doc->itemToolPrefs.shapeLineArt);
+ PLineArt = Qt::PenStyle(m_Doc->itemToolPrefs.shapeLineStyle);
PLineEnd = Qt::FlatCap;
PLineJoin = Qt::MiterJoin;
Select = false;
@@ -451,12 +451,12 @@
}
else
{
- if (m_Doc->itemToolPrefs.shapeBrush != CommonStrings::None)
+ if (m_Doc->itemToolPrefs.shapeFillColor != CommonStrings::None)
{
- const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
+ const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeFillColor];
QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
- fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
- fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
+ fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeFillColor, 100);
+ fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeFillColor, 100);
}
else
{
@@ -469,12 +469,12 @@
}
else
{
- if (m_Doc->itemToolPrefs.shapePen != CommonStrings::None)
+ if (m_Doc->itemToolPrefs.shapeLineColor != CommonStrings::None)
{
- const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
+ const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeLineColor];
QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
- fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
- fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
+ fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeLineColor, 100);
+ fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeLineColor, 100);
}
else if (m_Doc->PageColors.contains("Black"))
{
@@ -2281,12 +2281,12 @@
tmp = m_Doc->itemToolPrefs.imageFillColor;
case TextFrame:
case PathText:
- tmp = m_Doc->itemToolPrefs.textBackground;
+ tmp = m_Doc->itemToolPrefs.textFillColor;
break;
case Line:
case PolyLine:
case Polygon:
- tmp = m_Doc->itemToolPrefs.shapeBrush;
+ tmp = m_Doc->itemToolPrefs.shapeFillColor;
break;
default:
break;
@@ -2391,7 +2391,7 @@
case ImageFrame:
case LatexFrame:
case OSGFrame:
- tmp = m_Doc->itemToolPrefs.shapePen;
+ tmp = m_Doc->itemToolPrefs.shapeLineColor;
break;
default:
break;
@@ -2460,14 +2460,14 @@
case ImageFrame:
case LatexFrame:
case OSGFrame:
- lineColorVal = m_Doc->itemToolPrefs.shapePen;
+ lineColorVal = m_Doc->itemToolPrefs.shapeLineColor;
break;
default:
break;
}
}
if (!m_Doc->PageColors.contains(lineColorVal))
- lineColorVal = m_Doc->itemToolPrefs.shapePen;
+ lineColorVal = m_Doc->itemToolPrefs.shapeLineColor;
const ScColor& col = m_Doc->PageColors[lineColorVal];
strokeQColor = ScColorEngine::getShadeColorProof(col, m_Doc, lineShadeVal);
}
@@ -2492,12 +2492,12 @@
fillColorVal = m_Doc->itemToolPrefs.imageFillColor;
case TextFrame:
case PathText:
- fillColorVal = m_Doc->itemToolPrefs.textBackground;
+ fillColorVal = m_Doc->itemToolPrefs.textFillColor;
break;
case Line:
case PolyLine:
case Polygon:
- fillColorVal = m_Doc->itemToolPrefs.shapeBrush;
+ fillColorVal = m_Doc->itemToolPrefs.shapeFillColor;
break;
default:
break;
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp (revision 14013)
+++ scribus/scribusview.cpp (revision 14014)
@@ -978,7 +978,7 @@
//SeleItemPos is from 1.2.x. Needs reenabling for dragging *TO* a frame
if ((fi.exists()) && (img) && !selectedItemByDrag && !vectorFile)// && (!SeleItemPos(e->pos())))
{
- int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs.shapeWidth, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
+ int z = Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, dropPosDoc.x(), dropPosDoc.y(), 1, 1, Doc->itemToolPrefs.shapeLineWidth, Doc->itemToolPrefs.imageFillColor, CommonStrings::None, true);
PageItem *b = Doc->Items->at(z);
b->LayerID = Doc->activeLayer();
Doc->LoadPict(url.toLocalFile(), b->ItemNr);
Index: scribus/ui/prefs.cpp
===================================================================
--- scribus/ui/prefs.cpp (revision 14013)
+++ scribus/ui/prefs.cpp (revision 14014)
@@ -470,19 +470,19 @@
prefsManager->appPrefs.typoPrefs.valueUnderlineWidth = qRound(tabTypo->underlineWidth->value() * 10);
prefsManager->appPrefs.typoPrefs.valueStrikeThruPos = qRound(tabTypo->strikethruPos->value() * 10);
prefsManager->appPrefs.typoPrefs.valueStrikeThruWidth = qRound(tabTypo->strikethruWidth->value() * 10);
- prefsManager->appPrefs.itemToolPrefs.textBackground = tabTools->colorComboTextBackground->currentText();
- if (prefsManager->appPrefs.itemToolPrefs.textBackground == CommonStrings::tr_NoneColor)
- prefsManager->appPrefs.itemToolPrefs.textBackground = CommonStrings::None;
+ prefsManager->appPrefs.itemToolPrefs.textFillColor = tabTools->colorComboTextBackground->currentText();
+ if (prefsManager->appPrefs.itemToolPrefs.textFillColor == CommonStrings::tr_NoneColor)
+ prefsManager->appPrefs.itemToolPrefs.textFillColor = CommonStrings::None;
prefsManager->appPrefs.itemToolPrefs.textLineColor = tabTools->colorComboTextLine->currentText();
if (prefsManager->appPrefs.itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor)
prefsManager->appPrefs.itemToolPrefs.textLineColor = CommonStrings::None;
- prefsManager->appPrefs.itemToolPrefs.textBackgroundShade = tabTools->shadingTextBack->value();
- prefsManager->appPrefs.itemToolPrefs.textLineShade = tabTools->shadingTextLine->value();
+ prefsManager->appPrefs.itemToolPrefs.textFillColorShade = tabTools->shadingTextBack->value();
+ prefsManager->appPrefs.itemToolPrefs.textLineColorShade = tabTools->shadingTextLine->value();
prefsManager->appPrefs.itemToolPrefs.textShade = tabTools->shadingText->value();
prefsManager->appPrefs.itemToolPrefs.textStrokeShade = tabTools->shadingTextStroke->value();
- prefsManager->appPrefs.itemToolPrefs.shapePen = tabTools->colorComboLineShape->currentText();
- if (prefsManager->appPrefs.itemToolPrefs.shapePen == CommonStrings::tr_NoneColor)
- prefsManager->appPrefs.itemToolPrefs.shapePen = CommonStrings::None;
+ prefsManager->appPrefs.itemToolPrefs.shapeLineColor = tabTools->colorComboLineShape->currentText();
+ if (prefsManager->appPrefs.itemToolPrefs.shapeLineColor == CommonStrings::tr_NoneColor)
+ prefsManager->appPrefs.itemToolPrefs.shapeLineColor = CommonStrings::None;
prefsManager->appPrefs.itemToolPrefs.textColor = tabTools->colorComboText->currentText();
if (prefsManager->appPrefs.itemToolPrefs.textColor == CommonStrings::tr_NoneColor)
prefsManager->appPrefs.itemToolPrefs.textColor = CommonStrings::None;
@@ -492,11 +492,11 @@
prefsManager->appPrefs.itemToolPrefs.textColumns = tabTools->columnsText->value();
prefsManager->appPrefs.itemToolPrefs.textColumnGap = tabTools->gapText->value() / prefsUnitRatio;
prefsManager->appPrefs.itemToolPrefs.textTabWidth = tabTools->gapTab->value() / prefsUnitRatio;
- prefsManager->appPrefs.itemToolPrefs.shapeBrush = tabTools->comboFillShape->currentText();
- if (prefsManager->appPrefs.itemToolPrefs.shapeBrush == CommonStrings::tr_NoneColor)
- prefsManager->appPrefs.itemToolPrefs.shapeBrush = CommonStrings::None;
- prefsManager->appPrefs.itemToolPrefs.shapeShade = tabTools->shadingFillShape->value();
- prefsManager->appPrefs.itemToolPrefs.shapeShade2 = tabTools->shadingLineShape->value();
+ prefsManager->appPrefs.itemToolPrefs.shapeFillColor = tabTools->comboFillShape->currentText();
+ if (prefsManager->appPrefs.itemToolPrefs.shapeFillColor == CommonStrings::tr_NoneColor)
+ prefsManager->appPrefs.itemToolPrefs.shapeFillColor = CommonStrings::None;
+ prefsManager->appPrefs.itemToolPrefs.shapeFillColorShade = tabTools->shadingFillShape->value();
+ prefsManager->appPrefs.itemToolPrefs.shapeLineColorShade = tabTools->shadingLineShape->value();
switch (tabTools->tabFillCombo->currentIndex())
{
case 0:
@@ -515,12 +515,12 @@
prefsManager->appPrefs.itemToolPrefs.textTabFillChar = tabTools->tabFillCombo->currentText().right(1);
break;
}
- prefsManager->appPrefs.itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
- prefsManager->appPrefs.itemToolPrefs.shapeWidth = tabTools->lineWidthShape->value();
+ prefsManager->appPrefs.itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
+ prefsManager->appPrefs.itemToolPrefs.shapeLineWidth = tabTools->lineWidthShape->value();
prefsManager->appPrefs.itemToolPrefs.lineColor = tabTools->colorComboLine->currentText();
if (prefsManager->appPrefs.itemToolPrefs.lineColor == CommonStrings::tr_NoneColor)
prefsManager->appPrefs.itemToolPrefs.lineColor = CommonStrings::None;
- prefsManager->appPrefs.itemToolPrefs.lineShade = tabTools->shadingLine->value();
+ prefsManager->appPrefs.itemToolPrefs.lineColorShade = tabTools->shadingLine->value();
prefsManager->appPrefs.itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
prefsManager->appPrefs.itemToolPrefs.lineWidth = tabTools->lineWidthLine->value();
prefsManager->appPrefs.itemToolPrefs.lineStartArrow = tabTools->startArrow->currentIndex();
@@ -531,7 +531,7 @@
prefsManager->appPrefs.itemToolPrefs.imageFillColor = tabTools->comboFillImage->currentText();
if (prefsManager->appPrefs.itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor)
prefsManager->appPrefs.itemToolPrefs.imageFillColor = CommonStrings::None;
- prefsManager->appPrefs.itemToolPrefs.imageFillShade = tabTools->shadingFillImage->value();
+ prefsManager->appPrefs.itemToolPrefs.imageFillColorShade = tabTools->shadingFillImage->value();
prefsManager->appPrefs.itemToolPrefs.imageScaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
prefsManager->appPrefs.itemToolPrefs.imageScaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
prefsManager->appPrefs.itemToolPrefs.imageScaleType = tabTools->buttonGroup3->isChecked();
Index: scribus/ui/reformdoc.cpp
===================================================================
--- scribus/ui/reformdoc.cpp (revision 14013)
+++ scribus/ui/reformdoc.cpp (revision 14014)
@@ -369,29 +369,29 @@
currDoc->itemToolPrefs.textColor = tabTools->colorComboText->currentText();
if (currDoc->itemToolPrefs.textColor == CommonStrings::tr_NoneColor)
currDoc->itemToolPrefs.textColor = CommonStrings::None;
- currDoc->itemToolPrefs.textBackground = tabTools->colorComboTextBackground->currentText();
- if (currDoc->itemToolPrefs.textBackground == CommonStrings::tr_NoneColor)
- currDoc->itemToolPrefs.textBackground = CommonStrings::None;
+ currDoc->itemToolPrefs.textFillColor = tabTools->colorComboTextBackground->currentText();
+ if (currDoc->itemToolPrefs.textFillColor == CommonStrings::tr_NoneColor)
+ currDoc->itemToolPrefs.textFillColor = CommonStrings::None;
currDoc->itemToolPrefs.textLineColor = tabTools->colorComboTextLine->currentText();
if (currDoc->itemToolPrefs.textLineColor == CommonStrings::tr_NoneColor)
currDoc->itemToolPrefs.textLineColor = CommonStrings::None;
- currDoc->itemToolPrefs.textBackgroundShade = tabTools->shadingTextBack->value();
- currDoc->itemToolPrefs.textLineShade = tabTools->shadingTextLine->value();
+ currDoc->itemToolPrefs.textFillColorShade = tabTools->shadingTextBack->value();
+ currDoc->itemToolPrefs.textLineColorShade = tabTools->shadingTextLine->value();
currDoc->itemToolPrefs.textShade = tabTools->shadingText->value();
currDoc->itemToolPrefs.textStrokeShade = tabTools->shadingTextStroke->value();
currDoc->itemToolPrefs.textColumns = tabTools->columnsText->value();
currDoc->itemToolPrefs.textColumnGap = tabTools->gapText->value() / currDoc->unitRatio();
currDoc->itemToolPrefs.textTabWidth = tabTools->gapTab->value() / currDoc->unitRatio();
- currDoc->itemToolPrefs.shapePen = tabTools->colorComboLineShape->currentText();
- if (currDoc->itemToolPrefs.shapePen == CommonStrings::tr_NoneColor)
- currDoc->itemToolPrefs.shapePen = CommonStrings::None;
- currDoc->itemToolPrefs.shapeBrush = tabTools->comboFillShape->currentText();
- if (currDoc->itemToolPrefs.shapeBrush == CommonStrings::tr_NoneColor)
- currDoc->itemToolPrefs.shapeBrush = CommonStrings::None;
- currDoc->itemToolPrefs.shapeShade = tabTools->shadingFillShape->value();
- currDoc->itemToolPrefs.shapeShade2 = tabTools->shadingLineShape->value();
- currDoc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
- currDoc->itemToolPrefs.shapeWidth = tabTools->lineWidthShape->value();
+ currDoc->itemToolPrefs.shapeLineColor = tabTools->colorComboLineShape->currentText();
+ if (currDoc->itemToolPrefs.shapeLineColor == CommonStrings::tr_NoneColor)
+ currDoc->itemToolPrefs.shapeLineColor = CommonStrings::None;
+ currDoc->itemToolPrefs.shapeFillColor = tabTools->comboFillShape->currentText();
+ if (currDoc->itemToolPrefs.shapeFillColor == CommonStrings::tr_NoneColor)
+ currDoc->itemToolPrefs.shapeFillColor = CommonStrings::None;
+ currDoc->itemToolPrefs.shapeFillColorShade = tabTools->shadingFillShape->value();
+ currDoc->itemToolPrefs.shapeLineColorShade = tabTools->shadingLineShape->value();
+ currDoc->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleShape->currentIndex()) + 1;
+ currDoc->itemToolPrefs.shapeLineWidth = tabTools->lineWidthShape->value();
currDoc->itemToolPrefs.lineStartArrow = tabTools->startArrow->currentIndex();
currDoc->itemToolPrefs.lineEndArrow = tabTools->endArrow->currentIndex();
currDoc->opToolPrefs.magMin = tabTools->minimumZoom->value();
@@ -400,13 +400,13 @@
currDoc->itemToolPrefs.lineColor = tabTools->colorComboLine->currentText();
if (currDoc->itemToolPrefs.lineColor == CommonStrings::tr_NoneColor)
currDoc->itemToolPrefs.lineColor = CommonStrings::None;
- currDoc->itemToolPrefs.lineShade = tabTools->shadingLine->value();
+ currDoc->itemToolPrefs.lineColorShade = tabTools->shadingLine->value();
currDoc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(tabTools->comboStyleLine->currentIndex()) + 1;
currDoc->itemToolPrefs.lineWidth = tabTools->lineWidthLine->value();
currDoc->itemToolPrefs.imageFillColor = tabTools->comboFillImage->currentText();
if (currDoc->itemToolPrefs.imageFillColor == CommonStrings::tr_NoneColor)
currDoc->itemToolPrefs.imageFillColor = CommonStrings::None;
- currDoc->itemToolPrefs.imageFillShade = tabTools->shadingFillImage->value();
+ currDoc->itemToolPrefs.imageFillColorShade = tabTools->shadingFillImage->value();
currDoc->itemToolPrefs.imageScaleX = static_cast<double>(tabTools->scalingHorizontal->value()) / 100.0;
currDoc->itemToolPrefs.imageScaleY = static_cast<double>(tabTools->scalingVertical->value()) / 100.0;
currDoc->itemToolPrefs.imageScaleType = tabTools->buttonGroup3->isChecked();
Index: scribus/ui/tabtools.cpp
===================================================================
--- scribus/ui/tabtools.cpp (revision 14013)
+++ scribus/ui/tabtools.cpp (revision 14014)
@@ -677,16 +677,16 @@
colorComboTextBackground->clear();
colorComboTextBackground->addItem(CommonStrings::tr_NoneColor);
- if (itemPrefsData->textBackground == CommonStrings::None)
+ if (itemPrefsData->textFillColor == CommonStrings::None)
colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboTextBackground->insertFancyItem( itc.value(), docu, itc.key() );
- if (itc.key() == itemPrefsData->textBackground)
+ if (itc.key() == itemPrefsData->textFillColor)
colorComboTextBackground->setCurrentIndex(colorComboTextBackground->count()-1);
}
- shadingTextBack->setValue(itemPrefsData->textBackgroundShade);
+ shadingTextBack->setValue(itemPrefsData->textFillColorShade);
colorComboTextLine->clear();
colorComboTextLine->addItem(CommonStrings::tr_NoneColor);
@@ -699,7 +699,7 @@
if (itc.key() == itemPrefsData->textLineColor)
colorComboTextLine->setCurrentIndex(colorComboTextLine->count()-1);
}
- shadingTextLine->setValue(itemPrefsData->textLineShade);
+ shadingTextLine->setValue(itemPrefsData->textLineColorShade);
tabFillCombo->clear();
tabFillCombo->addItem( tr("None", "tab fill" ));
@@ -737,33 +737,33 @@
colorComboLineShape->clear();
colorComboLineShape->addItem(CommonStrings::tr_NoneColor);
- if (itemPrefsData->shapePen == CommonStrings::None)
+ if (itemPrefsData->shapeLineColor == CommonStrings::None)
colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
colorComboLineShape->insertFancyItem( itc.value(), docu, itc.key() );
- if (itc.key() == itemPrefsData->shapePen)
+ if (itc.key() == itemPrefsData->shapeLineColor)
colorComboLineShape->setCurrentIndex(colorComboLineShape->count()-1);
}
- shadingLineShape->setValue(itemPrefsData->shapeShade2);
+ shadingLineShape->setValue(itemPrefsData->shapeLineColorShade);
comboFillShape->clear();
comboFillShape->addItem( tr("None"));
- if (itemPrefsData->shapeBrush == CommonStrings::None)
+ if (itemPrefsData->shapeFillColor == CommonStrings::None)
comboFillShape->setCurrentIndex(comboFillShape->count()-1);
endOfColorList=colorList->end();
for (itc = colorList->begin(); itc != endOfColorList; ++itc)
{
comboFillShape->insertFancyItem( itc.value(), docu, itc.key() );
- if (itc.key() == itemPrefsData->shapeBrush)
+ if (itc.key() == itemPrefsData->shapeFillColor)
comboFillShape->setCurrentIndex(comboFillShape->count()-1);
}
- shadingFillShape->setValue(itemPrefsData->shapeShade);
- comboStyleShape->setCurrentIndex(static_cast<int>(itemPrefsData->shapeLineArt) - 1);
+ shadingFillShape->setValue(itemPrefsData->shapeFillColorShade);
+ comboStyleShape->setCurrentIndex(static_cast<int>(itemPrefsData->shapeLineStyle) - 1);
//CB: shapeWidth? or lineWidth?
- lineWidthShape->setValue(itemPrefsData->shapeWidth);
+ lineWidthShape->setValue(itemPrefsData->shapeLineWidth);
colorComboLine->clear();
colorComboLine->addItem(CommonStrings::tr_NoneColor);
@@ -777,7 +777,7 @@
colorComboLine->setCurrentIndex(colorComboLine->count()-1);
}
- shadingLine->setValue(itemPrefsData->lineShade);
+ shadingLine->setValue(itemPrefsData->lineColorShade);
comboStyleLine->setCurrentIndex(static_cast<int>(itemPrefsData->lineStyle) - 1);
if (docu != 0)
@@ -812,7 +812,7 @@
comboFillImage->setCurrentIndex(comboFillImage->count()-1);
}
- shadingFillImage->setValue( itemPrefsData->imageFillShade );
+ shadingFillImage->setValue( itemPrefsData->imageFillColorShade );
embeddedPath->setChecked(itemPrefsData->imageUseEmbeddedPath);
switch (itemPrefsData->imageLowResType)
{
Index: scribus/ui/smlinestyle.cpp
===================================================================
--- scribus/ui/smlinestyle.cpp (revision 14013)
+++ scribus/ui/smlinestyle.cpp (revision 14014)
@@ -174,7 +174,7 @@
return QString::null;
struct SingleLine sl;
sl.Color = doc_->itemToolPrefs.lineColor;
- sl.Shade = doc_->itemToolPrefs.lineShade;
+ sl.Shade = doc_->itemToolPrefs.lineColorShade;
sl.Dash = Qt::SolidLine;//Docu->itemToolPrefs.;
sl.LineEnd = Qt::FlatCap;//Docu->itemToolPrefs.;
sl.LineJoin = Qt::MiterJoin;//Docu->itemToolPrefs.;
Index: scribus/plugins/scriptplugin/cmdobj.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdobj.cpp (revision 14013)
+++ scribus/plugins/scriptplugin/cmdobj.cpp (revision 14014)
@@ -29,8 +29,8 @@
int i = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Rectangle,
pageUnitXToDocX(x), pageUnitYToDocY(y),
ValueToPoint(w), ValueToPoint(h),
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor, true);
// ScCore->primaryMainWindow()->doc->setRedrawBounding(ScCore->primaryMainWindow()->doc->Items->at(i));
if (Name != EMPTY_STRING)
{
@@ -60,9 +60,9 @@
pageUnitYToDocY(y),
ValueToPoint(w),
ValueToPoint(h),
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor,
true);
// if (ItemExists(QString::fromUtf8(Name)))
// {
@@ -134,7 +134,7 @@
pageUnitYToDocY(y),
ValueToPoint(w),
ValueToPoint(h),
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, CommonStrings::None,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth, CommonStrings::None,
ScCore->primaryMainWindow()->doc->itemToolPrefs.textColor, true);
// if (ItemExists(QString::fromUtf8(Name)))
// {
@@ -175,9 +175,9 @@
// }
int i = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Line, PageItem::Unspecified,
x, y, w, h,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush,
- ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor,
+ ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor, true);
PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(i);
it->setRotation(xy2Deg(w-x, h-y));
it->setWidthHeight(sqrt(pow(x-w, 2.0) + pow(y-h, 2.0)), 1.0);
@@ -251,7 +251,7 @@
i++;
y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
i++;
- int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
+ int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor, true);
PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
it->PoLine.resize(2);
it->PoLine.setPoint(0, 0, 0);
@@ -335,7 +335,7 @@
i++;
y = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
i++;
- int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
+ int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor, true);
PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
it->PoLine.resize(2);
it->PoLine.setPoint(0, 0, 0);
@@ -430,7 +430,7 @@
ky2 = pageUnitYToDocY(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i))));
i++;
//int ic = ScCore->primaryMainWindow()->view->PaintPolyLine(x, y, 1, 1, ScCore->primaryMainWindow()->doc->toolSettings.dWidth, ScCore->primaryMainWindow()->doc->toolSettings.dBrush, ScCore->primaryMainWindow()->doc->toolSettings.dPen);
- int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeBrush, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapePen, true);
+ int ic = ScCore->primaryMainWindow()->doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified, x, y, 1, 1, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor, ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor, true);
PageItem *it = ScCore->primaryMainWindow()->doc->Items->at(ic);
it->PoLine.resize(2);
it->PoLine.setPoint(0, 0, 0);
Index: scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (revision 14014)
@@ -192,29 +192,29 @@
docu.writeAttribute("GapVertical", m_Doc->GapVertical);
docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
- docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
- docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+ docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapeLineColor);
+ docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeFillColor);
docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
- docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+ docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textFillColor);
docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
- docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
- docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+ docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textFillColorShade);
+ docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineColorShade);
docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
- docu.writeAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+ docu.writeAttribute("STIL",m_Doc->itemToolPrefs.shapeLineStyle);
docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
- docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+ docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeLineWidth);
docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
- docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
- docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
- docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
+ docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeLineColorShade);
+ docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineColorShade);
+ docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeFillColorShade);
docu.writeAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
docu.writeAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
docu.writeAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
- docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+ docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillColorShade);
docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
Index: scribus/plugins/fileloader/scribus150format/scribus150format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus150format/scribus150format.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus150format/scribus150format.cpp (revision 14014)
@@ -875,28 +875,28 @@
doc->itemToolPrefs.imageLowResType = attrs.valueAsInt("HalfRes", 1);
doc->itemToolPrefs.imageUseEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
if (attrs.hasAttribute("PEN"))
- doc->itemToolPrefs.shapePen = attrs.valueAsString("PEN");
+ doc->itemToolPrefs.shapeLineColor = attrs.valueAsString("PEN");
if (attrs.hasAttribute("BRUSH"))
- doc->itemToolPrefs.shapeBrush = attrs.valueAsString("BRUSH");
+ doc->itemToolPrefs.shapeFillColor = attrs.valueAsString("BRUSH");
if (attrs.hasAttribute("PENLINE"))
doc->itemToolPrefs.lineColor = attrs.valueAsString("PENLINE");
if (attrs.hasAttribute("PENTEXT"))
doc->itemToolPrefs.textColor = attrs.valueAsString("PENTEXT");
if (attrs.hasAttribute("StrokeText"))
doc->itemToolPrefs.textStrokeColor = attrs.valueAsString("StrokeText");
- doc->itemToolPrefs.textBackground = attrs.valueAsString("TextBackGround", CommonStrings::None);
+ doc->itemToolPrefs.textFillColor = attrs.valueAsString("TextBackGround", CommonStrings::None);
doc->itemToolPrefs.textLineColor = attrs.valueAsString("TextLineColor", CommonStrings::None);
- doc->itemToolPrefs.textBackgroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
- doc->itemToolPrefs.textLineShade = attrs.valueAsInt("TextLineShade", 100);
+ doc->itemToolPrefs.textFillColorShade =attrs.valueAsInt("TextBackGroundShade", 100);
+ doc->itemToolPrefs.textLineColorShade = attrs.valueAsInt("TextLineShade", 100);
doc->itemToolPrefs.textShade = attrs.valueAsInt("TextPenShade", 100);
doc->itemToolPrefs.textStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
- doc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
+ doc->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
- doc->itemToolPrefs.shapeWidth = attrs.valueAsDouble("WIDTH", 0.0);
+ doc->itemToolPrefs.shapeLineWidth = attrs.valueAsDouble("WIDTH", 0.0);
doc->itemToolPrefs.lineWidth = attrs.valueAsDouble("WIDTHLINE", 1.0);
- doc->itemToolPrefs.shapeShade2 = attrs.valueAsInt("PENSHADE", 100);
- doc->itemToolPrefs.lineShade = attrs.valueAsInt("LINESHADE", 100);
- doc->itemToolPrefs.shapeShade = attrs.valueAsInt("BRUSHSHADE", 100);
+ doc->itemToolPrefs.shapeLineColorShade = attrs.valueAsInt("PENSHADE", 100);
+ doc->itemToolPrefs.lineColorShade = attrs.valueAsInt("LINESHADE", 100);
+ doc->itemToolPrefs.shapeFillColorShade = attrs.valueAsInt("BRUSHSHADE", 100);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 10);
doc->opToolPrefs.magMax = attrs.valueAsInt("MAGMAX", 3200);
doc->opToolPrefs.magStep = attrs.valueAsInt("MAGSTEP", 200);
@@ -910,7 +910,7 @@
doc->itemToolPrefs.textTabWidth = attrs.valueAsDouble("TabWidth", 36.0);
if (attrs.hasAttribute("CPICT"))
doc->itemToolPrefs.imageFillColor = attrs.valueAsString("CPICT");
- doc->itemToolPrefs.imageFillShade = attrs.valueAsInt("PICTSHADE", 100);
+ doc->itemToolPrefs.imageFillColorShade = attrs.valueAsInt("PICTSHADE", 100);
}
void Scribus150Format::readTypographicSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -1889,10 +1889,10 @@
if (newItem->fill_gradient.Stops() == 0)
{
- const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeBrush];
- const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapePen];
- newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeBrush, 100);
- newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapePen, 100);
+ const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeFillColor];
+ const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapeLineColor];
+ newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeFillColor, 100);
+ newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapeLineColor, 100);
}
if (newItem->asPathText())
Index: scribus/plugins/fileloader/oodraw/oodrawimp.cpp
===================================================================
--- scribus/plugins/fileloader/oodraw/oodrawimp.cpp (revision 14013)
+++ scribus/plugins/fileloader/oodraw/oodrawimp.cpp (revision 14014)
@@ -462,7 +462,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp (revision 14014)
@@ -189,29 +189,29 @@
docu.writeAttribute("GapVertical", m_Doc->GapVertical);
docu.writeAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
docu.writeAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
- docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
- docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+ docu.writeAttribute("PEN",m_Doc->itemToolPrefs.shapeLineColor);
+ docu.writeAttribute("BRUSH",m_Doc->itemToolPrefs.shapeFillColor);
docu.writeAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
docu.writeAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
docu.writeAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
- docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+ docu.writeAttribute("TextBackGround", m_Doc->itemToolPrefs.textFillColor);
docu.writeAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
- docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
- docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+ docu.writeAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textFillColorShade);
+ docu.writeAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineColorShade);
docu.writeAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
docu.writeAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
- docu.writeAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+ docu.writeAttribute("STIL",m_Doc->itemToolPrefs.textLineColorShade);
docu.writeAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
- docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+ docu.writeAttribute("WIDTH",m_Doc->itemToolPrefs.shapeLineWidth);
docu.writeAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
- docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
- docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
- docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
+ docu.writeAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeLineColorShade);
+ docu.writeAttribute("LINESHADE",m_Doc->itemToolPrefs.lineColorShade);
+ docu.writeAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeFillColorShade);
docu.writeAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
docu.writeAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
docu.writeAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
docu.writeAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
- docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+ docu.writeAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillColorShade);
docu.writeAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
docu.writeAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
docu.writeAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp (revision 14014)
@@ -883,28 +883,28 @@
doc->itemToolPrefs.imageLowResType = attrs.valueAsInt("HalfRes", 1);
doc->itemToolPrefs.imageUseEmbeddedPath = attrs.valueAsBool("EmbeddedPath", false);
if (attrs.hasAttribute("PEN"))
- doc->itemToolPrefs.shapePen = attrs.valueAsString("PEN");
+ doc->itemToolPrefs.shapeLineColor = attrs.valueAsString("PEN");
if (attrs.hasAttribute("BRUSH"))
- doc->itemToolPrefs.shapeBrush = attrs.valueAsString("BRUSH");
+ doc->itemToolPrefs.shapeFillColor = attrs.valueAsString("BRUSH");
if (attrs.hasAttribute("PENLINE"))
doc->itemToolPrefs.lineColor = attrs.valueAsString("PENLINE");
if (attrs.hasAttribute("PENTEXT"))
doc->itemToolPrefs.textColor = attrs.valueAsString("PENTEXT");
if (attrs.hasAttribute("StrokeText"))
doc->itemToolPrefs.textStrokeColor = attrs.valueAsString("StrokeText");
- doc->itemToolPrefs.textBackground = attrs.valueAsString("TextBackGround", CommonStrings::None);
+ doc->itemToolPrefs.textFillColor = attrs.valueAsString("TextBackGround", CommonStrings::None);
doc->itemToolPrefs.textLineColor = attrs.valueAsString("TextLineColor", CommonStrings::None);
- doc->itemToolPrefs.textBackgroundShade =attrs.valueAsInt("TextBackGroundShade", 100);
- doc->itemToolPrefs.textLineShade = attrs.valueAsInt("TextLineShade", 100);
+ doc->itemToolPrefs.textFillColorShade =attrs.valueAsInt("TextBackGroundShade", 100);
+ doc->itemToolPrefs.textLineColorShade = attrs.valueAsInt("TextLineShade", 100);
doc->itemToolPrefs.textShade = attrs.valueAsInt("TextPenShade", 100);
doc->itemToolPrefs.textStrokeShade = attrs.valueAsInt("TextStrokeShade", 100);
- doc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
+ doc->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STIL"));
doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(attrs.valueAsInt("STILLINE"));
- doc->itemToolPrefs.shapeWidth = attrs.valueAsDouble("WIDTH", 0.0);
+ doc->itemToolPrefs.shapeLineWidth = attrs.valueAsDouble("WIDTH", 0.0);
doc->itemToolPrefs.lineWidth = attrs.valueAsDouble("WIDTHLINE", 1.0);
- doc->itemToolPrefs.shapeShade2 = attrs.valueAsInt("PENSHADE", 100);
+ doc->itemToolPrefs.shapeLineColorShade = attrs.valueAsInt("PENSHADE", 100);
doc->itemToolPrefs.lineColor = attrs.valueAsInt("LINESHADE", 100);
- doc->itemToolPrefs.shapeShade = attrs.valueAsInt("BRUSHSHADE", 100);
+ doc->itemToolPrefs.shapeFillColorShade = attrs.valueAsInt("BRUSHSHADE", 100);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 10);
doc->opToolPrefs.magMax = attrs.valueAsInt("MAGMAX", 3200);
doc->opToolPrefs.magStep = attrs.valueAsInt("MAGSTEP", 200);
@@ -918,7 +918,7 @@
doc->itemToolPrefs.textTabWidth = attrs.valueAsDouble("TabWidth", 36.0);
if (attrs.hasAttribute("CPICT"))
doc->itemToolPrefs.imageFillColor = attrs.valueAsString("CPICT");
- doc->itemToolPrefs.imageFillShade = attrs.valueAsInt("PICTSHADE", 100);
+ doc->itemToolPrefs.imageFillColorShade = attrs.valueAsInt("PICTSHADE", 100);
}
void Scribus134Format::readTypographicSettings(ScribusDoc* doc, ScXmlStreamAttributes& attrs)
@@ -1867,10 +1867,10 @@
if (newItem->fill_gradient.Stops() == 0)
{
- const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeBrush];
- const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapePen];
- newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeBrush, 100);
- newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapePen, 100);
+ const ScColor& col1 = doc->PageColors[doc->itemToolPrefs.shapeFillColor];
+ const ScColor& col2 = doc->PageColors[doc->itemToolPrefs.shapeLineColor];
+ newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs.shapeFillColor, 100);
+ newItem->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs.shapeLineColor, 100);
}
if (newItem->asPathText())
Index: scribus/plugins/psimport/importps.cpp
===================================================================
--- scribus/plugins/psimport/importps.cpp (revision 14013)
+++ scribus/plugins/psimport/importps.cpp (revision 14014)
@@ -274,7 +274,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/cvgimplugin/importcvg.cpp
===================================================================
--- scribus/plugins/cvgimplugin/importcvg.cpp (revision 14013)
+++ scribus/plugins/cvgimplugin/importcvg.cpp (revision 14014)
@@ -204,7 +204,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/pctimplugin/importpct.cpp
===================================================================
--- scribus/plugins/pctimplugin/importpct.cpp (revision 14013)
+++ scribus/plugins/pctimplugin/importpct.cpp (revision 14014)
@@ -204,7 +204,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/wmfimplugin/wmfimport.cpp
===================================================================
--- scribus/plugins/wmfimplugin/wmfimport.cpp (revision 14013)
+++ scribus/plugins/wmfimplugin/wmfimport.cpp (revision 14014)
@@ -640,7 +640,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/aiimplugin/importai.cpp
===================================================================
--- scribus/plugins/aiimplugin/importai.cpp (revision 14013)
+++ scribus/plugins/aiimplugin/importai.cpp (revision 14014)
@@ -258,7 +258,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/xfigimplugin/importxfig.cpp
===================================================================
--- scribus/plugins/xfigimplugin/importxfig.cpp (revision 14013)
+++ scribus/plugins/xfigimplugin/importxfig.cpp (revision 14014)
@@ -275,7 +275,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/wpgimplugin/importwpg.cpp
===================================================================
--- scribus/plugins/wpgimplugin/importwpg.cpp (revision 14013)
+++ scribus/plugins/wpgimplugin/importwpg.cpp (revision 14014)
@@ -613,7 +613,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/svgimplugin/svgplugin.cpp
===================================================================
--- scribus/plugins/svgimplugin/svgplugin.cpp (revision 14013)
+++ scribus/plugins/svgimplugin/svgplugin.cpp (revision 14014)
@@ -403,7 +403,7 @@
double gw = maxx - minx;
double gh = maxy - miny;
PageItem *high = m_Doc->Items->at(highestItem);
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeBrush, m_Doc->itemToolPrefs.shapePen, true);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, gx, gy, gw, gh, 0, m_Doc->itemToolPrefs.shapeFillColor, m_Doc->itemToolPrefs.shapeLineColor, true);
PageItem *neu = m_Doc->Items->takeAt(z);
m_Doc->Items->insert(lowestItem, neu);
neu->Groups.push(m_Doc->GroupCounter);
Index: scribus/plugins/fileloader/scribus12format/scribus12format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus12format/scribus12format.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus12format/scribus12format.cpp (revision 14014)
@@ -1529,10 +1529,10 @@
vg->setDropCapLines(pg->attribute("DROPLIN", "2").toInt());
vg->setDropCapOffset(ScCLocale::toDoubleC(pg->attribute("DROPDIST"), 0.0));
vg->charStyle().setFeatures(static_cast<StyleFlag>((pg->attribute("EFFECT", "0").toInt())).featureList());
- fColor = pg->attribute("FCOLOR", doc->itemToolPrefs.shapeBrush);
+ fColor = pg->attribute("FCOLOR", doc->itemToolPrefs.shapeFillColor);
fShade = pg->attribute("FSHADE", "100").toInt();
handleOldColorShade(doc, fColor, fShade);
- sColor = pg->attribute("SCOLOR", doc->itemToolPrefs.shapePen);
+ sColor = pg->attribute("SCOLOR", doc->itemToolPrefs.shapeLineColor);
sShade = pg->attribute("SSHADE", "100").toInt();
handleOldColorShade(doc, sColor, sShade);
vg->charStyle().setFillColor(fColor);
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp (revision 14013)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp (revision 14014)
@@ -376,28 +376,28 @@
m_Doc->itemToolPrefs.imageLowResType = dc.attribute("HalfRes", "1").toInt();
m_Doc->itemToolPrefs.imageUseEmbeddedPath = static_cast<bool>(dc.attribute("EmbeddedPath", "0").toInt());
if (dc.hasAttribute("PEN"))
- m_Doc->itemToolPrefs.shapePen = dc.attribute("PEN");
+ m_Doc->itemToolPrefs.shapeLineColor = dc.attribute("PEN");
if (dc.hasAttribute("BRUSH"))
- m_Doc->itemToolPrefs.shapeBrush = dc.attribute("BRUSH");
+ m_Doc->itemToolPrefs.shapeFillColor = dc.attribute("BRUSH");
if (dc.hasAttribute("PENLINE"))
m_Doc->itemToolPrefs.lineColor = dc.attribute("PENLINE");
if (dc.hasAttribute("PENTEXT"))
m_Doc->itemToolPrefs.textColor = dc.attribute("PENTEXT");
if (dc.hasAttribute("StrokeText"))
m_Doc->itemToolPrefs.textStrokeColor = dc.attribute("StrokeText");
- m_Doc->itemToolPrefs.textBackground = dc.attribute("TextBackGround", CommonStrings::None);
+ m_Doc->itemToolPrefs.textFillColor = dc.attribute("TextBackGround", CommonStrings::None);
m_Doc->itemToolPrefs.textLineColor = dc.attribute("TextLineColor", CommonStrings::None);
- m_Doc->itemToolPrefs.textBackgroundShade = dc.attribute("TextBackGroundShade", "100").toInt();
- m_Doc->itemToolPrefs.textLineShade = dc.attribute("TextLineShade", "100").toInt();
+ m_Doc->itemToolPrefs.textFillColorShade = dc.attribute("TextBackGroundShade", "100").toInt();
+ m_Doc->itemToolPrefs.textLineColorShade = dc.attribute("TextLineShade", "100").toInt();
m_Doc->itemToolPrefs.textShade = dc.attribute("TextPenShade", "100").toInt();
m_Doc->itemToolPrefs.textStrokeShade = dc.attribute("TextStrokeShade", "100").toInt();
- m_Doc->itemToolPrefs.shapeLineArt = static_cast<Qt::PenStyle>(dc.attribute("STIL").toInt());
+ m_Doc->itemToolPrefs.shapeLineStyle = static_cast<Qt::PenStyle>(dc.attribute("STIL").toInt());
m_Doc->itemToolPrefs.lineStyle = static_cast<Qt::PenStyle>(dc.attribute("STILLINE").toInt());
- m_Doc->itemToolPrefs.shapeWidth = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 1.0);
+ m_Doc->itemToolPrefs.shapeLineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTH"), 1.0);
m_Doc->itemToolPrefs.lineWidth = ScCLocale::toDoubleC(dc.attribute("WIDTHLINE"), 1.0);
- m_Doc->itemToolPrefs.shapeShade2 = dc.attribute("PENSHADE", "100").toInt();
- m_Doc->itemToolPrefs.lineShade = dc.attribute("LINESHADE", "100").toInt();
- m_Doc->itemToolPrefs.shapeShade = dc.attribute("BRUSHSHADE", "100").toInt();
+ m_Doc->itemToolPrefs.shapeLineColorShade = dc.attribute("PENSHADE", "100").toInt();
+ m_Doc->itemToolPrefs.lineColorShade = dc.attribute("LINESHADE", "100").toInt();
+ m_Doc->itemToolPrefs.shapeFillColorShade = dc.attribute("BRUSHSHADE", "100").toInt();
m_Doc->opToolPrefs.magMin = dc.attribute("MAGMIN", "10").toInt();
m_Doc->opToolPrefs.magMax = dc.attribute("MAGMAX", "3200").toInt();
m_Doc->opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
@@ -408,7 +408,7 @@
m_Doc->itemToolPrefs.textTabWidth = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
if (dc.hasAttribute("CPICT"))
m_Doc->itemToolPrefs.imageFillColor = dc.attribute("CPICT");
- m_Doc->itemToolPrefs.imageFillShade = ScCLocale::toDoubleC(dc.attribute("PICTSHADE"), 100.0);
+ m_Doc->itemToolPrefs.imageFillColorShade = ScCLocale::toDoubleC(dc.attribute("PICTSHADE"), 100.0);
if (dc.hasAttribute("PAGEC"))
m_Doc->papColor = QColor(dc.attribute("PAGEC"));
if (dc.hasAttribute("MARGC"))
@@ -956,10 +956,10 @@
delete last;
if (Neu->fill_gradient.Stops() == 0)
{
- const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
- const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
- Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
- Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
+ const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeFillColor];
+ const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeLineColor];
+ Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeFillColor, 100);
+ Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeLineColor, 100);
}
// Neu->Language = ScMW->GetLang(pg.attribute("LANGUAGE", m_Doc->Language));
Neu->isAutoText = static_cast<bool>(pg.attribute("AUTOTEXT").toInt());
@@ -1280,29 +1280,29 @@
dc.setAttribute("ScratchTop", m_Doc->scratch.Top);
dc.setAttribute("StartArrow", m_Doc->itemToolPrefs.lineStartArrow);
dc.setAttribute("EndArrow", m_Doc->itemToolPrefs.lineEndArrow);
- dc.setAttribute("PEN",m_Doc->itemToolPrefs.shapePen);
- dc.setAttribute("BRUSH",m_Doc->itemToolPrefs.shapeBrush);
+ dc.setAttribute("PEN",m_Doc->itemToolPrefs.shapeLineColor);
+ dc.setAttribute("BRUSH",m_Doc->itemToolPrefs.shapeFillColor);
dc.setAttribute("PENLINE",m_Doc->itemToolPrefs.lineColor);
dc.setAttribute("PENTEXT",m_Doc->itemToolPrefs.textColor);
dc.setAttribute("StrokeText",m_Doc->itemToolPrefs.textStrokeColor);
- dc.setAttribute("TextBackGround", m_Doc->itemToolPrefs.textBackground);
+ dc.setAttribute("TextBackGround", m_Doc->itemToolPrefs.textFillColor);
dc.setAttribute("TextLineColor", m_Doc->itemToolPrefs.textLineColor);
- dc.setAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textBackgroundShade);
- dc.setAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineShade);
+ dc.setAttribute("TextBackGroundShade", m_Doc->itemToolPrefs.textFillColorShade);
+ dc.setAttribute("TextLineShade", m_Doc->itemToolPrefs.textLineColorShade);
dc.setAttribute("TextPenShade", m_Doc->itemToolPrefs.textShade);
dc.setAttribute("TextStrokeShade", m_Doc->itemToolPrefs.textStrokeShade);
- dc.setAttribute("STIL",m_Doc->itemToolPrefs.shapeLineArt);
+ dc.setAttribute("STIL",m_Doc->itemToolPrefs.shapeLineStyle);
dc.setAttribute("STILLINE",m_Doc->itemToolPrefs.lineStyle);
- dc.setAttribute("WIDTH",m_Doc->itemToolPrefs.shapeWidth);
+ dc.setAttribute("WIDTH",m_Doc->itemToolPrefs.shapeLineWidth);
dc.setAttribute("WIDTHLINE",m_Doc->itemToolPrefs.lineWidth);
- dc.setAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeShade2);
- dc.setAttribute("LINESHADE",m_Doc->itemToolPrefs.lineShade);
- dc.setAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeShade);
+ dc.setAttribute("PENSHADE",m_Doc->itemToolPrefs.shapeLineColorShade);
+ dc.setAttribute("LINESHADE",m_Doc->itemToolPrefs.lineColorShade);
+ dc.setAttribute("BRUSHSHADE",m_Doc->itemToolPrefs.shapeFillColorShade);
dc.setAttribute("MAGMIN",m_Doc->opToolPrefs.magMin);
dc.setAttribute("MAGMAX",m_Doc->opToolPrefs.magMax);
dc.setAttribute("MAGSTEP",m_Doc->opToolPrefs.magStep);
dc.setAttribute("CPICT",m_Doc->itemToolPrefs.imageFillColor);
- dc.setAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillShade);
+ dc.setAttribute("PICTSHADE",m_Doc->itemToolPrefs.imageFillColorShade);
dc.setAttribute("PICTSCX",m_Doc->itemToolPrefs.imageScaleX);
dc.setAttribute("PICTSCY",m_Doc->itemToolPrefs.imageScaleY);
dc.setAttribute("PSCALE", static_cast<int>(m_Doc->itemToolPrefs.imageScaleType));
@@ -1923,10 +1923,10 @@
vg.setDropCapLines(pg.attribute("DROPLIN", "2").toInt());
vg.setDropCapOffset(ScCLocale::toDoubleC(pg.attribute("DROPDIST"), 0.0));
vg.charStyle().setFeatures(static_cast<StyleFlag>(pg.attribute("EFFECT", "0").toInt()).featureList());
- QString fColor = pg.attribute("FCOLOR", doc->itemToolPrefs.shapeBrush);
+ QString fColor = pg.attribute("FCOLOR", doc->itemToolPrefs.shapeFillColor);
int fShade = pg.attribute("FSHADE", "100").toInt();
handleOldColorShade(doc, fColor, fShade);
- QString sColor = pg.attribute("SCOLOR", doc->itemToolPrefs.shapePen);
+ QString sColor = pg.attribute("SCOLOR", doc->itemToolPrefs.shapeLineColor);
int sShade = pg.attribute("SSHADE", "100").toInt();
handleOldColorShade(doc, sColor, sShade);
vg.charStyle().setFillColor(fColor);
@@ -2861,10 +2861,10 @@
delete last;
if (Neu->fill_gradient.Stops() == 0)
{
- const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeBrush];
- const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapePen];
- Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeBrush, 100);
- Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapePen, 100);
+ const ScColor& col1 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeFillColor];
+ const ScColor& col2 = m_Doc->PageColors[m_Doc->itemToolPrefs.shapeLineColor];
+ Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col1, m_Doc), 0.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeFillColor, 100);
+ Neu->fill_gradient.addStop(ScColorEngine::getRGBColor(col2, m_Doc), 1.0, 0.5, 1.0, m_Doc->itemToolPrefs.shapeLineColor, 100);
}
// Neu->Language = ScMW->GetLang(pg.attribute("LANGUAGE", m_Doc->Language));
// Neu->Language = m_Doc->Language;
More information about the scribus-commit
mailing list