Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22715 → Rev 22716

/trunk/Scribus/scribus/pageitem.cpp
9882,7 → 9882,7
return last;
}
 
QRect PageItem::getRedrawBounding(const double viewScale)
QRect PageItem::getRedrawBounding(const double viewScale) const
{
int x = qRound(floor(BoundingX - Oldm_lineWidth / 2.0 - 5) * viewScale);
int y = qRound(floor(BoundingY - Oldm_lineWidth / 2.0 - 5) * viewScale);
10492,7 → 10492,7
updateGradientVectors();
}
 
QString PageItem::infoDescription()
QString PageItem::infoDescription() const
{
QString htmlText;
htmlText.append(ScribusView::tr("Print: "));
/trunk/Scribus/scribus/pageitem.h
274,7 → 274,7
PageItem_Table* parentTable() const { return (Parent ? Parent->asTable() : nullptr); }
 
virtual void applicableActions(QStringList& actionList) = 0;
virtual QString infoDescription();
virtual QString infoDescription() const;
virtual bool createInfoGroup(QFrame *, QGridLayout *) {return false;}
 
//<< ********* Functions related to drawing the item *********
292,7 → 292,7
/**
* @brief Set or get the redraw bounding box of the item, moved from the View
*/
QRect getRedrawBounding(const double);
QRect getRedrawBounding(const double viewScale) const;
void setRedrawBounding();
void setPolyClip(int up, int down = 0);
void updatePolyClip();
/trunk/Scribus/scribus/pageitem_arc.cpp
84,7 → 84,7
actionList << "itemConvertToTextFrame";
}
 
QString PageItem_Arc::infoDescription()
QString PageItem_Arc::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_arc.h
44,7 → 44,7
virtual bool isArc() const { return true; }
virtual ItemType realItemType() const { return PageItem::Arc; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
void recalcPath();
double arcHeight; //! height of the circumfering ellipse
double arcWidth; //! width of the circumfering ellipse
/trunk/Scribus/scribus/pageitem_group.cpp
273,7 → 273,7
{
}
 
QString PageItem_Group::infoDescription()
QString PageItem_Group::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_group.h
50,7 → 50,7
virtual void getNamedResources(ResourceCollection& lists) const;
virtual void replaceNamedResources(ResourceCollection& newNames);
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
 
/// Retrieve child items of this item
virtual QList<PageItem*> getChildren() const { return groupItemList; }
/trunk/Scribus/scribus/pageitem_imageframe.cpp
480,7 → 480,7
}
}
 
QString PageItem_ImageFrame::infoDescription()
QString PageItem_ImageFrame::infoDescription() const
{
QString htmlText;
htmlText.append( tr("Image") + "<br/>");
/trunk/Scribus/scribus/pageitem_imageframe.h
48,7 → 48,7
virtual bool createInfoGroup(QFrame *, QGridLayout *);
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e);
/trunk/Scribus/scribus/pageitem_latexframe.cpp
578,7 → 578,7
}
}
 
QString PageItem_LatexFrame::infoDescription()
QString PageItem_LatexFrame::infoDescription() const
{
QString htmlText;
htmlText.append("<h2>"+tr("Render Frame") + "</h2><table>");
/trunk/Scribus/scribus/pageitem_latexframe.h
54,7 → 54,7
virtual void clearContents();
virtual ItemType realItemType() const { return PageItem::LatexFrame; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
void layout();
/** @brief Perform undo/redo action */
/trunk/Scribus/scribus/pageitem_line.cpp
156,7 → 156,7
actionList << "itemConvertToBezierCurve";
}
 
QString PageItem_Line::infoDescription()
QString PageItem_Line::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_line.h
44,7 → 44,7
virtual bool isLine() const { return true; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
 
QPointF startPoint();
QPointF endPoint();
/trunk/Scribus/scribus/pageitem_pathtext.cpp
380,7 → 380,7
actionList << "itemConvertToOutlines";
}
 
QString PageItem_PathText::infoDescription()
QString PageItem_PathText::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_pathtext.h
45,7 → 45,7
virtual void layout();
virtual bool createInfoGroup(QFrame *, QGridLayout *);
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
 
virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
 
/trunk/Scribus/scribus/pageitem_polygon.cpp
64,7 → 64,7
actionList << "itemConvertToTextFrame";
}
 
QString PageItem_Polygon::infoDescription()
QString PageItem_Polygon::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_polygon.h
43,7 → 43,7
virtual PageItem_Polygon * asPolygon() { return this; }
virtual bool isPolygon() const { return true; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e);
/trunk/Scribus/scribus/pageitem_polyline.cpp
210,7 → 210,7
actionList << "itemConvertToPolygon";
}
 
QString PageItem_PolyLine::infoDescription()
QString PageItem_PolyLine::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_polyline.h
43,7 → 43,7
virtual bool isPolyLine() const { return true; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
 
virtual void getBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
virtual void getVisualBoundingRect(double *x1, double *y1, double *x2, double *y2) const;
/trunk/Scribus/scribus/pageitem_regularpolygon.cpp
86,7 → 86,7
actionList << "itemConvertToTextFrame";
}
 
QString PageItem_RegularPolygon::infoDescription()
QString PageItem_RegularPolygon::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_regularpolygon.h
44,7 → 44,8
virtual bool isRegularPolygon() const { return true; }
virtual ItemType realItemType() const { return PageItem::RegularPolygon; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
 
void recalcPath();
/* Regular Polygon Tool */
int polyCorners; //! Number of corners for a polygon
/trunk/Scribus/scribus/pageitem_spiral.cpp
345,7 → 345,7
actionList << "itemConvertToPolygon";
}
 
QString PageItem_Spiral::infoDescription()
QString PageItem_Spiral::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_spiral.h
44,7 → 44,7
virtual bool isSpiral() const { return true; }
virtual ItemType realItemType() const { return PageItem::Spiral; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
void recalcPath();
double spiralStartAngle; //! angle where the spiral starts
double spiralEndAngle; //! angle the spiral spans
/trunk/Scribus/scribus/pageitem_symbol.cpp
162,7 → 162,7
{
}
 
QString PageItem_Symbol::infoDescription()
QString PageItem_Symbol::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_symbol.h
44,7 → 44,7
virtual bool isSymbol() const { return true; }
virtual ItemType realItemType() const { return PageItem::Symbol; }
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e);
/trunk/Scribus/scribus/pageitem_table.h
498,7 → 498,7
virtual void applicableActions(QStringList& actionList);
 
/// Returns a textual description of this item.
virtual QString infoDescription() { return QString(); }
virtual QString infoDescription() const { return QString(); }
 
/// Returns the Cell Areas from this table
const QList<CellArea>& cellAreas() const { return m_cellAreas; }
/trunk/Scribus/scribus/pageitem_textframe.cpp
5507,7 → 5507,7
}
}
 
QString PageItem_TextFrame::infoDescription()
QString PageItem_TextFrame::infoDescription() const
{
return QString();
}
/trunk/Scribus/scribus/pageitem_textframe.h
100,7 → 100,7
void drawNoteIcon(ScPainter *p);
virtual bool createInfoGroup(QFrame *, QGridLayout *);
virtual void applicableActions(QStringList& actionList);
virtual QString infoDescription();
virtual QString infoDescription() const;
// Move incomplete lines from the previous frame if needed.
bool moveLinesFromPreviousFrame ();
void adjustParagraphEndings ();