summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-121-0/+1
| | | | | Task-number: QTBUG-14003 Reviewed-by: Michael Brasser
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-2/+2
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-011-2/+2
|
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-17/+0
|
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* Fix TextEdit text attribute and text stored in the internal QTextDocument ↵Joona Petrell2010-07-221-2/+3
| | | | | | | having different contents Task-number: QTBUG-12339 Reviewed-by: Martin Jones
* QML focus API updates.Michael Brasser2010-07-211-21/+21
| | | | | | | | | 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
* Fixing merge conflicts.Martin Smith2010-07-131-6/+18
|\ | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-071-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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 TextEdit with no color property defined is drawn with wrong colorJoona Petrell2010-07-061-0/+9
| | | | | | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones
| * fix doc linksBea Lam2010-07-021-1/+1
| |
* | doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-091-2/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-1/+1
|\
| * Docs - add more links to relevant examplesBea Lam2010-06-301-1/+1
| | | | | | | | Task-number: QTBUG-11754
* | Remove the old font.outline documentationMartin Jones2010-06-301-6/+0
|/ | | | | | | Text.style is the correct property, and this has never been available in TextInput or TextEdit. Task-number: QTBUG-11828
* Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-291-0/+2
| | | | Task-number: QTBUG-11552
* Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-231-4/+24
| | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
* Remove duplicated code.Michael Brasser2010-06-151-7/+1
|
* Minor doc fixesBea Lam2010-06-111-1/+1
|
* Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-111-19/+32
| | | | docs more consistent
* Remove unnecessary CloseSoftwareInputPanel events after TextEdit or ↵Joona Petrell2010-06-071-19/+8
| | | | | | | TextInput has lost focus Task-number: Reviewed-by: Warwick Allison
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-041-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move QListModelInterface into util. Ensure ParticleMotionGravity always pulls in the right direction. Remove version ifdefs from Particles; only 4.7 is supported. Update docs for the runtime.orientation values Revert to Portrait/Landscape terminology for Orientation enum, with Add more Q_AUTOTEST_EXPORTs Improve input panel handling in declarative demos and examples Always integer align anchor center points Add header and footer to GridView
| * Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-031-1/+1
| | | | | | | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* | Fix QT_NO_CLIPBOARDTasuku Suzuki2010-06-041-1/+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-45/+64
| | | | | Task-number: Reviewed-by: Warwick Allison
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-011-1/+11
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-011-32/+38
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| | * Fix TypoAlan Alpert2010-05-311-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-311-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_TEXTHTMLPARSERTasuku Suzuki2010-05-311-0/+10
| | | | | | | | | | | | | | | | | | | | Merge-request: 644 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-311-31/+37
|\ \ \ \ | | |_|/ | |/| |
| * | | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-311-31/+37
| |/ / | | | | | | | | | | | | | | | 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/qt-qml into 4.7Martin Jones2010-05-311-1/+117
|\ \ \ | |/ /
| * | Add selection methods to TextEditWarwick Allison2010-05-301-0/+116
| |/ | | | | | | | | | | | | | | Sufficient to allow different selection look and feel (see whacky example) Task-number: QTBUG-10968 Reviewed-by: Michael Brasser Reviewed-by: Alan Alpert
| * Active window focus gain should not open virtual keypadJoona Petrell2010-05-281-1/+1
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | Repaint all text when Ctrl+A is pressed in TextEditMartin Jones2010-05-311-3/+8
|/ | | | | | QTextControl::updateRequest() with empty rect means update all. Task-number: QTBUG-11013
* Open input panel on press if TextInput or TextEdit are already focused but ↵Joona Petrell2010-05-261-0/+5
| | | | | | | panel has been closed Task-number: Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-261-8/+123
|\
| * Add a way to control when software input panels are shown in TextInput and ↵Joona Petrell2010-05-261-8/+123
| | | | | | | | | | | | | | 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-10/+35
|/
* Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-251-1/+1
|
* Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-251-1/+2
| | | | Task-number: QTBUG-10969
* Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-251-5/+16
| | | | Task-number: QTBUG-10940
* Fix TextEdit implicit height.Warwick Allison2010-05-241-1/+1
|
* Fix TextEdit alignment.Warwick Allison2010-05-241-18/+27
| | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
* Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-191-6/+42
| | | | | | | | 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
* Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-171-3/+1
| | | | just to the closest focus scope parent.
* Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-141-3/+6
| | | | | | Allows intercepting keys before or after normal item key processing. Task-number: QTBUG-10467
* Fix TextEdit and TextInput input panel support for mode ↵Joona Petrell2010-05-131-3/+8
| | | | | | | RSIP_OnMouseClickAndAlreadyFocused Task-number: Reviewed-by: Warwick Allison