1 files changed, 47 insertions, 13 deletions

diff --git a/examples/quick/controls/text/src/documenthandler.cpp b/examples/quick/controls/text/src/documenthandler.cpp
index 48b6d033..e0c9610d 100644
--- a/examples/quick/controls/text/src/documenthandler.cpp
+++ b/examples/quick/controls/text/src/documenthandler.cpp
@@ -52,7 +52,6 @@ DocumentHandler::DocumentHandler()
     , m_selectionStart(0)
     , m_selectionEnd(0)
 {
-    setFileUrl(QUrl("qrc:/example.html"));
 }
 
 void DocumentHandler::setTarget(QQuickItem *target)
@@ -91,6 +90,8 @@ void DocumentHandler::setFileUrl(const QUrl &arg)
 
                 emit textChanged();
                 emit documentTitleChanged();
+
+                reset();
             }
         }
         emit fileUrlChanged();
@@ -135,12 +136,18 @@ void DocumentHandler::setCursorPosition(int position)
 
     m_cursorPosition = position;
 
-    emit currentFontChanged();
+    reset();
+}
+
+void DocumentHandler::reset()
+{
+    emit fontFamilyChanged();
     emit alignmentChanged();
     emit boldChanged();
     emit italicChanged();
     emit underlineChanged();
     emit fontSizeChanged();
+    emit textColorChanged();
 }
 
 QTextCursor DocumentHandler::textCursor() const
@@ -166,13 +173,11 @@ void DocumentHandler::mergeFormatOnWordOrSelection(const QTextCharFormat &format
 void DocumentHandler::setSelectionStart(int position)
 {
     m_selectionStart = position;
-//    emit selectionStartChanged();
 }
 
 void DocumentHandler::setSelectionEnd(int position)
 {
     m_selectionEnd = position;
-//    emit selectionEndChanged();
 }
 
 void DocumentHandler::setAlignment(Qt::Alignment a)
@@ -188,10 +193,8 @@ void DocumentHandler::setAlignment(Qt::Alignment a)
 
 Qt::Alignment DocumentHandler::alignment() const
 {
-//    if (!m_doc || m_doc->isEmpty() || m_cursorPosition < 0)
-//        return Qt::AlignLeft;
     QTextCursor cursor = textCursor();
-    if (cursor.isNull() || cursor.blockNumber() == 0)
+    if (cursor.isNull())
         return Qt::AlignLeft;
     return textCursor().blockFormat().alignment();
 }
@@ -199,7 +202,7 @@ Qt::Alignment DocumentHandler::alignment() const
 bool DocumentHandler::bold() const
 {
     QTextCursor cursor = textCursor();
-    if (cursor.isNull() || cursor.blockNumber() == 0)
+    if (cursor.isNull())
         return false;
     return textCursor().charFormat().fontWeight() == QFont::Bold;
 }
@@ -207,7 +210,7 @@ bool DocumentHandler::bold() const
 bool DocumentHandler::italic() const
 {
     QTextCursor cursor = textCursor();
-    if (cursor.isNull() || cursor.blockNumber() == 0)
+    if (cursor.isNull())
         return false;
     return textCursor().charFormat().fontItalic();
 }
@@ -215,7 +218,7 @@ bool DocumentHandler::italic() const
 bool DocumentHandler::underline() const
 {
     QTextCursor cursor = textCursor();
-    if (cursor.isNull() || cursor.blockNumber() == 0)
+    if (cursor.isNull())
         return false;
     return textCursor().charFormat().fontUnderline();
 }
@@ -264,13 +267,44 @@ void DocumentHandler::setFontSize(int arg)
     emit fontSizeChanged();
 }
 
-QFont DocumentHandler::currentFont() const
+QColor DocumentHandler::textColor() const
+{
+    QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return QColor(Qt::black);
+    QTextCharFormat format = cursor.charFormat();
+    return format.foreground().color();
+}
+
+void DocumentHandler::setTextColor(const QColor &c)
+{
+    QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return;
+    QTextCharFormat format;
+    format.setForeground(QBrush(c));
+    mergeFormatOnWordOrSelection(format);
+    emit textColorChanged();
+}
+
+QString DocumentHandler::fontFamily() const
 {
     QTextCursor cursor = textCursor();
     if (cursor.isNull())
-        return QFont();
+        return QString();
     QTextCharFormat format = cursor.charFormat();
-    return format.font();
+    return format.font().family();
+}
+
+void DocumentHandler::setFontFamily(const QString &arg)
+{
+    QTextCursor cursor = textCursor();
+    if (cursor.isNull())
+        return;
+    QTextCharFormat format;
+    format.setFontFamily(arg);
+    mergeFormatOnWordOrSelection(format);
+    emit fontFamilyChanged();
 }
 
 QStringList DocumentHandler::defaultFontSizes() const