View Issue Details
ID | Project | Category | View Status | Date Submitted | Last Update |
---|---|---|---|---|---|
0001632 | Scribus | Internal | public | 2005-02-04 16:43 | 2005-02-04 17:58 |
Reporter | Assigned To | Tsoots | |||
Priority | normal | Severity | tweak | Reproducibility | always |
Status | closed | Resolution | fixed | ||
Platform | x86 Linux | OS | Fedora Core | OS Version | 3 |
Product Version | 1.3.0cvs | ||||
Fixed in Version | 1.3.0cvs | ||||
Summary | 0001632: PATCH: add getters and properties for all existing setters in PageItem (Round 2) | ||||
Description | Some more getters and their corresponding property definitions. Pretty boring stuff, but continues laying the groundwork for making more members protected and continuing the renaming work. | ||||
Tags | No tags attached. | ||||
Patch | |||||
2005-02-04 16:43
|
pageitem_getters_and_properties.diff (8,312 bytes)
Index: scribus/pageitem.cpp =================================================================== RCS file: /cvs/Scribus/scribus/pageitem.cpp,v retrieving revision 1.121.2.59 diff -u -r1.121.2.59 pageitem.cpp --- scribus/pageitem.cpp 4 Feb 2005 14:04:33 -0000 1.121.2.59 +++ scribus/pageitem.cpp 4 Feb 2005 17:39:59 -0000 @@ -2620,6 +2620,11 @@ toggleSizeLock(); } +QString PageItem::font() const +{ + return IFont; +} + void PageItem::setFont(const QString& newFont) { if (UndoManager::undoEnabled()) @@ -2634,6 +2639,11 @@ IFont = newFont; } +int PageItem::fontSize() const +{ + return ISize; +} + void PageItem::setFontSize(int newSize) { if (UndoManager::undoEnabled()) @@ -2648,6 +2658,11 @@ ISize = newSize; } +int PageItem::fontWidth() const +{ + return TxtScale; +} + void PageItem::setFontWidth(int newWidth) { if (UndoManager::undoEnabled()) @@ -2662,6 +2677,11 @@ TxtScale = newWidth; } +QString PageItem::fontFillColor() const +{ + return TxtFill; +} + void PageItem::setFontFillColor(const QString& newColor) { if (UndoManager::undoEnabled()) @@ -2676,6 +2696,11 @@ TxtFill = newColor; } +QString PageItem::fontStrokeColor() const +{ + return TxtStroke; +} + void PageItem::setFontStrokeColor(const QString& newColor) { if (UndoManager::undoEnabled()) @@ -2690,6 +2715,11 @@ TxtStroke = newColor; } +int PageItem::fontFillShade() const +{ + return ShTxtFill; +} + void PageItem::setFontFillShade(int newShade) { if (UndoManager::undoEnabled()) @@ -2705,6 +2735,11 @@ ShTxtFill = newShade; } +int PageItem::fontStrokeShade() const +{ + return ShTxtStroke; +} + void PageItem::setFontStrokeShade(int newShade) { if (UndoManager::undoEnabled()) @@ -2720,6 +2755,10 @@ ShTxtStroke = newShade; } +int PageItem::fontEffects() const +{ + return TxTStyle; +} void PageItem::setFontEffects(int newEffects) { @@ -2735,6 +2774,11 @@ TxTStyle |= newEffects; } +double PageItem::kerning() const +{ + return ExtraV; +} + void PageItem::setKerning(double newKerning) { if (UndoManager::undoEnabled()) @@ -2750,6 +2794,11 @@ ExtraV = newKerning; } +double PageItem::lineSpacing() const +{ + return LineSp; +} + void PageItem::setLineSpacing(double newSpacing) { if (UndoManager::undoEnabled()) @@ -2765,6 +2814,11 @@ LineSp = newSpacing; } +QString PageItem::language() const +{ + return Language; +} + void PageItem::setLanguage(const QString& newLanguage) { if (UndoManager::undoEnabled()) @@ -2778,6 +2832,11 @@ undoManager->action(this, ss); } Language = newLanguage; +} + +int PageItem::frameType() const +{ + return PType; } void PageItem::convertTo(int newType) Index: scribus/pageitem.h =================================================================== RCS file: /cvs/Scribus/scribus/pageitem.h,v retrieving revision 1.26.2.36 diff -u -r1.26.2.36 pageitem.h --- scribus/pageitem.h 4 Feb 2005 14:04:33 -0000 1.26.2.36 +++ scribus/pageitem.h 4 Feb 2005 17:39:59 -0000 @@ -56,6 +56,21 @@ Q_PROPERTY(QString customLineStyle READ customLineStyle WRITE setCustomLineStyle DESIGNABLE false) Q_PROPERTY(int startArrowIndex READ getStartArrowIndex WRITE setStartArrowIndex DESIGNABLE false) Q_PROPERTY(int endArrowIndex READ getEndArrowIndex WRITE setEndArrowIndex DESIGNABLE false) + Q_PROPERTY(QString font READ font WRITE setFont DESIGNABLE false) + Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize DESIGNABLE false) + Q_PROPERTY(int fontWidth READ fontWidth WRITE setFontWidth DESIGNABLE false) + Q_PROPERTY(QString fontFillColor READ fontFillColor WRITE setFontFillColor DESIGNABLE false) + Q_PROPERTY(int fontFillShade READ fontFillShade WRITE setFontFillShade DESIGNABLE false) + Q_PROPERTY(QString fontStrokeColor READ fontStrokeColor WRITE setFontStrokeColor DESIGNABLE false) + Q_PROPERTY(int fontStrokeShade READ fontStrokeShade WRITE setFontStrokeShade DESIGNABLE false) + Q_PROPERTY(int fontEffects READ fontEffects WRITE setFontEffects DESIGNABLE false) + Q_PROPERTY(double kerning READ kerning WRITE setKerning DESIGNABLE false) + Q_PROPERTY(double lineSpacing READ lineSpacing WRITE setLineSpacing DESIGNABLE false) + Q_PROPERTY(QString language READ language WRITE setLanguage DESIGNABLE false) + + // FIXME: QMetaProperty can't translate these to/from enumerator names, probably because the + // properties aren't moc'd in the Qt sources. They work fine in their + // current state as plain integer properties. Q_ENUMS(PenStyle) Q_PROPERTY(PenStyle lineStyle READ lineStyle WRITE setLineStyle DESIGNABLE false) Q_ENUMS(PenCapStyle) @@ -63,6 +78,15 @@ Q_ENUMS(PenJoinStyle) Q_PROPERTY(PenJoinStyle lineJoin READ lineJoin WRITE setLineJoin DESIGNABLE false) + // This property may not hang around for too long, but should be useful + // when testing out the pageitem refactoring work. Setting it is unlikely + // to currently have the desired effect. + /** + * @brief Frame type. + * @warning Do not set this property except for testing and debug purposes. + */ + Q_PROPERTY(int frameType READ frameType WRITE convertTo DESIGNABLE false) + public: PageItem(ScribusDoc *pa, int art, double x, double y, double w, double h, double w2, QString fill, QString outline); ~PageItem() {}; @@ -468,62 +492,105 @@ /** @brief set lock for resizing */ void setSizeLocked(bool isLocked); + /** @brief Get the PageItem-wide font name */ + QString font() const; /** * @brief Set font for the PageItem. * @param newFont name of the font */ void setFont(const QString& newFont); + + /** @brief Get the PageItem-wide font size */ + int fontSize() const; /** * @brief Set the font size of the frame * @param newSize font size */ void setFontSize(int newSize); + + /** @brief Get the PageItem-wide character width scaling percentage */ + int fontWidth() const; /** * @brief Set scaling width of character * @param newWidth width of character */ void setFontWidth(int newWidth); + + /** @brief Get the name of the PageItem-wide font fill color */ + QString fontFillColor() const; /** * @brief Set font fill color * @param newColor font fill color */ void setFontFillColor(const QString& newColor); + + /** @brief Get the PageItem-wide font fill shade */ + int fontFillShade() const; /** * @brief Set the shade of font fill color * @param newShade shade of font fill color */ void setFontFillShade(int newShade); + + /** @brief Get the PageItem-wide font stroke color */ + QString fontStrokeColor() const; /** * @brief Set the color of font stroke * @param newColor color of font stroke */ void setFontStrokeColor(const QString& newColor); + + /** @brief Get the PageItem-wide font stroke shade */ + int fontStrokeShade() const; /** * @brief Set the shade of font stroke color * @param newShade shade of font stroke color */ void setFontStrokeShade(int newShade); + + /** @brief Get the PageItem-wide font effects flags + * + * TODO This should probably be an enum set + */ + int fontEffects() const; /** * @brief Set font effects * @param newEffects font effects */ void setFontEffects(int newEffects); + + /** @brief Get PageItem-wide text kerning */ + double kerning() const; /** * @brief Set kerning for the text * @param newKerning kerning for the text */ void setKerning(double newKerning); + + /** @brief Get the PageItem-wide line spacing */ + double lineSpacing() const; /** * @brief Set a line spacing for the frame * @param newSpacing line spacing for the frame */ void setLineSpacing(double newSpacing); + + /** @brief Get the hyphenation language for the frame */ + QString language() const; /** * @brief Set the hyphenation language for the frame * @param newLanguage hyphenation language for the frame */ void setLanguage(const QString& newLanguage); + /** @brief Get the frame type + * + * @attention The whole concept of frame types is due for some radical + * re-working, so don't rely on this interface staying stable. + * It's here as an interim step to eliminate direct member access + * on PageItems. + */ + int frameType() const; /** * @brief Convert this PageItem to PageItem type <code>newType</code> * @param newType PageItem type for conversion |
|
Applied by tsoots. |
Date Modified | Username | Field | Change |
---|---|---|---|
2005-02-04 16:43 |
|
New Issue | |
2005-02-04 16:43 |
|
File Added: pageitem_getters_and_properties.diff | |
2005-02-04 16:47 |
|
Relationship added | related to 0001616 |
2005-02-04 17:38 | Tsoots | Status | new => assigned |
2005-02-04 17:38 | Tsoots | Assigned To | => Tsoots |
2005-02-04 17:52 | Tsoots | Status | assigned => resolved |
2005-02-04 17:52 | Tsoots | Fixed in Version | => 1.3.0cvs |
2005-02-04 17:52 | Tsoots | Resolution | open => fixed |
2005-02-04 17:58 |
|
Status | resolved => closed |
2005-02-04 17:58 |
|
Note Added: 0003626 | |
2005-02-09 05:58 |
|
Relationship added | child of 0001653 |