summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextinput.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-2/+2
|\ | | | | | | | | Conflicts: tools/qml/qml.pri
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Use QML notation for documenting TextInput::accepted() signal. Document the TextInput accepted() signal.
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-0/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable.
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Scroll TextInput to ensure preedit text is visible.
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-041-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-8/+17
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-241-2/+2
| | | | | | | |
* | | | | | | | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display a cursor if both the item and its scene have focus. Change-Id: I0c91ab4d533cd7d773ffc2489633e12c0d399ad9 Task-number: QTBUG-17365 Reviewed-by: Martin Jones
* | | | | | | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-211-0/+47
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings TextInput in line with QLineEdit. The fix for TextEdit applies equally to QTextEdit. Change-Id: I5c47e5c8e951ee53cb1fe45d9c302050cd19deef Task-number: QTBUG-15705 Reviewed-by: axis
* | | | | | | Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-161-0/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The micro focus rect changes both when the regular cursor position and the pre-edit cursor positions change. Ensure updateMicroFocus is called TextInput in both cases. Change-Id: I6822a710b841e106ce2462f74fea398250596913 Task-number: QTBUG-17396 Reviewed-by: Martin Jones
* | | | | | Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the name onAccepted() and refer to it as a handler rather than a signal. Change-Id: Ibd4144aa809e6d9db136187a07e9a660afa5df1b
* | | | | | Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I30a36ba2724c9641e9cfe5ceafa651728907ef63
* | | | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-101-0/+17
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set keepMouseGrabs to true when the selectByMouse property is enabled to prevent flickable from stealing the mouse grab and interrupting a selection. Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d Task-number: QTBUG-16956 Reviewed-by: Martin Jones
* | | | Scroll TextInput to ensure preedit text is visible.Andrew den Exter2011-02-081-1/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the scroll position on text input events and ensure the end of the pre-edit text is visible, unless that hides the cursor in which case display as much as possible while still displaying the cursor and a preceding pre-edit character. Change-Id: Iec6f82b00333f7c9ea21fe536c8f11be0f8de710 Task-number: QTBUG-16999 Reviewed-by: Martin Jones
* | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Neither would open a software input panel or allow text entry while read only, but on Symbian at least the text input mode indicator was still displayed giving the appearance of being able to enter text. Task-number: QT-4497 Reviewed-by: Damian Jansen
* | | Clarify that IntValidator performs locale specific validation.Andrew den Exter2011-02-011-0/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-16873 Reviewed-by: Martin Jones
* | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-011-39/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option to do per word selection when selectByMouse is true. Also changes the selection behavior so that the first word selected remains selected when the direction of the selection changes which is more consistent with other implementations including the existing per word selection in QTextEdit. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
* | | Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-281-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Text and TextInput items should now automatically flip the alignment of right-to-left text. Autotests also added to ensure the text is on the correct side (added for TextInput also). Task-number: QTBUG-15880 Reviewed-by: Martin Jones
* | | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-9/+18
|\ \ \ | | |/ | |/|
| * | Request font sizes with only 0.5pt resolution.Martin Jones2011-01-181-8/+17
| |/ | | | | | | | | | | | | | | When animating pointSize avoid generating a huge number of fonts with slightly different point sizes. Task-number: QTBUG-13960 Reviewed-by: Aaron Kennedy
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Document TextInput::readOnlyAlan Alpert2011-01-181-0/+10
| |
* | Add canPaste property to TextInput and TextEditAlan Alpert2011-01-171-1/+25
| | | | | | | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
* | Add selection modes to TextEdit and TextInput.Andrew den Exter2011-01-101-8/+93
| | | | | | | | | | | | | | | | | | Add an overload for moveCursorSelection which takes a parameter specifying whether to update the selection with individual characters or whole words. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-0/+2
|\ \ | |/ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-201-0/+2
| | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
* | Add convenience deselect() functions to TextInput and TextEditJoona Petrell2010-12-301-0/+11
| | | | | | | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-131-1/+2
|\ \ | |/
| * Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-061-0/+1
| | | | | | | | | | | | | | | | | | A function resetCursorBlinkerTimer was introduced to QLineControl. Each time the cursor position in a textInput is updated, the blinker timer is reset. Task-number: QTBUG-15815 Reviewed-by: Martin Jones
| * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | | | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
* | Document TextInput property maximumLengthJoona Petrell2010-12-131-0/+8
|/ | | | | Task-number: Reviewed-by: Martin Jones
* Document TextInput::select(start,end)Michael Brasser2010-11-091-6/+17
| | | | Task-number: QTBUG-15162
* Run util/normalize on src/declarative.Yann Bodson2010-10-261-3/+3
|
* TextInput autoscroll now scrolls when the cursor movesAlan Alpert2010-10-141-0/+1
| | | | | | Previously needed some actual text changes to scroll, which is incorrect Task-number: QTBUG-14230
* Ensure the TextInput cursor blinks immediately when enabled.Michael Brasser2010-10-061-1/+5
| | | | | | | | Previously we relied on cursorPosChanged being called to do the update, but that isn't called in all circumstances. Now we explicitly update when the cursor is enabled or disabled. Task-number: QTBUG-13993
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-3/+3
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-2/+0
|
* Repaint TextInput when password character changes in password modeJoona Petrell2010-08-171-5/+13
| | | | | Task-number: QTBUG-12838 Reviewed-by: Martin Jones
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+4
| | | | ...and a set of functional group pages.
* Fix compilation - disable TextInput when QT_NO_LINEEDIT is definedTasuku Suzuki2010-07-291-0/+4
| | | | | Merge-request: 739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QML focus API updates.Michael Brasser2010-07-211-22/+22
| | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy
* font.letterSpacing used percentage rather than absolute values.Martin Jones2010-07-211-2/+1
| | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison
* Fix TextInput selectionColor or selectedTextColor -based animationsJoona Petrell2010-07-131-0/+4
| | | | | Task-number: QTBUG-12115 Reviewed-by: Martin Jones
* Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-121-0/+36
| | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
* Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-071-15/+16
| | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983
* Fix input methods for TextInput elements with key handlersJoona Petrell2010-07-061-0/+1
| | | | | Task-number: QTBUG-10297 Reviewed-by: Martin Jones
* Fix TextInput text getting improperly clippedJoona Petrell2010-07-021-19/+27
| | | | | Task-number: QTBUG-11790 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-1/+1
|\
generated by cgit v0.12 at 2025-01-22 05:56:39 (GMT)