summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxtextedit.h
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile after merge from 4.6.Michael Brasser2009-08-251-1/+1
|
* Text-related API updates after reviewMichael Brasser2009-08-191-2/+2
| | | | | Rename LineEdit to TextInput; hAlign to horizontalAlignment; vAlign to verticalAlignment. Other assorted fixes.
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-181-8/+7
|\ | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.h
| * Proposed changes following API review.Martin Jones2009-08-181-13/+10
| |
* | Some Text cleanup.Michael Brasser2009-08-181-3/+3
|/
* Get rid of QmlFont and use the QFont value type instead.Michael Brasser2009-08-141-6/+3
|
* Remove an unused method in QFxItemLars Knoll2009-07-221-2/+0
| | | | | propertyInfo was not used by anything, let's just get rid of it.
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-101-2/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: examples/itemviews/frozencolumn/main.cpp src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/canvas/qsimplecanvasitem.h src/declarative/extra/qfxparticles.cpp src/declarative/fx/fx.pri src/declarative/fx/qfxblurfilter.h src/declarative/fx/qfxcontentwrapper.cpp src/declarative/fx/qfxflickable.cpp src/declarative/fx/qfxfocuspanel.h src/declarative/fx/qfxfocusrealm.h src/declarative/fx/qfxhighlightfilter.cpp src/declarative/fx/qfxhighlightfilter.h src/declarative/fx/qfximage.cpp src/declarative/fx/qfxitem.cpp src/declarative/fx/qfxitem.h src/declarative/fx/qfxrect.cpp src/declarative/fx/qfxreflectionfilter.h src/declarative/fx/qfxshadowfilter.cpp src/declarative/fx/qfxshadowfilter.h src/declarative/fx/qfxtext.cpp src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.cpp src/declarative/opengl/glbasicshaders.h src/declarative/test/qfxtestengine.cpp src/declarative/test/qfxtestengine.h src/declarative/test/qfxtestobjects.cpp src/declarative/test/qfxtestobjects.h src/declarative/test/qfxtestview.h src/declarative/util/qfxglobal.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h tools/qmlviewer/qmlviewer.cpp
| * Implement selectedText, selectionStart and selectionEnd properties.Alan Alpert2009-07-081-2/+17
| | | | | | | | | | Still to go: Setting the selectionStart/End properties doesn't work and there are no autotests.
| * Add highlightedTextColor property to the QFxTextEdit sophisticateAlan Alpert2009-07-081-0/+4
| |
| * Add Cursor Delegate to QFxTextEditAlan Alpert2009-07-081-0/+6
| | | | | | | | | | Adds the cursorDelegate property, including docs and autotest. No example is included because we don't really have a text example yet.
| * Make TextEdit's cursor position usable from Qml.Michael Brasser2009-07-061-0/+4
| |
| * Support compile-in-namespace for the declarative module.Michael Brasser2009-06-301-2/+3
| |
* | Remove simple canvasAaron Kennedy2009-06-231-1/+0
| |
* | Make QSimpleCanvasItem inherit QGraphicsObjectAaron Kennedy2009-06-231-1/+1
|/
* Handle double clicks in TextEdit.Michael Brasser2009-06-021-0/+1
|
* Add textMargin property and more flexible key handling to TextEditMichael Brasser2009-06-011-1/+4
|
* Remove extraneous semicolons.Martin Jones2009-05-261-1/+1
| | | | Caused massive number of warnings with winscw
* Add a preserveSelection property to TextEdit.Michael Brasser2009-05-211-0/+4
| | | | | This property will allow us to get line edit-like behavior, where the selection is removed when the item loses focus.
* Pass ShortcutOverride event through SimpleCanvas to QFxTextEditKai Koehne2009-05-201-0/+1
| | | | | | In Bauhaus we have a global shortcut associated with the Del key. This prevents the global shortcut from capturing the Del key while editing in a text edit field.
* Fixed #includesRoberto Raggi2009-05-181-2/+2
|
* TextEdit fixes and improvements.Michael Brasser2009-05-121-0/+4
| | | | | Get cursor blinking working again. Add focusOnPress to make it easy to gain focus when the mouse is pressed.
* highlight color propertyWarwick Allison2009-05-081-0/+4
|
* Allow control of cursor and of selection.Warwick Allison2009-05-081-0/+8
| | | | | This allows components to implement look&feel such as select-all-on-focus, and to blink the cursor even when it is a proxy that actually has focus.
* Use focus property, not active focus for control focusIan Walters2009-05-071-2/+1
| | | | | | | | ActiveFocus is misleading in QML, between KeyProxy and FocusRealm, an item with focus, but not activeFocus could still get keys. focus means 'I want key events'. Hence if focus is true, blink the cursor.
* Rename QFxImageItem to QFxPaintedItem.Ian Walters2009-05-051-2/+2
| | | | Done to avoid confusion with QFxImage and QFxAnimatedImage(Item)
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+187