Commit Graph

5173 Commits

Author SHA1 Message Date
Alessandro Portale
84d298e085 TextEditor: Unify error/warning icon and textmark colors
In most themes, the color of the warning and error icons differ from the
color of the corresponding textmarks (on the scroll bars). This patch
makes sure that they are the same.

Also the progress bar error color is now the same.

Change-Id: Ibce536bed1a9f43d242c2eddf9f94cc6277b2f64
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-18 09:35:37 +00:00
Thomas Hartmann
8469da333b QmlDesigner: Unify tooltip
We had slightly different tooltips for the same functionality.
I use the tooltip from the navigator.

Change-Id: I0afa53d75c01f23ebbfa1311d69e2f5a895c9e34
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-18 07:51:59 +00:00
Eike Ziller
c4f92146be Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp

Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
2016-10-18 08:02:35 +02:00
Sergey Belyashov
401b58f791 Update Russian translation
Change-Id: I898b6166959db375273376e484aeb9956550142d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-17 15:56:25 +00:00
Eike Ziller
a2871e5513 Merge remote-tracking branch 'origin/4.2'
Change-Id: I3a54f679238e6eb4f053608286fc39eae3041561
2016-10-17 16:22:08 +02:00
Thomas Hartmann
669a77bac4 QmlDesigner.PropertyEditor: Fixing font issues
fully qualify properties to avoid ambiguities

Task-number: QTCREATORBUG-16403
Change-Id: I0f0f7a7dbf28f51aa82bf3e2fd2652189c460102
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 10:20:00 +00:00
Thomas Hartmann
8af2c18341 QmlDesigner.PropertyEditor: Fix color logic for LineEdit
Explicit changes should be highlighted in blue.

Change-Id: I221016e5cd70643ae68faf7ebd0d6e0b1616a41c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 09:45:22 +00:00
Thomas Hartmann
57e0bb7d84 QmlDesigner: Adding ExtendedFunction button to UrlChooser
This allows to edit/set bindings on urls for e.g. images.

Instead of the hack before we now use padding in the style
to reserve space for button.

Task-number: QTCREATORBUG-13328
Change-Id: I94bad70618440a2ed835629e561a394d76990883
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 09:44:55 +00:00
Thomas Hartmann
5da074f95a QmlDesigner: Fix ESC issues
We do not want to switch to the editor whenever pressing ESCAPE.
Using shortcut override does not work for QQuickWidget.

Therefore we register our own action and disable it.

Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-14 15:20:00 +00:00
Thomas Hartmann
d81becd5fc QmlDesigner: Ensure lineedit has the correct color
Task-number: QTCREATORBUG-12513
Change-Id: I5a169561cb378bbe952c5544ec86510a9b7349f3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 16:00:05 +00:00
Alessandro Portale
b17c43b6d9 QmlDesigner: Make sure that the export alias icon is not scaled
SecondColumnLayout would otherwise scale it up, at least on HightDPI.

Change-Id: I5c1bd6357e8559deee26002b90128abfbacf449f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-13 14:48:18 +00:00
Christian Stenger
e0a6b45f22 Dumper: Fix padding handling (32bit)
This also reverts 3d68a8d0de.

Change-Id: I3e527096b4d36a102f010e538e428654cc3b783c
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 13:26:31 +00:00
Thomas Hartmann
034f1728ea QmlDesigner: Set QQuickItem parent if item is written to a property
The QQuickEngine does the same.

Before in cases like this:

Item {
   Slider {
      handle: Item {
      }
   }
}

The item parent of the handle was the root item instead of the slider.

Change-Id: Ia022c82c6d85c2a957763c56639ac77bca9297e6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:39:25 +00:00
Thomas Hartmann
33e5ff9ecf QmlDesigner: Adding support for font spacings
Change-Id: I55843cade308cab00f4394a239507447fb84e0da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:16:50 +00:00
Thomas Hartmann
eed82c8268 QmlDesigner: Adding support for text capitalization
Change-Id: I236e8e3152929cd2a5669c78aa7841e84a211aa3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:15:24 +00:00
Thomas Hartmann
b0d5887638 QmlDesigner: Adding support for font weight
We have to tell the rewriter that an enum scope called "Font"
does exist.

