Commit Graph

3524 Commits

Author SHA1 Message Date
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
hjk
a216d5445f Debugger: Fix operation with python 2.6
Change-Id: Iecfea8f6e1531228fd6cccc424ee4c6c2036098e
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-06-04 14:35:31 +02:00
hjk
d57bb24354 Debugger: Better fall back for LLDB without remote support
Change-Id: I517052bb795674d4beda05e3909dc05afc99bfe3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-03 17:07:03 +02:00
hjk
60f5b5afc5 Debugger: Fail more gracefully on "ill" LLDB engines
Less need to use the hard Debug->Abort

Change-Id: Ib019792063924549ace58a63ccef994dbfaa00dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-03 17:06:43 +02:00
hjk
be25be4705 Debugger: Better handling of the tabbed extra views
Closing with the [x] now resets the Display mode of the associated
iname, and the view hides if there are no visible tabs left.
Also, remove the long-unused DisplayProcess format.

Change-Id: Ibd3308549af75e345c672c07f6714d26e7196e5a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-03 10:53:01 +02:00
Eike Ziller
37ab6e6d03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/shared/qbs

Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
2014-06-02 12:22:03 +02:00
hjk
a9e1eef089 Debugger: Limit QObject name dumper to a more-than reasonable maximum
GDB can crash on to big chunks. Since this here is a convenience
feature only, hard-limiting it to length 200 seems ok as work-around.

Task-number: QTCREATORBUG-12330
Change-Id: Ia6ebf16f3528d91020d19851641f42c1e421fe15
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 13:34:25 +02:00
hjk
252048ef01 Debugger: Make char * displayable in separate windows
Task-number: QTCREATORBUG-7313
Change-Id: I8d475dd94a48e7a1d5efe4c2c0d90cb6bdf9b3e2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-28 15:07:59 +02:00
Eike Ziller
7c34567cb2 Merge remote-tracking branch 'origin/3.1' 2014-05-28 11:03:18 +02:00
Tobias Hunger
e5bef06d6e Wizards: Use configured extensions for c++ sources and headers
Task-number: QTCREATORBUG-12309
Change-Id: I3d6ebe84408427b5a4e499a6d38ef5f37711610e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-27 15:39:38 +02:00
Daniel Teske
7e8a945e6e Html5Wizard: Remove it
This wizard is from a different era. Nowadays webkit is on the way
towards deprecation and the replacement isn't ready yet.

Change-Id: Ifac9a42463562fefaa4a33eb7be2a09e0d8af1aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-27 10:04:41 +02:00
El Mehdi Fekari
03ffc4eaf5 QNX: Use one single bar descriptor when deploying
No more generated bar descriptor file. The default bar descriptor
should be the same one used when packaging and all changes
should be visible to the user.

Change-Id: Ib0eb1dc2ad2d49e159fa1b6009bac2e0d2569c5a
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-26 14:05:54 +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
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
Viktor Ostashevskyi
e95790c696 Ukrainian translation update for 3.1
Change-Id: I803a2bc84299bd542c04e477710fb01c30f341ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-21 10:26:53 +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