Author: jghali
Date: Sat Jun 22 11:46:28 2019
New Revision: 23044
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23044
Log:
Rename a few PageItem variables and move a few others to protected
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/pageitem_noteframe.cpp
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23044&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Jun 22 11:46:28 2019
@@ -320,21 +320,21 @@
patternSkewY(other.patternSkewY),
patternMirrorX(other.patternMirrorX),
patternMirrorY(other.patternMirrorY),
- fillColorVal(other.fillColorVal),
- lineColorVal(other.lineColorVal),
- lineShadeVal(other.lineShadeVal),
- fillShadeVal(other.fillShadeVal),
- fillTransparencyVal(other.fillTransparencyVal),
- lineTransparencyVal(other.lineTransparencyVal),
- fillBlendmodeVal(other.fillBlendmodeVal),
- lineBlendmodeVal(other.lineBlendmodeVal),
+ m_fillColor(other.m_fillColor),
+ m_lineColor(other.m_lineColor),
+ m_lineShade(other.m_lineShade),
+ m_fillShade(other.m_fillShade),
+ m_fillTransparency(other.m_fillTransparency),
+ m_lineTransparency(other.m_lineTransparency),
+ m_fillBlendMode(other.m_fillBlendMode),
+ m_lineBlendMode(other.m_lineBlendMode),
m_ImageIsFlippedH(other.m_ImageIsFlippedH),
m_ImageIsFlippedV(other.m_ImageIsFlippedV),
m_Locked(other.m_Locked),
m_SizeLocked(other.m_SizeLocked),
m_SizeHLocked(other.m_SizeHLocked),
m_SizeVLocked(other.m_SizeVLocked),
- textFlowModeVal(other.textFlowModeVal),
+ m_textFlowMode(other.m_textFlowMode),
pageItemAttributes(other.pageItemAttributes),
m_PrintEnabled(other.m_PrintEnabled),
tagged(other.tagged),
@@ -411,19 +411,19 @@
itemText(pa),
textLayout(&itemText, this),
undoManager(UndoManager::instance()),
- lineShadeVal(100),
- fillShadeVal(100),
- fillTransparencyVal(0.0),
- lineTransparencyVal(0.0),
- fillBlendmodeVal(0),
- lineBlendmodeVal(0),
+ m_lineShade(100),
+ m_fillShade(100),
+ m_fillTransparency(0.0),
+ m_lineTransparency(0.0),
+ m_fillBlendMode(0),
+ m_lineBlendMode(0),
m_ImageIsFlippedH(false),
m_ImageIsFlippedV(false),
m_Locked(false),
m_SizeLocked(false),
m_SizeHLocked(false),
m_SizeVLocked(false),
- textFlowModeVal(TextFlowDisabled)
+ m_textFlowMode(TextFlowDisabled)
{
Parent = nullptr;
m_Doc = pa;
@@ -441,8 +441,8 @@
BoundingH = h;
m_ItemType = newType;
oldRot = m_rotation = 0;
- fillColorVal = fill;
- lineColorVal = m_ItemType == PageItem::TextFrame ? fill : outline;
+ m_fillColor = fill;
+ m_lineColor = m_ItemType == PageItem::TextFrame ? fill : outline;
gWidth = gHeight = 0;
GrType = 0;
GrStartX = 0;
@@ -659,12 +659,12 @@
doOverprint = false;
stroke_gradient = VGradient(VGradient::linear);
stroke_gradient.clearStops();
- if (lineColorVal != CommonStrings::None)
- {
- const ScColor& col = m_Doc->PageColors[lineColorVal];
+ if (m_lineColor != CommonStrings::None)
+ {
+ const ScColor& col = m_Doc->PageColors[m_lineColor];
QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
- stroke_gradient.addStop(qcol, 0.0, 0.5, 1.0, lineColorVal, 100);
- stroke_gradient.addStop(qcol, 1.0, 0.5, 1.0, lineColorVal, 100);
+ stroke_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_lineColor, 100);
+ stroke_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_lineColor, 100);
}
else
{
@@ -677,12 +677,12 @@
}
else
{
- if (fillColorVal != CommonStrings::None)
+ if (m_fillColor != CommonStrings::None)
{
- const ScColor& col =
m_Doc->PageColors[fillColorVal];
+ const ScColor& col =
m_Doc->PageColors[m_fillColor];
QColor qcol = ScColorEngine::getRGBColor(col,
m_Doc);
- stroke_gradient.addStop(qcol, 0.0, 0.5, 1.0,
fillColorVal, 100);
- stroke_gradient.addStop(qcol, 1.0, 0.5, 1.0,
fillColorVal, 100);
+ stroke_gradient.addStop(qcol, 0.0, 0.5, 1.0,
m_fillColor, 100);
+ stroke_gradient.addStop(qcol, 1.0, 0.5, 1.0,
m_fillColor, 100);
}
else
{
@@ -705,16 +705,16 @@
}
fill_gradient = VGradient(VGradient::linear);
fill_gradient.clearStops();
- if (fillColorVal != CommonStrings::None)
- {
- const ScColor& col = m_Doc->PageColors[fillColorVal];
+ if (m_fillColor != CommonStrings::None)
+ {
+ const ScColor& col = m_Doc->PageColors[m_fillColor];
QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
- fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, fillColorVal, 100);
- fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, fillColorVal, 100);
- GrColorP1 = fillColorVal;
- GrColorP2 = fillColorVal;
- GrColorP3 = fillColorVal;
- GrColorP4 = fillColorVal;
+ fill_gradient.addStop(qcol, 0.0, 0.5, 1.0, m_fillColor, 100);
+ fill_gradient.addStop(qcol, 1.0, 0.5, 1.0, m_fillColor, 100);
+ GrColorP1 = m_fillColor;
+ GrColorP2 = m_fillColor;
+ GrColorP3 = m_fillColor;
+ GrColorP4 = m_fillColor;
}
else
{
@@ -731,16 +731,16 @@
}
else
{
- if (lineColorVal != CommonStrings::None)
+ if (m_lineColor != CommonStrings::None)
{
- const ScColor& col =
m_Doc->PageColors[lineColorVal];
+ const ScColor& col =
m_Doc->PageColors[m_lineColor];
QColor qcol = ScColorEngine::getRGBColor(col,
m_Doc);
- fill_gradient.addStop(qcol, 0.0, 0.5, 1.0,
lineColorVal, 100);
- fill_gradient.addStop(qcol, 1.0, 0.5, 1.0,
lineColorVal, 100);
- GrColorP1 = lineColorVal;
- GrColorP2 = lineColorVal;
- GrColorP3 = lineColorVal;
- GrColorP4 = lineColorVal;
+ fill_gradient.addStop(qcol, 0.0, 0.5, 1.0,
m_lineColor, 100);
+ fill_gradient.addStop(qcol, 1.0, 0.5, 1.0,
m_lineColor, 100);
+ GrColorP1 = m_lineColor;
+ GrColorP2 = m_lineColor;
+ GrColorP3 = m_lineColor;
+ GrColorP4 = m_lineColor;
}
else
{
@@ -2407,8 +2407,8 @@
double lineTrans_Old = lineTransparency();
bool hasSoftShadow_Old = hasSoftShadow();
double rotation_Old = m_rotation;
- fillTransparencyVal = 0.0;
- lineTransparencyVal = 0.0;
+ m_fillTransparency = 0.0;
+ m_lineTransparency = 0.0;
m_rotation = 0;
m_hasSoftShadow = false;
p->save();
@@ -2428,8 +2428,8 @@
p->endLayer();
p->restore();
}
- fillTransparencyVal = fillTrans_Old;
- lineTransparencyVal = lineTrans_Old;
+ m_fillTransparency = fillTrans_Old;
+ m_lineTransparency = lineTrans_Old;
m_hasSoftShadow = hasSoftShadow_Old;
m_rotation = rotation_Old;
}
@@ -3112,11 +3112,11 @@
void PageItem::createGradientMesh(int rows, int cols)
{
- QString MColor(fillColorVal);
+ QString MColor(m_fillColor);
QColor MQColor;
- if (fillColorVal != CommonStrings::None)
- {
- if (!m_Doc->PageColors.contains(fillColorVal))
+ if (m_fillColor != CommonStrings::None)
+ {
+ if (!m_Doc->PageColors.contains(m_fillColor))
{
switch (itemType())
{
@@ -3700,7 +3700,7 @@
}
}
}
- if (fillColorVal == tmp)
+ if (m_fillColor == tmp)
{
setFillQColor();
return;
@@ -3708,20 +3708,20 @@
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::SetFill,
-
QString(Um::ColorFromTo).arg(fillColorVal, tmp),
+
QString(Um::ColorFromTo).arg(m_fillColor, tmp),
Um::IFill);
ss->set("FILL");
- ss->set("OLD_FILL", fillColorVal);
+ ss->set("OLD_FILL", m_fillColor);
ss->set("NEW_FILL", tmp);
undoManager->action(this, ss);
}
- fillColorVal = tmp;
+ m_fillColor = tmp;
setFillQColor();
}
void PageItem::setFillShade(double newShade)
{
- if (fillShadeVal == newShade)
+ if (m_fillShade == newShade)
{
setFillQColor();
return;
@@ -3729,46 +3729,46 @@
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::SetShade,
-
QString(Um::FromTo).arg(fillShadeVal).arg(newShade),
+
QString(Um::FromTo).arg(m_fillShade).arg(newShade),
Um::IShade);
ss->set("SHADE");
- ss->set("OLD_SHADE", fillShadeVal);
+ ss->set("OLD_SHADE", m_fillShade);
ss->set("NEW_SHADE", newShade);
undoManager->action(this, ss);
}
- fillShadeVal = newShade;
+ m_fillShade = newShade;
setFillQColor();
}
void PageItem::setFillTransparency(double newTransparency)
{
- if (fillTransparencyVal == newTransparency)
+ if (m_fillTransparency == newTransparency)
return; // nothing to do -> return
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::Transparency,
-
QString(Um::FromTo).arg(fillTransparencyVal).arg(newTransparency),
+
QString(Um::FromTo).arg(m_fillTransparency).arg(newTransparency),
Um::ITransparency);
ss->set("TRANSPARENCY");
- ss->set("OLD_TP", fillTransparencyVal);
+ ss->set("OLD_TP", m_fillTransparency);
ss->set("NEW_TP", newTransparency);
undoManager->action(this, ss);
}
- fillTransparencyVal = newTransparency;
+ m_fillTransparency = newTransparency;
}
void PageItem::setFillBlendmode(int newBlendmode)
{
- if (fillBlendmodeVal == newBlendmode)
+ if (m_fillBlendMode == newBlendmode)
return; // nothing to do -> return
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::BlendMode, nullptr,
Um::IGroup);
ss->set("FILLBLENDMODE", newBlendmode);
- ss->set("FILLBLENDMODE_OLD", fillBlendmodeVal);
+ ss->set("FILLBLENDMODE_OLD", m_fillBlendMode);
undoManager->action(this, ss);
}
- fillBlendmodeVal = newBlendmode;
+ m_fillBlendMode = newBlendmode;
}
void PageItem::setLineColor(const QString &newColor)
@@ -3802,7 +3802,7 @@
}
}
}
- if (lineColorVal == tmp)
+ if (m_lineColor == tmp)
{
setLineQColor();
return;
@@ -3810,20 +3810,20 @@
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::SetLineColor,
-
QString(Um::ColorFromTo).arg(lineColorVal, tmp),
+
QString(Um::ColorFromTo).arg(m_lineColor, tmp),
Um::IFill);
ss->set("LINE_COLOR");
- ss->set("OLD_COLOR", lineColorVal);
+ ss->set("OLD_COLOR", m_lineColor);
ss->set("NEW_COLOR", tmp);
undoManager->action(this, ss);
}
- lineColorVal = tmp;
+ m_lineColor = tmp;
setLineQColor();
}
void PageItem::setLineShade(double newShade)
{
- if (lineShadeVal == newShade)
+ if (m_lineShade == newShade)
{
setLineQColor();
return;
@@ -3831,14 +3831,14 @@
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::SetLineShade,
-
QString(Um::FromTo).arg(lineShadeVal).arg(newShade),
+
QString(Um::FromTo).arg(m_lineShade).arg(newShade),
Um::IShade);
ss->set("LINE_SHADE");
- ss->set("OLD_SHADE", lineShadeVal);
+ ss->set("OLD_SHADE", m_lineShade);
ss->set("NEW_SHADE", newShade);
undoManager->action(this, ss);
}
- lineShadeVal = newShade;
+ m_lineShade = newShade;
setLineQColor();
}
@@ -3896,18 +3896,18 @@
void PageItem::setLineQColor()
{
- if (lineColorVal != CommonStrings::None)
- {
- if (!m_Doc->PageColors.contains(lineColorVal))
+ if (m_lineColor != CommonStrings::None)
+ {
+ if (!m_Doc->PageColors.contains(m_lineColor))
{
switch (itemType())
{
case TextFrame:
case PathText:
- lineColorVal =
m_Doc->itemToolPrefs().textLineColor;
+ m_lineColor =
m_Doc->itemToolPrefs().textLineColor;
break;
case Line:
- lineColorVal =
m_Doc->itemToolPrefs().lineColor;
+ m_lineColor =
m_Doc->itemToolPrefs().lineColor;
break;
case PolyLine:
case Polygon:
@@ -3917,16 +3917,16 @@
case RegularPolygon:
case Arc:
case Spiral:
- lineColorVal =
m_Doc->itemToolPrefs().shapeLineColor;
+ m_lineColor =
m_Doc->itemToolPrefs().shapeLineColor;
break;
default:
break;
}
}
- if (!m_Doc->PageColors.contains(lineColorVal))
- lineColorVal = m_Doc->itemToolPrefs().shapeLineColor;
- const ScColor& col = m_Doc->PageColors[lineColorVal];
- strokeQColor = ScColorEngine::getShadeColorProof(col, m_Doc,
lineShadeVal);
+ if (!m_Doc->PageColors.contains(m_lineColor))
+ m_lineColor = m_Doc->itemToolPrefs().shapeLineColor;
+ const ScColor& col = m_Doc->PageColors[m_lineColor];
+ strokeQColor = ScColorEngine::getShadeColorProof(col, m_Doc,
m_lineShade);
}
if (m_Doc->viewAsPreview)
{
@@ -3937,20 +3937,20 @@
void PageItem::setFillQColor()
{
- if (fillColorVal != CommonStrings::None)
- {
- if (!m_Doc->PageColors.contains(fillColorVal))
+ if (m_fillColor != CommonStrings::None)
+ {
+ if (!m_Doc->PageColors.contains(m_fillColor))
{
switch (itemType())
{
case ImageFrame:
case LatexFrame:
case OSGFrame:
- fillColorVal =
m_Doc->itemToolPrefs().imageFillColor;
+ m_fillColor =
m_Doc->itemToolPrefs().imageFillColor;
break;
case TextFrame:
case PathText:
- fillColorVal =
m_Doc->itemToolPrefs().textFillColor;
+ m_fillColor =
m_Doc->itemToolPrefs().textFillColor;
break;
case Line:
case PolyLine:
@@ -3958,14 +3958,14 @@
case RegularPolygon:
case Arc:
case Spiral:
- fillColorVal =
m_Doc->itemToolPrefs().shapeFillColor;
+ m_fillColor =
m_Doc->itemToolPrefs().shapeFillColor;
break;
default:
break;
}
}
- const ScColor& col = m_Doc->PageColors[fillColorVal];
- fillQColor = ScColorEngine::getShadeColorProof(col, m_Doc,
fillShadeVal);
+ const ScColor& col = m_Doc->PageColors[m_fillColor];
+ fillQColor = ScColorEngine::getShadeColorProof(col, m_Doc,
m_fillShade);
}
if (m_Doc->viewAsPreview)
{
@@ -4016,33 +4016,33 @@
void PageItem::setLineTransparency(double newTransparency)
{
- if (lineTransparencyVal == newTransparency)
+ if (m_lineTransparency == newTransparency)
return; // nothing to do -> return
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::LineTransparency,
-
QString(Um::FromTo).arg(lineTransparencyVal).arg(newTransparency),
+
QString(Um::FromTo).arg(m_lineTransparency).arg(newTransparency),
Um::ITransparency);
ss->set("LINE_TRANSPARENCY");
- ss->set("OLD_TP", lineTransparencyVal);
+ ss->set("OLD_TP", m_lineTransparency);
ss->set("NEW_TP", newTransparency);
undoManager->action(this, ss);
}
- lineTransparencyVal = newTransparency;
+ m_lineTransparency = newTransparency;
}
void PageItem::setLineBlendmode(int newBlendmode)
{
- if (lineBlendmodeVal == newBlendmode)
+ if (m_lineBlendMode == newBlendmode)
return; // nothing to do -> return
if (UndoManager::undoEnabled())
{
SimpleState *ss = new SimpleState(Um::BlendMode, nullptr,
Um::IGroup);
ss->set("LINEBLENDMODE", newBlendmode);
- ss->set("LINEBLENDMODE_OLD", lineBlendmodeVal);
+ ss->set("LINEBLENDMODE_OLD", m_lineBlendMode);
undoManager->action(this, ss);
}
- lineBlendmodeVal = newBlendmode;
+ m_lineBlendMode = newBlendmode;
}
void PageItem::setLineStyle(Qt::PenStyle newStyle)
@@ -4510,7 +4510,7 @@
void PageItem::setTextFlowMode(TextFlowMode mode)
{
- if (textFlowModeVal == mode)
+ if (m_textFlowMode == mode)
return;
if (UndoManager::undoEnabled())
{
@@ -4526,11 +4526,11 @@
else
stateMessage = Um::NoTextFlow;
SimpleState *ss = new SimpleState(stateMessage, "", Um::IFont);
- ss->set("TEXTFLOW_OLDMODE", (int) textFlowModeVal);
+ ss->set("TEXTFLOW_OLDMODE", (int) m_textFlowMode);
ss->set("TEXTFLOW_NEWMODE", (int) mode);
undoManager->action(this, ss);
}
- textFlowModeVal = mode;
+ m_textFlowMode = mode;
checkTextFlowInteractions();
}
@@ -5000,9 +5000,9 @@
else if (ss->contains("FILLBLENDMODE"))
{
if (isUndo)
-
fillBlendmodeVal=ss->getInt("FILLBLENDMODE_OLD");
+
m_fillBlendMode=ss->getInt("FILLBLENDMODE_OLD");
else
-
fillBlendmodeVal=ss->getInt("FILLBLENDMODE");
+
m_fillBlendMode=ss->getInt("FILLBLENDMODE");
}
else if (ss->contains("ACTIONPDFANNOTATION"))
{
@@ -5021,9 +5021,9 @@
else if (ss->contains("LINEBLENDMODE"))
{
if (isUndo)
-
lineBlendmodeVal=ss->getInt("LINEBLENDMODE_OLD");
+
m_lineBlendMode=ss->getInt("LINEBLENDMODE_OLD");
else
-
lineBlendmodeVal=ss->getInt("LINEBLENDMODE");
+
m_lineBlendMode=ss->getInt("LINEBLENDMODE");
}
else if (ss->contains("LOCK"))
{
@@ -7075,9 +7075,9 @@
TextFlowMode oldMode = (TextFlowMode) state->getInt("TEXTFLOW_OLDMODE");
TextFlowMode newMode = (TextFlowMode) state->getInt("TEXTFLOW_NEWMODE");
if (isUndo)
- textFlowModeVal = oldMode;
- else
- textFlowModeVal = newMode;
+ m_textFlowMode = oldMode;
+ else
+ m_textFlowMode = newMode;
QList<PageItem*> pList;
int id = m_Doc->Items->indexOf(this) - 1;
@@ -9469,7 +9469,7 @@
QRegion PageItem::textInteractionRegion(double xOffset, double yOffset) const
{
QRegion res;
- if (textFlowModeVal == TextFlowDisabled)
+ if (m_textFlowMode == TextFlowDisabled)
return res;
QTransform pp;
@@ -9516,7 +9516,7 @@
pp.scale(1, -1);
}
}
- if ((((lineColorVal != CommonStrings::None) ||
(!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) && (m_lineWidth > 1)) ||
(!NamedLStyle.isEmpty()))
+ if ((((m_lineColor != CommonStrings::None) ||
(!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0)) && (m_lineWidth > 1)) ||
(!NamedLStyle.isEmpty()))
{
// QVector<double> m_array;
QPainterPath ppa;
@@ -10387,7 +10387,7 @@
//CB unused in 135
// double dur=m_Doc->unitRatio();
-// emit blendmode(fillBlendmodeVal, lineBlendmodeVal);
+// emit blendmode(m_fillBlendMode, m_lineBlendMode);
/*CB using the emit myself* instead of all of these
emit textToFrameDistances(Extra, TExtra, BExtra, RExtra);
*/
Modified: trunk/Scribus/scribus/pageitem.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23044&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Sat Jun 22 11:46:28 2019
@@ -845,7 +845,7 @@
void patternFlip(bool &flipX, bool &flipY);
/** @brief Get the (name of the) fill color of the object */
- QString fillColor() const { return fillColorVal; }
+ QString fillColor() const { return m_fillColor; }
/**
* @brief Set the fill color of the object.
* @param newColor fill color for the object
@@ -853,7 +853,7 @@
void setFillColor(const QString &newColor);
/** @brief Get the shade of the fill color */
- double fillShade() const { return fillShadeVal; }
+ double fillShade() const { return m_fillShade; }
/**
* @brief Set the fill color shade.
* @param newShade shade for the fill color
@@ -861,7 +861,7 @@
void setFillShade(double newShade);
/** @brief Get the transparency of the fill color */
- double fillTransparency() const { return fillTransparencyVal; }
+ double fillTransparency() const { return m_fillTransparency; }
/**
* @brief Set the transparency of the fill color.
* @param newTransparency transparency of the fill color
@@ -869,7 +869,7 @@
void setFillTransparency(double newTransparency);
/** @brief Get the blendmode of the fill color */
- int fillBlendmode() const { return fillBlendmodeVal; }
+ int fillBlendmode() const { return m_fillBlendMode; }
/**
* @brief Set the blendmode of the fill color.
* @param newBlendmode blendmode of the fill color
@@ -877,7 +877,7 @@
void setFillBlendmode(int newBlendmode);
/** @brief Get the blendmode of the stroke color */
- int lineBlendmode() const { return lineBlendmodeVal; }
+ int lineBlendmode() const { return m_lineBlendMode; }
/**
* @brief Set the blendmode of the stroke color.
* @param newBlendmode blendmode of the stroke color
@@ -885,7 +885,7 @@
void setLineBlendmode(int newBlendmode);
/** @brief Get the line color of the object */
- QString lineColor() const { return lineColorVal; }
+ QString lineColor() const { return m_lineColor; }
/**
* @brief Set the line color of the object.
* @param newColor line color for the object
@@ -893,7 +893,7 @@
void setLineColor(const QString &newColor);
/** @brief Get the line color shade */
- double lineShade() const { return lineShadeVal; }
+ double lineShade() const { return m_lineShade; }
/**
* @brief Set the line color shade.
* @param newShade shade for the line color
@@ -901,7 +901,7 @@
void setLineShade(double newShade);
/** @brief Get the line transparency */
- double lineTransparency() const { return lineTransparencyVal; }
+ double lineTransparency() const { return m_lineTransparency; }
/**
* @brief Set the transparency of the line color.
* @param newTransparency transparency of the line color
@@ -1062,7 +1062,7 @@
* @brief Does text flow around this object and how
* @sa setTextFlowMode()
*/
- TextFlowMode textFlowMode() const { return textFlowModeVal; }
+ TextFlowMode textFlowMode() const { return m_textFlowMode; }
/**
* @brief Changes the way text flows around this item
@@ -1075,31 +1075,31 @@
* @brief If text should flow around object frame
* @sa PageItem::setTextFlowMode()
*/
- bool textFlowAroundObject() const { return (textFlowModeVal !=
TextFlowDisabled); }
+ bool textFlowAroundObject() const { return (m_textFlowMode !=
TextFlowDisabled); }
/**
* @brief If text should flow around object frame
* @sa PageItem::setTextFlowMode()
*/
- bool textFlowUsesFrameShape() const { return (textFlowModeVal ==
TextFlowUsesFrameShape); }
+ bool textFlowUsesFrameShape() const { return (m_textFlowMode ==
TextFlowUsesFrameShape); }
/**
* @brief If text should flow around bounding box
* @sa PageItem::setTextFlowMode()
*/
- bool textFlowUsesBoundingBox() const { return (textFlowModeVal ==
TextFlowUsesBoundingBox); }
+ bool textFlowUsesBoundingBox() const { return (m_textFlowMode ==
TextFlowUsesBoundingBox); }
/**
* @brief If text should flow around contour line
* @sa PageItem::setTextFlowMode()
*/
- bool textFlowUsesContourLine() const { return (textFlowModeVal ==
TextFlowUsesContourLine); }
+ bool textFlowUsesContourLine() const { return (m_textFlowMode ==
TextFlowUsesContourLine); }
/**
* @brief If text should flow around image clipping path
* @sa PageItem::setTextFlowMode()
*/
- bool textFlowUsesImageClipping() const { return (textFlowModeVal ==
TextFlowUsesImageClipping); }
+ bool textFlowUsesImageClipping() const { return (m_textFlowMode ==
TextFlowUsesImageClipping); }
/**
* @brief To be called carefully because it eventually triggers a
relayout of long text frames strings, but necessarily when you change the
document.
@@ -1299,10 +1299,6 @@
double m_columnGap;
double gridOffset_;
double gridValue_;
- int m_startArrowIndex;
- int m_endArrowIndex;
- int m_startArrowScale;
- int m_endArrowScale;
Qt::PenStyle PLineArt; ///< Linestyle
Qt::PenCapStyle PLineEnd;
Qt::PenJoinStyle PLineJoin;
@@ -1367,156 +1363,146 @@
VGradient fill_gradient;
bool fillRule;
bool doOverprint;
- bool m_hasSoftShadow;
- QString m_softShadowColor;
- int m_softShadowShade;
- double m_softShadowBlurRadius;
- double m_softShadowXOffset;
- double m_softShadowYOffset;
- double m_softShadowOpacity;
- int m_softShadowBlendMode;
- bool m_softShadowErasedByObject;
- bool m_softShadowHasObjectTransparency;
+
/* Additions for Table Support */
/* now deprecated with the new PageItem_Table */
- PageItem* LeftLink;
- PageItem* RightLink;
- PageItem* TopLink;
- PageItem* BottomLink;
- int LeftLinkID;
- int RightLinkID;
- int TopLinkID;
- int BottomLinkID;
- bool LeftLine;
- bool RightLine;
- bool TopLine;
- bool BottomLine;
- bool isTableItem;
+ PageItem* LeftLink;
+ PageItem* RightLink;
+ PageItem* TopLink;
+ PageItem* BottomLink;
+ int LeftLinkID;
+ int RightLinkID;
+ int TopLinkID;
+ int BottomLinkID;
+ bool LeftLine;
+ bool RightLine;
+ bool TopLine;
+ bool BottomLine;
+ bool isTableItem;
+
/* end deprecated vars */
- bool isSingleSel;
- QList<PageItem*> groupItemList;
- double groupWidth;
- double groupHeight;
- double BoundingX;
- double BoundingY;
- double BoundingW;
- double BoundingH;
- bool ChangedMasterItem;
- QString OnMasterPage;
- bool isEmbedded;
- int inlineCharID;
- QString inlineExt;
- /** Radius of rounded corners */
- double m_roundedCorderRadius;
-
- //Undo Data
- double oldXpos; ///< Stores the old X-position for undo action.
Is used to detect move actions.
- double oldYpos; ///< Stores the old Y-position for undo action.
Is used to detect move actions.
- double oldWidth; ///< Stores the old width for undo action. Is
used to detect resize actions.
- double oldHeight; ///< Stores the old height for undo action.
Is used to detect resize actions.
- double oldRot; ///< Stores the old rotation value for undo
action. Is used to detect rotation actions.
- double oldLocalScX; ///< Stores the old LocalScX value for undo
action. Is used to detect image scale actions.
- double oldLocalScY; ///< Stores the old LocalScY value for undo
action. Is used to detect image scale actions.
- double oldLocalX; ///< Stores the old LocalX value for undo
action. Is used to detect image offset actions.lo j
- double oldLocalY; ///< Stores the old LocalY value for undo
action. Is used to detect image offset actions.
-
-
- ScribusDoc *m_Doc; ///< Document this item belongs to
-
- bool m_isAnnotation; ///< Flag to tell if this item is a PDF
annotation item
- Annotation m_annotation; ///< PDF annotation data
-
- bool m_imageVisible; ///< Darstellungsart Bild/Titel
-
- double m_lineWidth; //< Line width
- double m_oldLineWidth;
-
- /**
- * @brief Stroke pattern name
- * @sa PageItem::strokePattern(), PageItem::setStrokePattern()
- */
- QString patternStrokeVal;
- /**
- * @brief Stroke pattern transformation matrix
- */
- double patternStrokeScaleX;
- double patternStrokeScaleY;
- double patternStrokeOffsetX;
- double patternStrokeOffsetY;
- double patternStrokeRotation;
- double patternStrokeSkewX;
- double patternStrokeSkewY;
- double patternStrokeSpace;
- bool patternStrokeMirrorX;
- bool patternStrokeMirrorY;
- bool patternStrokePath;
-
-
- /**
- * @brief Stroke gradient name
- * @sa PageItem::strokeGradient(), PageItem::setStrokeGradient()
- */
- QString gradientStrokeVal;
- VGradient stroke_gradient;
-
- /**
- * @brief Stroke gradient variables
+ bool isSingleSel;
+ QList<PageItem*> groupItemList;
+ double groupWidth;
+ double groupHeight;
+ double BoundingX;
+ double BoundingY;
+ double BoundingW;
+ double BoundingH;
+ bool ChangedMasterItem;
+ QString OnMasterPage;
+ bool isEmbedded;
+ int inlineCharID;
+ QString inlineExt;
+ /** Radius of rounded corners */
+ double m_roundedCorderRadius;
+
+ //Undo Data
+ double oldXpos; ///< Stores the old X-position for undo action. Is used
to detect move actions.
+ double oldYpos; ///< Stores the old Y-position for undo action. Is used
to detect move actions.
+ double oldWidth; ///< Stores the old width for undo action. Is used to
detect resize actions.
+ double oldHeight; ///< Stores the old height for undo action. Is used
to detect resize actions.
+ double oldRot; ///< Stores the old rotation value for undo action. Is
used to detect rotation actions.
+ double oldLocalScX; ///< Stores the old LocalScX value for undo action.
Is used to detect image scale actions.
+ double oldLocalScY; ///< Stores the old LocalScY value for undo action.
Is used to detect image scale actions.
+ double oldLocalX; ///< Stores the old LocalX value for undo action. Is
used to detect image offset actions.lo j
+ double oldLocalY; ///< Stores the old LocalY value for undo action. Is
used to detect image offset actions.
+
+
+ ScribusDoc *m_Doc; ///< Document this item belongs to
+
+ bool m_isAnnotation; ///< Flag to tell if this item is a PDF annotation
item
+ Annotation m_annotation; ///< PDF annotation data
+
+ double m_lineWidth; //< Line width
+ double m_oldLineWidth;
+
+ /**
+ * @brief Stroke pattern name
+ * @sa PageItem::strokePattern(), PageItem::setStrokePattern()
*/
- int GrTypeStroke;
- double GrStrokeStartX;
- double GrStrokeStartY;
- double GrStrokeEndX;
- double GrStrokeEndY;
- double GrStrokeFocalX;
- double GrStrokeFocalY;
- double GrStrokeScale;
- double GrStrokeSkew;
- VGradient::VGradientRepeatMethod GrStrokeExtend;
-
- /**
- * @brief Mask gradient variables
+ QString patternStrokeVal;
+ /**
+ * @brief Stroke pattern transformation matrix
*/
- int GrMask;
- double GrMaskStartX;
- double GrMaskStartY;
- double GrMaskEndX;
- double GrMaskEndY;
- double GrMaskFocalX;
- double GrMaskFocalY;
- double GrMaskScale;
- double GrMaskSkew;
- double patternMaskScaleX;
- double patternMaskScaleY;
- double patternMaskOffsetX;
- double patternMaskOffsetY;
- double patternMaskRotation;
- double patternMaskSkewX;
- double patternMaskSkewY;
- bool patternMaskMirrorX;
- bool patternMaskMirrorY;
- QString patternMaskVal;
- QString gradientMaskVal;
- VGradient mask_gradient;
-
- /** Inline Image */
- bool isInlineImage;
- bool isTempFile;
- //items welding (item follows while item moves which they are
connected with)
- struct WeldingInfo
- {
- PageItem *weldItem;
- FPoint weldPoint;
- int weldID;
- };
- QList<WeldingInfo> weldList;
- double hatchAngle;
- double hatchDistance;
- int hatchType; // 0 = single 1 =
double 2 = triple
- bool hatchUseBackground;
- QString hatchBackground;
- QString hatchForeground;
-
- // End public variables
+ double patternStrokeScaleX;
+ double patternStrokeScaleY;
+ double patternStrokeOffsetX;
+ double patternStrokeOffsetY;
+ double patternStrokeRotation;
+ double patternStrokeSkewX;
+ double patternStrokeSkewY;
+ double patternStrokeSpace;
+ bool patternStrokeMirrorX;
+ bool patternStrokeMirrorY;
+ bool patternStrokePath;
+
+
+ /**
+ * @brief Stroke gradient name
+ * @sa PageItem::strokeGradient(), PageItem::setStrokeGradient()
+ */
+ QString gradientStrokeVal;
+ VGradient stroke_gradient;
+
+ /**
+ * @brief Stroke gradient variables
+ */
+ int GrTypeStroke;
+ double GrStrokeStartX;
+ double GrStrokeStartY;
+ double GrStrokeEndX;
+ double GrStrokeEndY;
+ double GrStrokeFocalX;
+ double GrStrokeFocalY;
+ double GrStrokeScale;
+ double GrStrokeSkew;
+ VGradient::VGradientRepeatMethod GrStrokeExtend;
+
+ /**
+ * @brief Mask gradient variables
+ */
+ int GrMask;
+ double GrMaskStartX;
+ double GrMaskStartY;
+ double GrMaskEndX;
+ double GrMaskEndY;
+ double GrMaskFocalX;
+ double GrMaskFocalY;
+ double GrMaskScale;
+ double GrMaskSkew;
+ double patternMaskScaleX;
+ double patternMaskScaleY;
+ double patternMaskOffsetX;
+ double patternMaskOffsetY;
+ double patternMaskRotation;
+ double patternMaskSkewX;
+ double patternMaskSkewY;
+ bool patternMaskMirrorX;
+ bool patternMaskMirrorY;
+ QString patternMaskVal;
+ QString gradientMaskVal;
+ VGradient mask_gradient;
+
+ /** Inline Image */
+ bool isInlineImage;
+ bool isTempFile;
+ //items welding (item follows while item moves which they are connected
with)
+ struct WeldingInfo
+ {
+ PageItem *weldItem;
+ FPoint weldPoint;
+ int weldID;
+ };
+ QList<WeldingInfo> weldList;
+ double hatchAngle;
+ double hatchDistance;
+ int hatchType; // 0 = single 1 = double 2 =
triple
+ bool hatchUseBackground;
+ QString hatchBackground;
+ QString hatchForeground;
+
+ // End public variables
protected: // Start protected functions
PageItem(const PageItem & other);
@@ -1749,49 +1735,49 @@
* @brief Fill color name
* @sa PageItem::fillColor(), PageItem::setFillColor()
*/
- QString fillColorVal;
+ QString m_fillColor;
/**
* @brief Line color name
* @sa PageItem::lineColor(), PageItem::setLineColor()
*/
- QString lineColorVal;
+ QString m_lineColor;
/**
* @brief Line shade
* @sa PageItem::lineShade, PageItem::setLineShade()
*/
- double lineShadeVal;
+ double m_lineShade;
/**
* @brief Fill shade
* @sa PageItem::fillShade, PageItem::setFillShade()
*/
- double fillShadeVal;
+ double m_fillShade;
/**
* @brief Fill transparency
* @sa PageItem::fillTransparency(), PageItem::setFillTransparency()
*/
- double fillTransparencyVal;
+ double m_fillTransparency;
/**
* @brief Line stroke transparency.
* @sa PageItem::lineTransparency(), PageItem::setLineTransparency()
*/
- double lineTransparencyVal;
+ double m_lineTransparency;
/**
* @brief Fill transparency blendmode
* @sa PageItem::fillBlendmode(), PageItem::setFillBlendmode()
*/
- int fillBlendmodeVal;
+ int m_fillBlendMode;
/**
* @brief Line stroke transparency blendmode.
* @sa PageItem::lineBlendmode(), PageItem::setLineBlendmode()
*/
- int lineBlendmodeVal;
+ int m_lineBlendMode;
/**
* @brief Is the image in this image item flipped horizontally?
@@ -1828,7 +1814,7 @@
* @brief Should text flow around the item
* @sa PageItem::textFlowMode(), PateItem::setTextFlowMode()
*/
- TextFlowMode textFlowModeVal;
+ TextFlowMode m_textFlowMode;
/**
* @brief Stores the attributes of the pageitem (NOT properties, the
user defined ATTRIBUTES)
@@ -1863,18 +1849,35 @@
double m_width; ///< Width of the item
double m_height; ///< Height of the item
double m_rotation; ///< Rotation of the item
- bool m_isSelected; ///< Is the item selected?
+ bool m_isSelected; ///< Is the item selected?
+ bool m_imageVisible; ///< Darstellungsart Bild/Titel
double m_imageXScale; ///< Scaling X Factor for images
double m_imageYScale; ///< Scaling Y Factor for images
double m_imageXOffset; ///< Image X Offset to frame
double m_imageYOffset; ///< Image Y Offset to frame
double m_imageRotation; ///< Image rotation in frame
FirstLineOffsetPolicy m_firstLineOffset;
- bool m_groupClips;
+ bool m_groupClips;
QColor hatchBackgroundQ;
QColor hatchForegroundQ;
- // End protected variables
+ int m_startArrowIndex;
+ int m_endArrowIndex;
+ int m_startArrowScale;
+ int m_endArrowScale;
+
+ bool m_hasSoftShadow;
+ QString m_softShadowColor;
+ int m_softShadowShade;
+ double m_softShadowBlurRadius;
+ double m_softShadowXOffset;
+ double m_softShadowYOffset;
+ double m_softShadowOpacity;
+ int m_softShadowBlendMode;
+ bool m_softShadowErasedByObject;
+ bool m_softShadowHasObjectTransparency;
+
+ // End protected variables
private: // Start private functions
/**
Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23044&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp Sat Jun 22 11:46:28 2019
@@ -44,7 +44,7 @@
itemText.setDefaultStyle(newStyle);
itemText.blockSignals(false);
- textFlowModeVal = TextFlowUsesFrameShape;
+ m_textFlowMode = TextFlowUsesFrameShape;
setColumns(1);
if (m_nstyle->isAutoNotesHeight())
@@ -67,7 +67,7 @@
{
m_nstyle = nullptr;
m_masterFrame = nullptr;
- textFlowModeVal = TextFlowUsesFrameShape;
+ m_textFlowMode = TextFlowUsesFrameShape;
deleteIt = false;
}
@@ -108,7 +108,7 @@
oldXpos = m_xPos;
m_yPos = oldYpos = m_masterFrame->yPos() + m_masterFrame->height();
- textFlowModeVal = TextFlowUsesFrameShape;
+ m_textFlowMode = TextFlowUsesFrameShape;
setColumns(1);
if (m_nstyle->isAutoWeldNotesFrames() && (m_masterFrame != nullptr))
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