Change-Id: Ib77a099d94ec84b99e54e3c9151249df53eb53fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:13:51 +00:00
Thomas Hartmann
5d5c4aa9cc QmlDesigner: Adding support for fontSizeMode
Change-Id: I34d5b4b801951929c8463ac741ee89977a017781
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:11:06 +00:00
Thomas Hartmann
92a085d273 QmlDesigner: Adding support for the render type of text
Change-Id: I0690f8ec77cc5c76255d4a49cd91bb3c23e12728
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:08:30 +00:00
Thomas Hartmann
da202bff82 QmlDesigner: Adding support for padding
This property has been added to Qt Quick 2.6.
We do not show the padding section for Qt Quick versions
that do not support padding.

Change-Id: I10123c65849e1708d452320ba3e3b4cb19f5b5bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:05:26 +00:00
Christian Stenger
3d68a8d0de Dumper: Fix dumping of QImage on 32bit
Change-Id: I3cc10a858f392ea34418698411d250809ba374e4
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 10:14:18 +00:00
hjk
cdb218a3e1 Debugger: Show raw object data for pixmap
"Separate display" can be triggered for QRasterPlatformPixmap on
the embeddded QImage.

Task-number: QTCREATORBUG-17107
Change-Id: Ib54a6f76f634b0dcf601836dc10609f212581d14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-13 10:08:33 +00:00
Thomas Hartmann
2c9fb06b97 QmlDesigner: Adding elide property to text
Task-number: QTCREATORBUG-13455
Change-Id: I7e333840ccf2b7dde85f25f60392158167798c54
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 10:03:16 +00:00
David Schulz
9ad46e7d04 Debugger: Fix QDir dumper for Cdb
Calling functions is currently not supported in the
cdb python dumper.

Change-Id: I07da5ba93ea3ad838e758ca79062ae9aa4e8fabc
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:26 +00:00
David Schulz
b01119543f Debugger: Overwrite unsupported call functions in cdbbridge
Change-Id: I64f933d649432fb680fc7e2e0cdfa251e798a58c
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:22 +00:00
David Schulz
792a9015ec Debugger: Fix std vector dumper for msvc
And potentially QNX

Change-Id: I53bd34df5b3b4dfbaa50cd84c5dd9d3c975181d8
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:13 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
2016-10-12 16:02:47 +02:00
hjk
a33ed283b5 Debugger: Add a dumper for TNimNode
Change-Id: I62f1a0b07bac22bcc34a47b9848d3c92f25d31f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 10:47:46 +00:00
David Schulz
646b3bd553 Dumper: Fix std map dumper for msvc
And potentially for QNX.

Change-Id: I77f1c9803ff5441394a3d446720a928b12777e6a
Reviewed-by: hjk <hjk@qt.io>
2016-10-12 10:13:43 +00:00
hjk
449a11775a Debugger: Strip references from type displays again
Change-Id: I4b4f48194fad8cd331e9f281b14044e5262b49be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 07:50:01 +00:00
hjk
c938b8d4db Debugger: Always initialize currentNamespace guess
This shouldn't be necessary but the task indicates otherwise.

Task-number: QTCREATORBUG-16965
Change-Id: I6df28c96e0acb3cd3eea56a5a931b36fbd85dcea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 07:35:06 +00:00
hjk
cb7fb51313 Debugger: Fix QML extra stack loading for GDB
Change-Id: I702bb8f183e93fe25857115225fa55607ffb1674
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 07:04:56 +00:00
Thomas Hartmann
f175d0c589 QmlDesigner: Add ExtendedFunctionButton to layout flags
The layout flags are a little bit special,
but the users expect a "reset button".

Task-number: QTCREATORBUG-15616
Change-Id: Ie16c4a6c565107179d1dee4a88d25c65849842bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-11 11:04:49 +00:00
Thomas Hartmann
cba20b9e37 QmlDesigner: Do not allow to export attached properties
While this might be technically possible, I consider this
bad practice and see now reason to allow this.

Change-Id: I1b25e0e4f7c7925005a608e1cb98f5abe240fd50
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-11 11:04:35 +00:00
Thomas Hartmann
72ee54a928 QmlDesigner: Allow easy export of single properties
The name is idPropertyName by default, but can be changed
using the dynamic properties editor.

