3 files changed, 46 insertions, 7 deletions

diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index bf7a16d..3bc9696 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -377,6 +377,28 @@ void QFxTextEdit::setWrap(bool w)
     updateSize();
 }
 
+/*!
+    \property QFxTextEdit::cursorVisible
+    \brief If true the text edit shows a cursor.
+
+    This property is set and unset when the text edit gets focus, but it can also
+    be set directly (useful, for example, if a KeyProxy might forward keys to it).
+*/
+bool QFxTextEdit::isCursorVisible() const
+{
+    Q_D(const QFxTextEdit);
+    return d->cursorVisible;
+}
+
+void QFxTextEdit::setCursorVisible(bool on)
+{
+    Q_D(QFxTextEdit);
+    if (d->cursorVisible == on)
+        return;
+    d->cursorVisible = on;
+    QFocusEvent focusEvent(on ? QEvent::FocusIn : QEvent::FocusOut);
+    d->control->processEvent(&focusEvent, QPointF(0, 0));
+}
 
 void QFxTextEdit::geometryChanged(const QRectF &newGeometry, 
                                   const QRectF &oldGeometry)
@@ -591,8 +613,15 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
 void QFxTextEdit::focusChanged(bool hasFocus)
 {
     Q_D(QFxTextEdit);
-    QFocusEvent focusEvent(hasFocus ? QEvent::FocusIn : QEvent::FocusOut);
-    d->control->processEvent(&focusEvent, QPointF(0, 0));
+}
+
+/*!
+    Causes all text to be selected.
+*/
+void QFxTextEdit::selectAll()
+{
+    Q_D(QFxTextEdit);
+    d->control->selectAll();
 }
 
 static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e)
@@ -737,6 +766,7 @@ void QFxTextEditPrivate::init()
     document->setDocumentMargin(0);
     document->setUndoRedoEnabled(false); // flush undo buffer.
     document->setUndoRedoEnabled(true);
+    updateDefaultTextOption();
 }
 
 void QFxTextEdit::q_textChanged()
@@ -785,14 +815,13 @@ void QFxTextEdit::updateSize()
 
 void QFxTextEditPrivate::updateDefaultTextOption()
 {
-    QTextDocument *doc = control->document();
-
-    QTextOption opt = doc->defaultTextOption();
+    QTextOption opt = document->defaultTextOption();
     int oldAlignment = opt.alignment();
     opt.setAlignment((Qt::Alignment)(int)(hAlign | vAlign));
     
     QTextOption::WrapMode oldWrapMode = opt.wrapMode();
 
+qDebug() << "wrap mode is" << opt.wrapMode();
     if (wrap)
         opt.setWrapMode(QTextOption::WordWrap);
     else
@@ -800,7 +829,8 @@ void QFxTextEditPrivate::updateDefaultTextOption()
 
     if (oldWrapMode == opt.wrapMode() && oldAlignment == opt.alignment())
         return;
-    doc->setDefaultTextOption(opt);
+qDebug() << "wrap mode set to" << opt.wrapMode();
+    document->setDefaultTextOption(opt);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index e5e9421..068a25a 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -75,7 +75,9 @@ class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
     Q_PROPERTY(bool wrap READ wrap WRITE setWrap)
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+    Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible)
     Q_CLASSINFO("DefaultProperty", "text")
+
 public:
     QFxTextEdit(QFxItem *parent=0);
 
@@ -118,6 +120,9 @@ public:
     bool wrap() const;
     void setWrap(bool w);
 
+    bool isCursorVisible() const;
+    void setCursorVisible(bool on);
+
     virtual void dump(int depth);
     virtual QString propertyInfo() const;
 
@@ -145,6 +150,9 @@ Q_SIGNALS:
     void textChanged(const QString &);
     void cursorPositionChanged();
 
+public Q_SLOTS:
+    void selectAll();
+
 private Q_SLOTS:
     void fontChanged();
     void updateImgCache(const QRectF &rect);
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index b583dbe..f4591f5 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -68,7 +68,7 @@ class QFxTextEditPrivate : public QFxPaintedItemPrivate
 
 public:
     QFxTextEditPrivate()
-      : font(0), color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop), dirty(false), wrap(false), richText(false), format(QFxTextEdit::AutoText), document(0)
+      : font(0), color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop), dirty(false), wrap(false), richText(false), cursorVisible(false), format(QFxTextEdit::AutoText), document(0)
     {
     }
 
@@ -93,6 +93,7 @@ public:
     bool dirty;
     bool wrap;
     bool richText;
+    bool cursorVisible;
     QFxTextEdit::TextFormat format;
     QTextDocument *document;
     QTextControl *control;