summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/fx/qfxlineedit.h14
-rw-r--r--src/declarative/fx/qfxtext.h20
-rw-r--r--src/declarative/fx/qfxtextedit.h23
3 files changed, 28 insertions, 29 deletions
diff --git a/src/declarative/fx/qfxlineedit.h b/src/declarative/fx/qfxlineedit.h
index 0218fb0..1f4a5c6 100644
--- a/src/declarative/fx/qfxlineedit.h
+++ b/src/declarative/fx/qfxlineedit.h
@@ -55,6 +55,7 @@ QT_MODULE(Declarative)
class QFxLineEditPrivate;
class QValidator;
+//### class QFxTextInput??
class Q_DECLARATIVE_EXPORT QFxLineEdit : public QFxPaintedItem
{
Q_OBJECT
@@ -62,10 +63,10 @@ class Q_DECLARATIVE_EXPORT QFxLineEdit : public QFxPaintedItem
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QColor color READ color WRITE setColor)
- Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor)
- Q_PROPERTY(QColor highlightedTextColor READ highlightedTextColor WRITE setHighlightedTextColor)
+ Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor) //### selectionColor
+ Q_PROPERTY(QColor highlightedTextColor READ highlightedTextColor WRITE setHighlightedTextColor) //### selectedTextColor
Q_PROPERTY(QFont font READ font WRITE setFont)
- Q_PROPERTY(HAlignment hAlign READ hAlign WRITE setHAlign)
+ Q_PROPERTY(HAlignment hAlign READ hAlign WRITE setHAlign) //### horizontalAlignment
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible)
@@ -75,11 +76,12 @@ class Q_DECLARATIVE_EXPORT QFxLineEdit : public QFxPaintedItem
Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
- Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength)
- Q_PROPERTY(QObject* validator READ validator WRITE setValidator)
+ Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength) //### maximumLength
+ Q_PROPERTY(QObject* validator READ validator WRITE setValidator) //### QValidator *
Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask)
Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged)
- Q_PROPERTY(uint echoMode READ echoMode WRITE setEchoMode)
+ Q_PROPERTY(uint echoMode READ echoMode WRITE setEchoMode) //### enum
+ //### Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress)
public:
QFxLineEdit(QFxItem* parent=0);
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index edf6031..8eb19f4 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -63,12 +63,12 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
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(HAlignment hAlign READ hAlign WRITE setHAlign) // ### horizontalAlignment?
+ Q_PROPERTY(VAlignment vAlign READ vAlign WRITE setVAlign) // ### verticalAlignment?
+ Q_PROPERTY(bool wrap READ wrap WRITE setWrap) //### there are several wrap modes in Qt
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(Qt::TextElideMode elide READ elideMode WRITE setElideMode) //### elideMode?
+ Q_PROPERTY(QString activeLink READ activeLink) // ### remove
public:
QFxText(QFxItem *parent=0);
@@ -84,9 +84,9 @@ public:
Outline,
Raised,
Sunken };
- enum TextFormat { AutoText,
- PlainText,
- RichText };
+ enum TextFormat { PlainText = Qt::PlainText,
+ RichText = Qt::RichText,
+ AutoText = Qt::AutoText };
QString text() const;
void setText(const QString &);
@@ -118,7 +118,7 @@ public:
Qt::TextElideMode elideMode() const;
void setElideMode(Qt::TextElideMode);
- QString activeLink() const;
+ QString activeLink() const; // ### remove
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
@@ -126,7 +126,7 @@ public:
Q_SIGNALS:
void textChanged(const QString &text);
- void linkActivated(const QString &link);
+ void linkActivated(const QString &link); // ### document
protected:
QFxText(QFxTextPrivate &dd, QFxItem *parent);
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index f2f163b..0bdf16a 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -56,9 +56,8 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-/*!
-WARNING: SHORT TERM CLASS. INTENDED TO MERGE INTO QFxTextItem
-*/
+
+
class QFxTextEditPrivate;
class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
{
@@ -69,12 +68,12 @@ class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
Q_PROPERTY(QColor color READ color WRITE setColor)
- Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor)
- Q_PROPERTY(QColor highlightedTextColor READ highlightedTextColor WRITE setHighlightedTextColor)
+ Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor) //### selectionColor
+ Q_PROPERTY(QColor highlightedTextColor READ highlightedTextColor WRITE setHighlightedTextColor) //### selectedTextColor
Q_PROPERTY(QFont font READ font WRITE setFont)
- 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(HAlignment hAlign READ hAlign WRITE setHAlign) //### horizontalAlignment
+ Q_PROPERTY(VAlignment vAlign READ vAlign WRITE setVAlign) //### verticalAlignment
+ Q_PROPERTY(bool wrap READ wrap WRITE setWrap) //### other wrap modes
Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible)
@@ -102,11 +101,9 @@ public:
AlignVCenter = Qt::AlignVCenter
};
- enum TextFormat {
- AutoText,
- PlainText,
- RichText,
- };
+ enum TextFormat { PlainText = Qt::PlainText,
+ RichText = Qt::RichText,
+ AutoText = Qt::AutoText };
QString text() const;
void setText(const QString &);