summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-2/+0
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
| * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
* | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-0/+3
| | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
* Add a way to query the reading direction of QML editor textJoona Petrell2011-03-031-0/+1
| | | | | | | Task-number: QTBUG-17490 Reviewed-by: Martin Jones Change-Id: I3dd3854f820860d32e822605ed547150d5f17eb2
* Merge branch '4.7' into qtquick11Martin Jones2011-03-011-0/+4
|\ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | Allows input handling to be disabled or changed while an input method is active. This might be used to allow mouse events through to the element or in conjunction with the cursor position to determine whether a click occurred on the preedit text. Change-Id: I35e148691920579c1d7c6f27b7e805d9551beadd Task-number: QTBUG-17835 Reviewed-by: Martin Jones
* | Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-1/+2
|/ | | | | | | | | | | alignment Also, implicit empty text alignment now follows the Application's default layout direction traditionally set by the locale. Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I88340513d489290bafd393072786a19731097b77
* Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-011-0/+5
| | | | | | | | | | | 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
* Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-271-1/+1
| | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
* Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-2/+2
| | | | | | | | 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-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-141-1/+0
| | | | | | | | Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
| * Remove active selection when TextEdit loses focusJoona Petrell2010-12-141-0/+1
| | | | | | | | | | Task-number: QTBUG-15341 Reviewed-by: Yann Bodson
* | Proper versioning for canPasteAlan Alpert2011-01-181-1/+1
| |
* | Add canPaste property to TextInput and TextEditAlan Alpert2011-01-171-0/+5
| | | | | | | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
* | Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-141-0/+5
| | | | | | | | | | | | | | | | The lineCount property should return the number of lines contained in textEdit. Also corrected minor documentation in Text Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* | Add property versioning checks for QtQuick 1.1 deselect() functionJoona Petrell2011-01-101-1/+1
| | | | | | | | | | Task-number: QTBUG-16059 Reviewed-by: Martin Jones
* | Add selection modes to TextEdit and TextInput.Andrew den Exter2011-01-101-0/+7
| | | | | | | | | | | | | | | | | | 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
* | Add linkActivated signal to TextEditAlan Alpert2011-01-071-0/+1
| | | | | | | | | | | | | | | | Since TextEdit can also contain rich text with anchors, it should also have a linkActivated signal like Text does. Task-number: QTBUG-15283 Reviewed-by: Martin Jones
* | Add convenience deselect() functions to TextInput and TextEditJoona Petrell2010-12-301-0/+1
| | | | | | | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
* | Support for justification in Text and TextEdit elements.Yann Bodson2010-12-171-1/+2
|/ | | | | Task-number: QTBUG-13242 Reviewed-by: Michael Brasser
* QML focus API updates.Michael Brasser2010-07-211-2/+2
| | | | | | | | | 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
* Don't export declarative private classesMartin Jones2010-07-011-1/+1
| | | | | Those required by creator are still exported. Everything else is no longer exported.
* Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-231-0/+2
| | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
* Remove unnecessary CloseSoftwareInputPanel events after TextEdit or ↵Joona Petrell2010-06-071-1/+0
| | | | | | | TextInput has lost focus Task-number: Reviewed-by: Warwick Allison
* Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-041-0/+2
| | | | | Merge-request: 658 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* Take into account platform differences in input panel supportJoona Petrell2010-06-021-5/+0
| | | | | Task-number: Reviewed-by: Warwick Allison
* Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-311-5/+3
| | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
* Add selection methods to TextEditWarwick Allison2010-05-301-0/+8
| | | | | | | | Sufficient to allow different selection look and feel (see whacky example) Task-number: QTBUG-10968 Reviewed-by: Michael Brasser Reviewed-by: Alan Alpert
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-261-0/+10
|\
| * Add a way to control when software input panels are shown in TextInput and ↵Joona Petrell2010-05-261-0/+10
| | | | | | | | | | | | | | TextEdit elements Task-number: QTBUG-10841 Reviewed-by: Warwick Allison
* | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-261-1/+8
|/
* Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-251-1/+3
| | | | Task-number: QTBUG-10940
* Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-191-0/+5
| | | | | | | | Can still be turned back on, if people only want to target platforms where the behaviour is acceptable. Task-number: QTBUG-10684 Reviewed-by: Michael Brasser
* Remove the deprecated wrap property.Martin Jones2010-04-221-3/+0
|
* Enable other wrapping modes.Martin Jones2010-04-091-3/+3
| | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
* TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-091-2/+12
|
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-2/+2
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-091-2/+0
| | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+240
QDeclarativeXXX.