summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxtext.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/fx/qfxtext.h')
-rw-r--r--src/declarative/fx/qfxtext.h19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index 2358fe3..b7ec333 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -58,17 +58,20 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
Q_ENUMS(HAlignment)
Q_ENUMS(VAlignment)
Q_ENUMS(TextStyle)
+ Q_ENUMS(TextFormat)
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
- Q_PROPERTY(QmlFont *font READ font)
+ Q_PROPERTY(QmlFont *font READ font CONSTANT)
Q_PROPERTY(QColor color READ color WRITE setColor)
Q_PROPERTY(TextStyle style READ style WRITE setStyle)
Q_PROPERTY(QColor styleColor READ styleColor WRITE setStyleColor)
Q_PROPERTY(HAlignment hAlign READ hAlign WRITE setHAlign)
Q_PROPERTY(VAlignment vAlign READ vAlign WRITE setVAlign)
Q_PROPERTY(bool wrap READ wrap WRITE setWrap)
+ Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode)
Q_PROPERTY(QString activeLink READ activeLink)
+ Q_PROPERTY(bool smooth READ smoothTransform WRITE setSmoothTransform)
public:
QFxText(QFxItem *parent=0);
@@ -84,6 +87,9 @@ public:
Outline,
Raised,
Sunken };
+ enum TextFormat { AutoText,
+ PlainText,
+ RichText };
QString text() const;
void setText(const QString &);
@@ -108,11 +114,17 @@ public:
bool wrap() const;
void setWrap(bool w);
+ TextFormat textFormat() const;
+ void setTextFormat(TextFormat format);
+
Qt::TextElideMode elideMode() const;
void setElideMode(Qt::TextElideMode);
QString activeLink() const;
+ bool smoothTransform() const;
+ void setSmoothTransform(bool);
+
virtual QString propertyInfo() const;
void paintContents(QPainter &p);
@@ -138,10 +150,11 @@ private:
Q_DISABLE_COPY(QFxText)
Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxText)
};
-QML_DECLARE_TYPE(QFxText)
-
QT_END_NAMESPACE
+QML_DECLARE_TYPE(QFxText)
+
QT_END_HEADER
+
#endif