summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-09435-3042/+3476
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner.PropertyEditor: Fix regression in SliderSpecificsThomas Hartmann2014-09-111-1/+1
| | | | | Change-Id: Id71d3ec192a030ead81bb7746681b18cb9d79e27 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Instances: Do not use Qt kit for fallback puppetThomas Hartmann2014-09-111-1/+2
| | | | | Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Doc: fix labels and tooltipsLeena Miettinen2014-09-112-14/+14
| | | | | | | | Fix capitalization, punctuation and typos, and remove unnecessary text. Change-Id: Iee39e465125d5d9eec099323fb7d75756c8d81df Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJS: Add error message for invalid root item in the designerThomas Hartmann2014-09-101-0/+1
| | | | | | | | | Documents with those types do crash the qmlpuppet and confuse the users. With this patch we give a clear error message and such files are not supported anymore. Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlDesigner: Adding UI option for fallback puppet.Thomas Hartmann2014-09-103-27/+48
| | | | | | | | | This patch adds an option to configure the usage of qml(2)puppet. By default the qml(2)puppet that comes together with Qt Creator is used. Change-Id: Idada8457e81fa17d3290dc97ded303aab475a9f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.TextToModelMerger: Fixing comparison of QVariantThomas Hartmann2014-09-091-0/+2
| | | | | | | | | | | n the case of custom types, their equalness operators are not called. Instead the values' addresses are compared. This is not want we want. Instead we have to cast and compare our custom types manually. This fixed a couple of QTC_ASSERTS. Change-Id: I3a82b84744f9b8860b7efaeb203475bb9dba5d11 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: add more specificsTim Jenssen2014-09-097-62/+266
| | | | | | | Fix: QTCREATORBUG-12798 Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Navigator: Fix reordering in case of invisble nodesThomas Hartmann2014-09-083-30/+7
| | | | | | | | | | If the model contains nodes that are invisible in the navigator (e.g. QtObject) updateItemRowOrder() does not work correctly. To avoid complexity we update the subtree in this case. Change-Id: Ia40ce061e9188ef9ad6ca54ce3444432b878ddf6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.Navigator: Crash fixThomas Hartmann2014-09-081-1/+3
| | | | | | | | | Objects which are not an Item are not visible in the tree view. In this case model() is 0 and Qt Creator was crashing when detaching the navigator view. Change-Id: I144c940d76157defb27133673ed911d733d8b5ef Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-0810-33/+22
| | | | | | | | | | | | | | The imports paths used by the sub component manger and meta info system were not correctly resolved. The main reason was that the textDocument in the text modifiers are just plain text buffers and do not containt any url for the document. This patch removes importPaths() from the TextModifier. The ViewerContext can be stored in the TextToModelMerger and does not have to be recreated when needed. Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: fixing used importsFawzi Mohamed2014-08-281-1/+1
| | | | | | Task-number: QTCREATORBUG-12782 Change-Id: I44808f10504991fb9fc621acedd43035698c6afb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.MetaInfo: Avoid duplicated propertiesThomas Hartmann2014-08-281-2/+4
| | | | | | | | | | | For some reason ApplicationWindow seems to be twice in the type hierarchy. This means all properties specific to ApplicationWindow were duplicated. This patch avoids adding a property twice. Task-number: QTCREATORBUG-12910 Change-Id: I8a06fa15778335be8c6977369ece94385b25487c Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlDesigner: Fix typoThomas Hartmann2014-08-271-1/+1
| | | | | Change-Id: I36c8393ace088d7702d1771e806e1e420eb8bd95 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* QmlDesigner: fix that we have too many updateActiveQtVersion() connectionsTim Jenssen2014-08-221-4/+3
| | | | | Change-Id: I3d9a9ba76d0da4def215541ccff02afc26e5e5f1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.NavigatorView: Do not set a position for new itemsThomas Hartmann2014-08-212-4/+6
| | | | | | | | If items are dragged into the navigator we should not set the position to 0,0 expliticly, because this breaks layouts. Change-Id: I6e7cd130390ab68d13904d379a35dc4fa4337231 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.Rewriter: Adding missing global Qt enumsThomas Hartmann2014-08-211-1/+2
| | | | | Change-Id: Ie29a089aad130dfe86313aaa47ebf66fb7611a25 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Fix captionThomas Hartmann2014-08-211-1/+1
| | | | | Change-Id: I118018c39506600386ff54c92b7ef669c0a279ff Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.ImportManager: Fix comparison operatorThomas Hartmann2014-08-151-0/+3
| | | | | | | | The comparison operator was not consistent if comparing the same url. This could trigger an assert for msvc debug builds. Change-Id: Ia9febd7ffd7d0f4dbb64184931a526e61f020672 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.FormeEditor: Crash fixThomas Hartmann2014-08-151-1/+1
| | | | | | | | The model can already be detached when calling delayedReset. In this case we just do nothing. Change-Id: I889fcc4e267dac3403c2e35b8f77b1e4fb5b8050 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: do not call converToVariant on ListElementsTim Jenssen2014-08-121-1/+7
| | | | | Change-Id: I52c3e6ad8efe6e3907496993307da42c9e2482f4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: remove second setSource callTim Jenssen2014-08-121-4/+1
| | | | | Change-Id: Ieee470f71b5bdd887986c12b214dc10702f48cc3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.PropertyEditor: Fix Layout for TextFieldSpecificsThomas Hartmann2014-08-121-10/+3
| | | | | Change-Id: I476849dca1b3d9785e78ed2d66a163698aee6f49 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Fix layout in CheckBoxSpecificsThomas Hartmann2014-08-111-4/+1
| | | | | | | The LineEdit should take the whole width. Change-Id: Ic2a1fc3803da376b412843da0da8e950e8db1141 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.PropertyEditor: Fix layout in RadioButtonSpecificsThomas Hartmann2014-08-111-4/+1
| | | | | | | The LineEdit should take the whole width. Change-Id: Ic64798f17452b19d87872383041144192238813a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.DocumentManager: Do not scatter items in layoutsThomas Hartmann2014-08-111-0/+2
| | | | | | | Items in layouts do not need to be positioned. Change-Id: I2bf0c83be48bd9aad11aab74e56e8a27f962214a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Fixing TextAreaSpecificsThomas Hartmann2014-08-081-3/+1
| | | | | Change-Id: Id3d5c2879989ebaf23cf767673fd9991be8b96dd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Model: Make removeProperty constThomas Hartmann2014-08-082-2/+2
| | | | | Change-Id: I717a9d2cafc0636f4dcfbae074f30e214a089b8f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Property: Fix Layout in ButtonSpecificsThomas Hartmann2014-08-081-12/+3
| | | | | | | The LineEdits should take all the width available. Change-Id: I3c530e0145e78aaa2f842ae9e0aceb0007bedad3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.MetaInfo: Add SplitView to isLayoutable()Thomas Hartmann2014-08-081-1/+3
| | | | | Change-Id: I01ec7f1562663d356bd4f91e1448d8473ce2fe98 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.Navigator: Do not position items in layoutsThomas Hartmann2014-08-081-3/+9
| | | | | Change-Id: I5125db79885c8a7fcec686170240d699d0d8ed5b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.DebugView: Add output for selection changesThomas Hartmann2014-08-081-1/+11
| | | | | Change-Id: Ice4a3bbeedd48712429e2fdfdcb325fa25b68727 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.QmlItemNode: Items in layouts are not movableThomas Hartmann2014-08-071-0/+7
| | | | | Change-Id: Ib7d25e4dd9f912b1829d58e51ee46e966f5cd186 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.MetaInfo: Do not convert EnumerationThomas Hartmann2014-08-071-1/+3
| | | | | | | This is a designer specific type that is never converted. Change-Id: Ibfe73bdb441cbd17ec728025b9c8bf77d3df2587 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.ItemLibrary: Remove TabViewThomas Hartmann2014-08-071-16/+0
| | | | | | | The TabView support is not complete enough. Change-Id: I24553341a5eae68f309a1fb24a61a72a3c634a17 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Checked is only valid if checkable is trueThomas Hartmann2014-08-071-0/+8
| | | | | | | If checkable is false we disable the checked property CheckBox. Change-Id: I128d78e15d0d711f33b4af191a4c24869ca37127 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix compiler warningsOrgad Shaneh2014-08-072-1/+4
| | | | | | | | | * Unused static function * Unused argument * Wrong enum comparison Change-Id: I8a06f4383cbc57cdfbc6869e6f25bb88ffaeeecf Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: disable none default properties in navigatorTim Jenssen2014-08-061-0/+10
| | | | | Change-Id: Ia5c6e4c34ef40145f0fa7618a1ceb5afb1f666b3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.DragAndDrop: Catch rewriter exceptionThomas Hartmann2014-08-052-3/+13
| | | | | | | The designer should not crash if there is an issue with rewriting. Change-Id: I0c1af386e9733349fa4ef9896588f8ea3d2eaed6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Adding useOnlyFallbackPuppet to settingsThomas Hartmann2014-08-055-6/+22
| | | | | Change-Id: Id9e5f71865f50d3f148cd6cd556024d39b03b89a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Fixing coding styleThomas Hartmann2014-08-052-26/+67
| | | | | Change-Id: Ifc0e17d5d34d6c69b201d8fc03d444a89e146ac0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PropertyEditor: Fix relative anchor targetsThomas Hartmann2014-08-052-25/+51
| | | | | | | | | | If the target is the parent we want to anchor to the same edge by default. If the target is a sibling we want to anchor to the opposite edge by default. If the anchor target is changed we have to evaluate this. Change-Id: I80ee52da7537435956880bcc132c2bc34ddfc0ed Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: write crashed if it crashedTim Jenssen2014-08-051-1/+1
| | | | | Change-Id: I3c31e12aa58f7d3752920bd017304f77498a2b04 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: make environment variables more consistentlyTim Jenssen2014-08-051-2/+2
| | | | | | Change-Id: Id384ea6e5a3b79952910889c838938c984c2bce8 Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Compile fixThomas Hartmann2014-08-051-0/+1
| | | | | Change-Id: Ia3bd03e683ab9a9243d40f07a4b1b4b80026ae20 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.FormEditor: Lighten the indicator for TabsThomas Hartmann2014-08-051-3/+4
| | | | | | | The blur was too much. Change-Id: If020f83858fe34744277d94d3d4b2aca4af83a74 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.PuppetCreator: Set qmlpuppet dir as working dirThomas Hartmann2014-08-052-0/+6
| | | | | | | | | Before the working directory was the working directory of Qt Creator. If the working direcotry was the bin diredtory of Qt Creator the puppet picked up the qt.conf from Qt Creator and could not load the platform plugin. Change-Id: Iab22267c578fc837b1b52bded850f0033618811c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: fix a crash when moving to subcomponentTim Jenssen2014-08-051-0/+1
| | | | | Change-Id: Ib8fd13a3688447dcb7eeaca811f3abfefa4b5089 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.DocumentManager: Fix goIntoComponent for LoaderThomas Hartmann2014-08-041-0/+47
| | | | | | | We have have to check and handle sourceComponent and component (Tab). Change-Id: I736648fc09fe4ee3333c4524666e3acea500804a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.Model: Fix isComponent for LoaderThomas Hartmann2014-08-041-3/+21
| | | | | | | | Loader was also interpreted as a component, but the handling of component and sourceComponent was incorrect. Change-Id: I5cd691ece1a29c77b52dc74785013f08d589b2eb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
View Lorry Controller Status