Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits)
  expect fail for some PinchArea tests on mac
  Allow functions to be passed in as values for grouped properties
  Fix lineHeight autotests.
  Update Docs, Examples and Demos for new CreateObject overloadable
  Adding support for group properties in Component::CreateObject()
  Update test, versioning is fixed so expect-fail no longer needed
  Test failure fixed - remove XFAIL
  photoviewer needs QtQuick 1.1 for Image::cache
  disable some pincharea tests on mac temporarily
  Fix failing test on mac for Qt.application
  Fix test breakage for qdeclarativeworkerscript
  Fix typo in error message.
  Doc fix for lineHeight.
  Add support for line spacing in Text element.
  Fixing right-to-left text in Text and TextInput
  Fix MaximumLineCount in Text and add tests
  Ensure simple objects also get the appropriate property cache
  Add test for Loader implicitWidth/implicitHeight
  Don't crash when appending a null item
  Test for passing functions to createObject() for property bindings
  ...

1 files changed, 159 insertions, 14 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index ef3404f..3d2466d 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -50,6 +50,8 @@
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPainter>
+#include <QTextBoundaryFinder>
+#include <qstyle.h>
 
 #ifndef QT_NO_LINEEDIT
 
@@ -75,7 +77,7 @@ QT_BEGIN_NAMESPACE
     \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example}
 */
 QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent)
-    : QDeclarativePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
+    : QDeclarativeImplicitSizePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
 {
     Q_D(QDeclarativeTextInput);
     d->init();
@@ -353,6 +355,16 @@ void QDeclarativeTextInput::setHAlign(HAlignment align)
     emit horizontalAlignmentChanged(d->hAlign);
 }
 
+/*!
+    \qmlproperty bool TextInput::readOnly
+
+    Sets whether user input can modify the contents of the TextInput.
+
+    If readOnly is set to true, then user input will not affect the text
+    property. Any bindings or attempts to set the text property will still
+    work.
+*/
+
 bool QDeclarativeTextInput::isReadOnly() const
 {
     Q_D(const QDeclarativeTextInput);
@@ -370,6 +382,14 @@ void QDeclarativeTextInput::setReadOnly(bool ro)
     emit readOnlyChanged(ro);
 }
 
+/*!
+    \qmlproperty int TextInput::maximumLength
+    The maximum permitted length of the text in the TextInput.
+
+    If the text is too long, it is truncated at the limit.
+
+    By default, this property contains a value of 32767.
+*/
 int QDeclarativeTextInput::maxLength() const
 {
     Q_D(const QDeclarativeTextInput);
@@ -1075,10 +1095,11 @@ void QDeclarativeTextInputPrivate::updateHorizontalScroll()
     int cix = qRound(control->cursorToX());
     QRect br(q->boundingRect().toRect());
     int widthUsed = calculateTextWidth();
+    Qt::Alignment va = QStyle::visualAlignment(control->layoutDirection(), QFlag(Qt::Alignment(hAlign)));
     if (autoScroll) {
         if (widthUsed <=  br.width()) {
             // text fits in br; use hscroll for alignment
-            switch (hAlign & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
+            switch (va & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
             case Qt::AlignRight:
                 hscroll = widthUsed - br.width() - 1;
                 break;
@@ -1102,12 +1123,17 @@ void QDeclarativeTextInputPrivate::updateHorizontalScroll()
             hscroll = widthUsed - br.width() + 1;
         }
     } else {
-        if(hAlign == QDeclarativeTextInput::AlignRight){
+        switch (va & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
+        case Qt::AlignRight:
             hscroll = q->width() - widthUsed;
-        }else if(hAlign == QDeclarativeTextInput::AlignHCenter){
+            break;
+        case Qt::AlignHCenter:
             hscroll = (q->width() - widthUsed) / 2;
-        } else {
+            break;
+        default:
+            // Left
             hscroll = 0;
+            break;
         }
     }
 }
@@ -1169,6 +1195,17 @@ QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property)
 }
 
 /*!
+    \qmlmethod void TextInput::deselect()
+
+    Removes active text selection.
+*/
+void QDeclarativeTextInput::deselect()
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->deselect();
+}
+
+/*!
     \qmlmethod void TextInput::selectAll()
 
     Causes all text to be selected.
@@ -1211,7 +1248,8 @@ void QDeclarativeTextInput::copy()
 void QDeclarativeTextInput::paste()
 {
     Q_D(QDeclarativeTextInput);
-    d->control->paste();
+    if(!d->control->isReadOnly())
+        d->control->paste();
 }
 #endif // QT_NO_CLIPBOARD
 
@@ -1310,35 +1348,125 @@ void QDeclarativeTextInput::setSelectByMouse(bool on)
     }
 }
 
+bool QDeclarativeTextInput::canPaste() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->canPaste;
+}
+
+void QDeclarativeTextInput::moveCursorSelection(int position)
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->moveCursor(position, true);
+    d->updateHorizontalScroll();
+}
 
 /*!
-    \qmlmethod void TextInput::moveCursorSelection(int position)
+    \qmlmethod void TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters)
+    \since Quick 1.1
 
-    Moves the cursor to \a position and updates the selection accordingly.
-    (To only move the cursor, set the \l cursorPosition property.)
+    Moves the cursor to \a position and updates the selection according to the optional \a mode
+    parameter.  (To only move the cursor, set the \l cursorPosition property.)
 
     When this method is called it additionally sets either the
     selectionStart or the selectionEnd (whichever was at the previous cursor position)
     to the specified position. This allows you to easily extend and contract the selected
     text range.
 
+    The selection mode specifies whether the selection is updated on a per character or a per word
+    basis.  If not specified the selection mode will default to TextInput.SelectCharacters.
+
+    \list
+    \o TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at
+    the previous cursor position) to the specified position.
+    \o TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all
+    words between the specified postion and the previous cursor position.  Words partially in the
+    range are included.
+    \endlist
+
     For example, take this sequence of calls:
 
     \code
         cursorPosition = 5
-        moveCursorSelection(9)
-        moveCursorSelection(7)
+        moveCursorSelection(9, TextInput.SelectCharacters)
+        moveCursorSelection(7, TextInput.SelectCharacters)
     \endcode
 
     This moves the cursor to position 5, extend the selection end from 5 to 9
     and then retract the selection end from 9 to 7, leaving the text from position 5 to 7
     selected (the 6th and 7th characters).
+
+    The same sequence with TextInput.SelectWords will extend the selection start to a word boundary
+    before or on position 5 and extend the selection end to a word boundary past position 9, and
+    then if there is a word boundary between position 7 and 8 retract the selection end to that
+    boundary.  If there is whitespace at position 7 the selection will be retracted further.
 */
