Commit Graph

598 Commits

Author SHA1 Message Date
Marco Bubke b4e251fdad QmlDesigner: Improve style of states editor
Change-Id: Icbe8a6cb4713ec23bd7eb8ed7e9bec862822716c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:09:35 +02:00
Marco Bubke aea7f77af9 QmlDesigner: Show context menu in the states editor in whole view
Change-Id: I656c803f066bcdf1b3b39879194cc4698832083b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 15:41:45 +02:00
Marco Bubke 337c1b3b69 QmlDesigner: Tweak item library
Change-Id: Ia9f689c33e9590815cbd00bdf13d0d05466d37d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 14:22:38 +02:00
Marco Bubke 1214ed8fb5 QmlDesigner: Make section more customizable
Change-Id: If3a02c083a075c2b53a8ae97ba1602603f999844
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 10:45:46 +02:00
Tim Jenssen b013637f22 QmlDesigner: remove delayed drag and drop call
Change-Id: I6d2c1c2f25ba88f3c6f0af9b52968a9bd005cd85
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-30 14:54:08 +02:00
Thomas Hartmann 30cc56ecaa QmlDesigner.PropertyEditor: Use enumeration instead of value
We did change the api.

Change-Id: I0199c168bdd9d2596efc356ef909dee62dcfd5ec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-27 15:54:15 +02:00
Thomas Hartmann 7ce7c62a22 QmlDesigner: Remove untested code
Change-Id: Ia6343b28fc7a42f9380e7151d28eb781428e894d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-27 15:33:32 +02:00
Thomas Hartmann de9b72628f QmlDesigner.PropertyEditor: Make anchoring consistent
If we anchor left or right we have to disable horizontal
anchoring.
Actually this is still simpler then what Qt Quick actually
supports, since Qt Quick does support anchoring to the left
and horizontal anchoring.
What is not supported is anchoring to the left, right and
horizontally.
This has to be fixed.

Change-Id: Id38e528d9d8a97961135370b0c9c0151bd4b6f18
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-27 13:06:01 +02:00
Thomas Hartmann 9bcffe34cc QmlDesigner.PropertyEditor: Add format property to TextSpecifics
Task-number: QTCREATORBUG-12526
Change-Id: Idec5d3b1ba5923c8a6bf877eed32533981fe73ac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-26 13:21:55 +02:00
Thomas Hartmann 28200eda8a QmlDesigner.PropertyEditor: Fix scope of format property
Change-Id: I44c9adb953bb4b8a548af019bc66ff6081df0319
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-26 12:50:19 +02:00
Thomas Hartmann b6211c2bc9 QmlDesigner.PropertyEditor: Allow changing of id in states
Task-number: QTCREATORBUG-12499
Change-Id: I62b4418acff320978cfb282e94ae8be797509d6e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 21:10:52 +02:00
Thomas Hartmann 1fd6a4a80a QmlDesigner.PropertyEditor: Fix GeometrySection
This fixes a regression introduced by
commit 1da0d018c2.

Task-number: QTCREATORBUG-12501
Change-Id: I96dd1c19afa6b6b0a56ef5f6ea5e01272aa1b774
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 12:29:46 +02:00
Marco Bubke 826525f89f QmlDesigner: Add item library section visibility
Search is working again

Change-Id: Ie6d52f476e2b9b5c3256bc289bcdd5dcadafea93
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:23:02 +02:00
Marco Bubke 44685b535d QmlDesigner: Promote visibility changes of item library items
Change-Id: Ie4b70a2785fbd9199a81ffaf879f521431aa609d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 22:22:48 +02:00
Marco Bubke cc68534e06 QmlDesigner: More quadratic size of item library delegates
Change-Id: Ie16f486fbe873fbec6663ac965e244c59c0e0e6b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-23 14:10:33 +02:00
Tim Jenssen 5df2389970 QmlDesigner: rewrite itemlibrary
Change-Id: I31344f7cfa56ae5dd6662bef4e449007b7ec3ec4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:47 +02:00
Tim Jenssen 1da0d018c2 QmlDesigner: prepare Sections for use as a delegate
Change-Id: Ieeddea3d813f13cb7018d6611156f1f98b69e6be
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:07:29 +02:00
Tim Jenssen 30780640ad QmlDesigner: remove ugly pixel line from scrollbar
Change-Id: Ib553128667a85abadfe9b810860b0f7a68499bed
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-19 18:06:57 +02:00
Tim Jenssen 115620aabc QmlDesigner: cleanup unused methods
- remove javascript methods: scrollView(delta), resetView()
 - remove javascript related signals
 - remove visibleCount debug output