Adding missing qsTr().

Change-Id: I363222620d1ce81c23619e1bc4449ef50357b88b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-11 08:23:34 +00:00
hjk
60e4cec473 Debugger: Make createType more flexible for namespaced Qt
Use '@' in type names as replacement for the namespace,
similarly to what the auto tests do.

Change-Id: Idc074f8d47a31cb942a35f3d4fe364d806f9610e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-10 13:53:55 +00:00
hjk
a476da65cc Debugger: Use single quotes in qttypes.py
Change-Id: If5ab0a836fa46465d81ca4c6ea6392c6870be42a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-10 13:53:44 +00:00
hjk
0722b82560 Debugger: Start standardization on single quotes for Python strings
Looks a bit cleaner.

Change-Id: I0bda173a4a8e12419d2b5914b83b54162a453927
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-10 09:58:21 +00:00
Eike Ziller
21258bac46 Merge remote-tracking branch 'origin/master' into 4.2
Change-Id: Ibc8b4de34e6790854d23b829c96a1a128ea0e6a4
2016-10-10 09:25:10 +02:00
David Schulz
832be2ecb8 Dumper: Add MSVC standard string dumper
Change-Id: Iaea8123b3b8aeebd931c5f837ed10f0fba6b23f7
Reviewed-by: hjk <hjk@qt.io>
2016-10-10 06:45:08 +00:00
hjk
e149c0dac9 Debugger: Fix LLDB's field size reporting
Use the field's type size if the reported field size is 0.

Change-Id: I7db49507d0ea7358b6db27dfa206f2b079bbf876
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-10 05:19:10 +00:00
Christian Stenger
71a449a1e8 Dumper: Fix typo
Change-Id: I3f9e9b2b38d4a8af68a6d79bf3c63572ca160db8
Reviewed-by: hjk <hjk@qt.io>
2016-10-07 14:42:53 +00:00
hjk
27e03e6fb6 Debugger: Do not run engines twice
There seems to be race in the LLDB setup on Linux. Work around
by not doing serious work twice to be able to use the test at least.

Change-Id: I387a57d3c66e6c4209bd424af9be16f17acb98fa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-07 13:06:27 +00:00
hjk
6b2665a180 Debugger: Consolidate dumper state setting
Move all the currentFoo initialization to DumperBase

Change-Id: I0a59715fe1550f466e78cbf678622dd8dfe1783c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-10-07 13:04:30 +00:00
hjk
311adfeff7 Debugger: Remove output lock from cdb bridge
There's no threading involved on the cdb/python side.

Change-Id: Ibc1ad6fb5242a86450ca15f65cb57e4cae99d6ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-07 10:21:56 +00:00
Thomas Hartmann
4f2557e9cf QmlDesigner: Fix build of qml2puppet
If the qml2puppet is build for the custom Qt then
the build failed because of utils/algorithm.h.

There is currently no reason to use utils/algorithm.h
in the puppet.

Change-Id: I4fb2aa2e7df4a5087ff48318cc416b457779c96e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 10:20:23 +00:00
hjk
479b2c7c1a Debugger: Clean up misctypes.py dumper a bit
Change-Id: I028e2460f5b0e2621872993cfa111f5b20b16e7e
Reviewed-by: hjk <hjk@qt.io>
2016-10-07 09:59:22 +00:00
hjk
54ad874579 Debugger: Restrict Nim sequence dumper to structs
Change-Id: Ibf1dc490a2b93e5d9ca8949e05471043bfed9afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-07 07:28:55 +00:00
David Schulz
a83d539551 Cdb: Introduce interface for python dumpers
Change-Id: I0ef2fd8a44232d65b0d772fd6c65230266d586a8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-07 06:40:20 +00:00
Tim Jenssen
83e128c2d9 QmlDesigner: refactor test import code
Change-Id: I4efaaacbbf2de23b8709535a7b9a2446f0a4b90e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-06 15:50:11 +00:00
hjk
e234bbd88b Debugger: Add dumper for Nim's string and sequence types
... and make the auto test infrastructure able to handle
a test. To pass the test, some Nim compiler must be
accessible.

Change-Id: I707aa72c0f3a2ea35c7131cba490cafb41617f6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-06 13:39:02 +00:00