-void QDeclarativeTextInput::moveCursorSelection(int position)
+void QDeclarativeTextInput::moveCursorSelection(int pos, SelectionMode mode)
 {
     Q_D(QDeclarativeTextInput);
-    d->control->moveCursor(position, true);
-    d->updateHorizontalScroll();
+
+    if (mode == SelectCharacters) {
+        d->control->moveCursor(pos, true);
+    } else if (pos != d->control->cursor()){
+        int anchor;
+        if (!d->control->hasSelectedText())
+            anchor = d->control->cursor();
+        else if (d->control->selectionStart() == d->control->cursor())
+            anchor = d->control->selectionEnd();
+        else
+            anchor = d->control->selectionStart();
+
+        if (anchor < pos) {
+            QTextBoundaryFinder finder(QTextBoundaryFinder::Word, d->control->text());
+            finder.setPosition(anchor);
+
+            if (!(finder.boundaryReasons() & QTextBoundaryFinder::StartWord)) {
+                 finder.toNextBoundary();
+                 if (finder.boundaryReasons() != QTextBoundaryFinder::StartWord)
+                    finder.toPreviousBoundary();
+            }
+            anchor = finder.position();
+
+            finder.setPosition(pos);
+            if (!(finder.boundaryReasons() & QTextBoundaryFinder::EndWord)) {
+                finder.toPreviousBoundary();
+                if (finder.boundaryReasons() != QTextBoundaryFinder::EndWord)
+                    finder.toNextBoundary();
+            }
+            int cursor = finder.position();
+
+            if (anchor < cursor)
+                d->control->setSelection(anchor, cursor - anchor);
+            else
+                d->control->moveCursor(pos, false);
+
+        } else if (anchor > pos) {
+            QTextBoundaryFinder finder(QTextBoundaryFinder::Word, d->control->text());
+
+            finder.setPosition(anchor);
+            if (!(finder.boundaryReasons() & QTextBoundaryFinder::EndWord)) {
+                finder.toPreviousBoundary();
+                if (finder.boundaryReasons() != QTextBoundaryFinder::EndWord)
+                    finder.toNextBoundary();
+            }
+            anchor = finder.position();
+
+            finder.setPosition(pos);
+            if (!(finder.boundaryReasons() & QTextBoundaryFinder::StartWord)) {
+                 finder.toNextBoundary();
+                 if (finder.boundaryReasons() != QTextBoundaryFinder::StartWord)
+                    finder.toPreviousBoundary();
+            }
+            int cursor = finder.position();
+
+            if (anchor > cursor)
+                d->control->setSelection(anchor, cursor - anchor);
+            else
+                d->control->moveCursor(pos, false);
+        } else {
+            d->control->moveCursor(pos, false);
+        }
+    }
 }
 
 /*!
@@ -1474,6 +1602,12 @@ void QDeclarativeTextInputPrivate::init()
                q, SIGNAL(accepted()));
     q->connect(control, SIGNAL(updateNeeded(QRect)),
                q, SLOT(updateRect(QRect)));
+#ifndef QT_NO_CLIPBOARD
+    q->connect(q, SIGNAL(readOnlyChanged(bool)),
+            q, SLOT(q_canPasteChanged()));
+    q->connect(QApplication::clipboard(), SIGNAL(dataChanged()),
+            q, SLOT(q_canPasteChanged()));
+#endif // QT_NO_CLIPBOARD
     q->updateSize();
     oldValidity = control->hasAcceptableInput();
     lastSelectionStart = 0;
@@ -1575,6 +1709,17 @@ void QDeclarativeTextInput::updateSize(bool needsRedraw)
     }
 }
 
+void QDeclarativeTextInput::q_canPasteChanged()
+{
+    Q_D(QDeclarativeTextInput);
+    bool old = d->canPaste;
+#ifndef QT_NO_CLIPBOARD
+    d->canPaste = !d->control->isReadOnly() && QApplication::clipboard()->text().length() != 0;
+#endif
+    if(d->canPaste != old)
+        emit canPasteChanged();
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_LINEEDIT