Change-Id: I63b0a204d7f570986e41fc9fb3762f13e5d63d79
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:51 +02:00
Tim Jenssen a850dc2033 QmlDesigner: move ScrollViewStyle to common directory
Change-Id: Ieb235aab921bd5d246403ff42b4659090c8abdbf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-18 16:53:34 +02:00
Thomas Hartmann 95bcd0883f QmlDesigner.PropertyEditor: Fix TextEditSpecifics
I moved the property format into Text section, because
having two sections with even the same name was confusing.
The format property also is not really related to "Text Input".

Since the distinction between plain and rich text is very important,
it makes sense to have this property in the first section.

Change-Id: I4d66ed4a24fe0d99d394c17d149c830db2c6d3b8
Task-number: QTCREATORBUG-12452
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-18 16:41:34 +02:00
Thomas Hartmann 594b184bb1 QmlDesigner.PropertyEditor: Fixing size of ScrollArea
When evaluating Component.onCompleted the childrenRect.height
was not properly set, yet.

Instead we use onChildRectHeightChanged.

Change-Id: I68f395555fbfccccea35fab4387dcc23ca7f1a92
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-17 11:33:14 +02:00
Tim Jenssen ef87889b63 QmlDesigner: add reload feature to item library view
Change-Id: Ib71dc235abd059056063c5d9b9072c8bdc932762
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 14:13:22 +02:00
Thomas Hartmann 94887ce539 QmlDesigner.StatesEditor: Fixing capitalization of qml file
Change-Id: Idb6e2bcb787a8ff3b5d26330a1ced1f930f0bc1d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-11 14:12:34 +02:00
Tim Jenssen 515c77e8d7 QmlDesigner: move the beauty bottom rect inside the scrollview
Change-Id: I3cb85c6d7e9e259db7f4af28083d53539e5631b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-11 13:11:43 +02:00
Thomas Hartmann c5dad0f638 QmlDesigner.StatesEditor: Adding context menu to collapse the view
Change-Id: I5c118281ec8b9b3ef059e668ed4f534b70f952e1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:57 +02:00
Thomas Hartmann 6d1ae0e268 QmlDesigner.StatesEditor: Small adjustments to styling
Fine tuning of the styling and some minor adjustments.
The TextFields for the state names are always visible now.

Change-Id: I617085bb08fd4bb0e926610b1c3f3020db3c68a8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-06 15:31:52 +02:00
Thomas Hartmann 33f5be4c08 QmlDesigner.PropertyEditor: Use QmlModelNodeProxy in FileResourcesModel
Before the code was abusing the anchoring backend.

Change-Id: I716c5cfa7a5c72d500cb5ae8c943c52f84c60e91
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-06-05 15:22:04 +02:00
Marco Bubke 785f98b98a QmlDesigner: Fix margin in the states list
Change-Id: I322dea23a598d7069e672920cb494eea8e697495
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-05 14:28:09 +02:00
Thomas Hartmann e518074a4b QmlDesigner.PropertyEditor: Allow "manual mapping" in combo box
Sometimes there is no trivial mapping between model and values.

Change-Id: I2617f14828b97ba7352aa3a8f3d2ebb9fd2f3809
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-23 17:37:34 +02:00
Thomas Hartmann b5559e73f4 QmlDesigner.PropertyEditor: Use selectionToBeChanged in LineEdit
Commit any data to the backend if the selection will change.
The signal editingFinished is usually triggered to late.

Change-Id: Ib7adfd32a50ae94b017a7587e81721176440a988
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-22 15:38:31 +02:00
Thomas Hartmann 10e2a046da QmlDesigner.PropertyEditor: Adding dirty flag to LineEdit
This patch ensures that we only commit data to the backend
if the text actually changed. The signal onEditingFinished is triggered
even if the user did not edit the string.

