Commit Graph

3505 Commits

Author SHA1 Message Date
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
Christian Stenger
8c353f998e Dumper: Fix missing parameter
Change-Id: Ia75c9d07967d0013f9a351e99757c0acb661d877
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-22 16:34:59 +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
Orgad Shaneh
93c94d65a8 QmlPuppet: Pass const strings by reference
Change-Id: I6bf60d6484f13817dcbe36a4bfc099f3edf7559c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-21 13:29:31 +02:00
Kai Koehne
fec00e295d Simplify templates to use qrc:/ instead of qrc:///
Both forms are functionally equivalent, but the official documentation
favors the shorter one.

Change-Id: I2b6fccfafc2474f5b61ed6dce460b0472a63854c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-05-21 12:23:18 +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
Eike Ziller
270e8fe537 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
2014-05-20 14:44:31 +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
hjk
3ae6c09714 Debugger: Regression cleanup
Sneaked in with 40052046fd.

Change-Id: I711c5b8e6869647a447a5f17f693de571b5f0337
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-20 13:01:31 +02:00
Orgad Shaneh
8a42154f24 QmlPuppet: Remove duplicate condition
Change-Id: I2a521aa08347d83b236d490e698081e552381ed7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-20 11:44:02 +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
Thomas Hartmann
f078f81784 QmlDesigner.PropertyEditor: Remove string helper function
We use C++ helper functions instead.

Change-Id: I03ef168f4e47a6e2437676d906072e5f5ce7377c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-19 16:53:22 +02:00
Thomas Hartmann
de67cb25e0 QmlDesigner.PropertyEditor: Fixing color conversion in LineEdit
For color properties we have to take care of the alpha channel
manually.

Change-Id: I2cbb5a2c45a16385068e771e1a1ca8a10f47a7bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-19 16:33:11 +02:00
Fawzi Mohamed
1c793cf6a5 qmljs: update import completion list
Change-Id: Ibad88750c9c136ea1a502b80d5333d7839c32cde
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-17 13:28:01 +02:00
hjk
40052046fd Debugger: Rework display length limitation systems
There are two values now, one to limit an entry in the L&E view
(default 100) and a hard upper limit (at 1 mio).

If displayed values are elided, the true length is shown in addition.

Change-Id: I180b70446c18e258c164e5af75b88d4c8b6c53f2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-16 17:50:18 +02:00
Thomas Hartmann
382730b130 QmlDesigner.PropertyEditor: Fix check in ColorEditor
Checking for visibilty is a bad idea. Instead we check if
the item actually has a gradient.

Change-Id: Ib14de1fbc570c28332e7e240052b4820c5b1483c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-16 17:39:53 +02:00
Thomas Hartmann
c51cc28028 QmlDesigner.PropertyEditor: Remove print from .qml
Change-Id: Ifce18301b05e4c05e490ce1b46a2b8e3beab9d40
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-16 17:39:35 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
hjk
1398480f3a Debugger: Limit QByteArray and QString display length
Also add '...' for cut-off std::strings.

Change-Id: Ib6129eb43c723f2a863086a0142312c669b65665
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-16 16:35:38 +02:00
Orgad Shaneh
82aa1380f2 Cleanup whitespace
Mostly trailing whitespace

Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-16 14:27:13 +02:00
Thomas Hartmann
93e37b7e78 QmlDesigner.PropertyEditor: Extend ColorEditor for gradient name
Change-Id: If31e3f313864890d766c6aeaeb0c05687d773a2a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-16 11:15:28 +02:00
Thomas Hartmann
4f62d65174 QmlDesigner.PropertyEditor: fixing regression in ButtonRowButton
Change-Id: I6cc30f93a0a1b966fa6e93dcd149241356e23b9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-15 14:56:26 +02:00
Alessandro Portale
79ed722724 Welcomescreen: Fix opening of help urls
Change-Id: I29a3634ee01317da478d78ec9758b6fc386abbdb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-15 12:45:54 +02:00
Leena Miettinen
6f36614cb5 Welcome: fix link to mobile app tutorial
The tutorial filename was changed.

Task-number: QTCREATORBUG-12247

Change-Id: Ibb2733e41807757c2ce435a0b918eada4da99665
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-15 11:39:26 +02:00
hjk
55c19c5042 Debugger: More flexibility for "ranged expressions"
The range boundary and stride can be integral expressions.
Also ( ) are valid delimiters now, making descriptions like
list.at(2.(4).100+2) acceptable.

Change-Id: Ief68c0a1b0b0d3813b2939d60e0806f5cd3ff0b0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-05-15 10:12:51 +02:00
Marco Bubke
75fa87eebb QmlDesigner: Fix drag and drop
Task-number: QTCREATORBUG-12227
Change-Id: I02c3bd81ab2b6585d35bab60550788f461e77732
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 11:36:32 +02:00
Sergey Belyashov
2281d7e618 Fixed Russian translation of Welcome screen
Task-number: QTCREATORBUG-12108
Change-Id: I3db4b5ad44666808cf49ea6e0ce226b9972b1beb
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-13 13:47:16 +02:00
hjk
6107fdc276 Debugger: Add "composite" watchers
Multiple expressions can be separated by semicolon,
and arrays allow index ranges given as [a..b] or
with strides [a.(s).b].

Change-Id: I0b7b4ee500a5f6f5027d777b0a1e8ee5a28a7cd5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-13 12:58:35 +02:00
Thomas Hartmann
6aeb2fabc2 QmlDesigner.PropertyEditor: Avoid side effects of ColorButton
The ColorButton did change the color as a side effects of rounding error.
With this patch the ColorButton does onyly change the color as a result
of user interaction.

Task-number: QTCREATORBUG-12202
Change-Id: I6504713a27fe7b562b8342229bd287af23156602
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:31 +02:00
Thomas Hartmann
aff4424f38 QmlDesigner.PropertyEditor: Use ToolTipArea in ButtonRowButton
Change-Id: I462f45dd962f1f136e2cf010b0092457345ec485
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:22 +02:00
Thomas Hartmann
af30fdc916 QmlDesigner.PropertyEditor: Fixing Preferred highlight properties
Task-number: QTCREATORBUG-12216
Change-Id: Ia0452f96c41e7759c6594ecff0fb9e104dae396e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-12 15:10:20 +02:00
Thomas Hartmann
d9727c2816 QmlDesigner.PropertyEditor: Enabling tooltips for labels
The old property editor did support tooltips and many labels
have properly defiend tooltips.
In QtQuick.Controls we have to use private API for tooltips
to show up.

Change-Id: If1c50b58e8388b8846c2dd07fcd326f09d67d127
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:57:15 +02:00
Thomas Hartmann
248964789a QmlDesigner.PropertyEditor: Allow abitrary anchor targets
QTCREATORBUG-12077
Change-Id: Ifce1587235c81da56da6bc5788081cc1711d1bdb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:43:52 +02:00
Thomas Hartmann
d8647b9cc3 QmlDesigner.PropertyEditor: Fix text for CheckBoxes
We need to set the text to the value, so that the user can see which
value is explicitly set.

Task-number: QTCREATORBUG-12195
Change-Id: I0b405839122f3b008790df3e3c2b0b7728299b7a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:42:39 +02:00