summaryrefslogtreecommitdiff
path: root/src/declarative/graphicsitems/qdeclarativetextinput_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-281-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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-201-2/+3
|\ \ | |/ | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Notify when the TextInput cursorRectangle property changes within pre-edit
| * Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Anything that updates the horizontal scroll is also likely to change the position of the cursor rectangle and the micro focus. So group these actions together and ensure they're done before emitting cursorPositionChanged() so positionToRectangle() returns a valid value from that handler. Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd Task-number: QTBUG-19089 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
* Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-211-1/+4
| | | | | | | | | | | | Changing to the Normal echo mode from another mode clears the NoPredictiveText and NoAutoUppercase flags, irrespective of who originally set them. Add separate accessors for the property value so echo mode can overwrite the authoritive value without losing the value set in QML. Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d Task-number: QTBUG-18735 Reviewed-by: Martin Jones
* Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-1/+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-021-0/+10
|\ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | Preedit text isn't visible outside the inner workings of the Text elements so any position returned that is greater than the current cursor position is invalid. Change-Id: I433fc635dcd6d087bde13fc47a1a92e4222a3b2c Task-number: QTBUG-17834 Reviewed-by: Martin Jones
| * 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
| * Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-241-0/+6
| | | | | | | | | | | | | | | | | | Specifies whether positionAt should resolve to the nearest position between characters or the position of the nearest character. Change-Id: I9eb2db2f8dd2accb2d9844ff204fba0337e71876 Task-number: QTBUG-16070 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
* Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-101-0/+1
| | | | | | | | | | 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
* 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
* 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-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Proper versioning for canPasteAlan Alpert2011-01-181-1/+1
| |
* | Add canPaste property to TextInput and TextEditAlan Alpert2011-01-171-0/+4
| | | | | | | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
* | 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 convenience deselect() functions to TextInput and TextEditJoona Petrell2010-12-301-0/+1
|/ | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
* 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-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
* Add copy(), cut() and paste() support to TextInputJoona Petrell2010-07-121-0/+5
| | | | | 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-0/+2
| | | | | | | | | | | | 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
* Don't export declarative private classesMartin Jones2010-07-011-1/+1
| | | | | Those required by creator are still exported. Everything else is no longer exported.
* Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-291-1/+1
| | | | Task-number: QTBUG-11552
* Handle TextInput inputMethodEvent() properlyMartin Jones2010-06-221-0/+1
| | | | | Follow the pattern of other text input classes and QML key handling classes.
* Write TextInput.positionToRectangle docs.Alan Alpert2010-06-161-1/+1
| | | | | | Also renamed the argument to be more accurate. Task-number: QTBUG-11168
* Remove unnecessary CloseSoftwareInputPanel events after TextEdit or ↵Joona Petrell2010-06-071-1/+0
| | | | | | | TextInput has lost focus Task-number: Reviewed-by: Warwick Allison
* Take into account platform differences in input panel supportJoona Petrell2010-06-021-5/+0
| | | | | Task-number: Reviewed-by: Warwick Allison
* More autoScroll fixesWarwick Allison2010-06-021-0/+1
| | | | Task-number: QTBUG-11143
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-011-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| * Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-311-8/+8
| | | | | | | | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-311-1/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Doc: Fixed an off-by-one error in an example. Fix QT_NO_TEXTHTMLPARSER Fix QT_NO_DOM Fix QT_NO_TEXTSTREAM compilation errors. Fix QT_NO_VALIDATOR compilation. Doc: Removed a misleading sentence about a class constructor. Doc: correcting docs in QDrag::exec Doc: Adding note about QDrag::exec() Revert behavior of QTextLayout::boundingRect() when line width is set Fix unreasonably large width of QTextLayout::boundingRect() Doc: replacing old image Fix compilation with stricts compilers. Fix QT_NO_DIRMODEL build error in QtDeclarative. Revert "Added native key support to QSharedMemory API." Revert "Improved documentation for QSharedMemory's key/setKey functions." Fix a simple mistake in QXmlStreamReader::atEnd() docs. Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Doc: Corrected the documentation about the compression threshold. ...
| * Fix QT_NO_VALIDATOR compilation.Tasuku Suzuki2010-05-311-1/+6
| | | | | | | | | | Merge-request: 648 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | Add selection methods to TextEditWarwick Allison2010-05-311-1/+1
|/ | | | | | | | Sufficient to allow different selection look and feel (see whacky example) Task-number: QTBUG-10968 Reviewed-by: Michael Brasser Reviewed-by: Alan Alpert
* 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
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-121-2/+6
|\ | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h
| * Remove QT_VERSION checks in QMLAaron Kennedy2010-04-091-2/+0
| | | | | | | | We only support Qt 4.7 now.
| * Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The TextInput has support for scrolling now so it's quite usable. You can deactivate the auto scrolling with a property if you want to do crazy animation while scrolling. This commit also fixed several bugs with the current implementation especially regarding aligments : selection was broken, moving the cursor also -> fixed. I have also added a tiny fix when the TextInput lost the focus -> the selection is cleared. Task-number:QT-2745 Reviewed-by:Michael Brasser
* | Add some TextInput properties and methodsAlan Alpert2010-04-121-3/+12
|/ | | | | | | | | | | | | | | | | | Adds the properties -passwordCharacter -displayText And the method -moveCursorSelection(int pos) These just provide a QML way to access existing QLineControl functionality, and are necessary to create desktop style LineEdits (the existing TextInput QML API was designed with a focus on touch input LineEdits) Includes tests and documentation. Task-number: QT-321 Reviewed-by: Aaron Kennedy
* 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.
View Lorry Controller Status