Change-Id: I2d54f3d79a1c60525e4c9744b364cc014bd407ce
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-22 15:38:11 +02:00
Tim Jenssen f1795d9748 QmlDesigner: styling stateslistview
Change-Id: I29d39230bd1f37cb3d57b14045717d893f51e122
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:59:44 +02:00
Tim Jenssen 2659a9b7fd QmlDesigner: fix stateslistview sizeHint
Change-Id: I86147f80a81ff9095c67bcb296488a2a7345434a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:59:18 +02:00
Tim Jenssen c014325d19 QmlDesigner: rename nodeId -> internalNodeId
Change-Id: I8f038479f31a282db256144a3254e438eb6a629f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:59:11 +02:00
Tim Jenssen b0ffe15a53 QmlDesigner: rewrite statelistview
Change-Id: I2d2481e2f1a3e0f2d4a5807712e9435b3009e52d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:58:42 +02:00
Thomas Hartmann be9a0caa18 QmlDesigner.PropertyEditor: Fix the small color button for gradients
The small ColorCheckButton has to preview the same color as the rest
of the color editor. Before this patch it was showing the color
defined in the backend as rectangle color.
This is not correct in gradient editing mode.
Also the binding in Colorbutton was deleted assigning values
directly.

Task-number: QTCREATORBUG-12204
Change-Id: Iad5263ccccba10fdb4f2b757f6965d500c50ac53
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-22 13:26:19 +02:00
Thomas Hartmann 0e680f8f46 QmlDesigner.PropertyEditor: Cleanup
Change-Id: Ic0545a022d2dd2d2911ceaedec9137e60a332e4d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-21 18:07:47 +02:00
Thomas Hartmann 1065ead54c QmlDesigner.PropertyEditor: Do not setup the color in onCompleted
Instead we connect to the selectionChanged signal and do the setup there.

Change-Id: Ia44887fa794c9726b3c4111e1b1f37ba2baaafc5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-21 17:01:36 +02:00
Thomas Hartmann 8af6eaf1d9 QmlDesigner.PropertyEditor: Remove print
Change-Id: Iede444df7a4d63db67c459ac6608b47ae33aba12
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-21 11:37:27 +02:00
Thomas Hartmann b59aefbc9a QmlDesigner.PropertyEditor: Fix UrlChooser
Change-Id: I1bfc3eb63185f188e7d896f98a635b0b81b94d89
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-21 11:37:15 +02:00
Thomas Hartmann af523e4864 QmlDesigner.PropertyEditor: Setting the color if gradient is removed/added
We have to properly setup the color of the color editor, if we add or
remove a gradient.

Change-Id: I3aac64e9957036343ff304f1b163c4c480b5e976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-21 10:39:12 +02:00
Thomas Hartmann 31deb76bd5 QmlDesigner.PropertyEditor: Fix for LineEdit if editing a gradient
Change-Id: I7f83d7736b7dd0268420612ad1bd0f3b43c8617e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 17:50:56 +02:00
Thomas Hartmann 7cd689e7fc QmlDesigner.PropertyEditor: Select first color if adding gradient
Change-Id: Idd4c7052e3dc4967fb2be243698c0ac023b1cbf9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 17:48:49 +02:00
Thomas Hartmann 049a10fa40 QmlDesigner.PropertyEditor: Allow more space for labels.
On some systems the fonts are eally huge, so we have
to allow much more space for the leading label.

Task-number: QTCREATORBUG-12106
Change-Id: I7ad6687c4af15b2126efe2c3bd8284d36d9ac633
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 13:40:28 +02:00
Thomas Hartmann 1c2cb4bea0 QmlDesigner.PropertyEditor: Final fixes for gradient editing
We react to selection change now and keep the selection.

Change-Id: I847b8cf308277df92295822f9cd18ebb58cc2ba0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 13:02:11 +02:00
Thomas Hartmann 001b93d9cb QmlDesigner.PropertyEditor: Fix ComboBox
We have to wait until the model is properly set until we react
to currentTextChanged. We also have to guard against binding loops.

Task-number: QTCREATORBUG-12257
Change-Id: Id602f6f192962e83a6166bf24a0711b22baa7868
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-20 10:57:15 +02:00
Tim Jenssen ce55d23e2a QmlDesigner: remove use of unexisting CreatorStyle
Change-Id: Ie159ac705d62d9f8af007d0166bed18022cc2818
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-19 19:44:18 +02:00
Thomas Hartmann 147ed4bae8 PropertyEditor.QmlDesigner: Fix the color LineEdit
Using hasToConvertColor to handle the alpha channel.

Change-Id: I6b6e2ef4361efb7aba3adaf549cbddd625145e33
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-19 18:58:29 +02:00
Nikita Baryshnikov 914d4883d6 Fix braces
Change-Id: I4753ab8f551a0131dc75390e31fe8fbfdd149dce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-19 17:45:50 +02:00