Commit Graph

4987 Commits

Author SHA1 Message Date
Thomas Hartmann
a831391337 QmlDesigner: Fix transparent color issue for font size
We use z instead of visible, because visible triggered issues
in the layout engine. I use both for now. It seems to
work with recent Qt versions.

Change-Id: I74fc1eac6d8443a85683c208ccf99b5d3f0eee09
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-25 21:35:04 +00:00
Thomas Hartmann
e28724d16d QmlDesigner: Theming fix for font size
The color of the combobox was not defined by the theme.

Change-Id: Iae9487f6c80e07c0c7b0155db79d9125c082c33f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-25 16:46:49 +00:00
Thomas Hartmann
8f36a772ed QmlDesigner: Use theme text color for TargetComboBox
Change-Id: I9c9b8286c226973f1c5008d807e4e3d452a76229
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-25 16:14:25 +00:00
Alessandro Portale
ce36804665 QmlDesigner: New anchor icons
Themable and High-DPI

Change-Id: Ic073a6a8c5f3fc7eb28b9b498d3dddbebedb243c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-25 14:51:20 +00:00
Thomas Hartmann
65f0b4b1c8 QmlDesigner: Theme binding text field
The text field for bindings was not properly themed, yet.
We also use general Qt Creator icons for apply and cancel.

Change-Id: I45f1220540a6eaeff05be0b99d8b70b64ca67af4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-25 14:33:15 +00:00
Leena Miettinen
41e336f9d7 Autotest: Fix project wizard text grammar and capitalization
Change-Id: I0f3f6ff92200760d4a226bf34a8fd10ca9d8cbf2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 09:13:56 +00:00
hjk
7037644252 Debugger: Show object address with LLDB if there is nothing better
Mimic what GDB does.

Change-Id: Ied3fff41339220eacc5c942b3f30e744f9f32a21
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 08:56:34 +00:00
Thomas Hartmann
f433247dd6 QmlDesigner: Fix regression caused by styling
The highlight for changed properties was broken for combo boxes.

Change-Id: Iaf345f2c4b0a246588a58b970cb7927004a73774
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-22 13:29:13 +00:00
Thomas Hartmann
a30b9b6c62 Theming: Do not hardcode the mapping from theming colors to QPalette
There is no reason to hardcode the mapping from theming color roles
to QPalette roles, since such a mapping can be easily defined in the
theme itself.

I added optional color roles for each QPalette role.

Themes that do not change the palette do not have to take care at
all and themes that change the palette define only the QPalette roles
they require.

Change-Id: Id195052c96117b7a1a8d7d7d6acacd44e66e22f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-22 11:09:41 +00:00
hjk
539e33da02 Debugger: Improve QObject related dumpers in release builds
Make QMeta* dumper work without debug info.
Show QObject parent and children list in this case.

QObject properties are not visible, and neither actual type
of QObject children.

Change-Id: I05417a7d78084234403a964f683db6867b6686f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-22 08:22:03 +00:00
hjk
39206931f1 Debugger: Mark out of scope variables as such
At least LLDB reports sometimes out of scope variables as such.
Report them as "out of scope" instead of letting the common
struct dumper fail and report its generic "not available".

Change-Id: Ic9d0d196894ef811fab8e6a586bf55d80cd02e45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-21 13:29:57 +00:00
Tim Jenssen
b63f98a592 QmlDesigner: fix warning if colorLogic does not exist
The idea that these spinboxes should be a mashup
with a slider was never completely implented.

Change-Id: I049f0db595fcce0fb59fad550ceb1a4ca2b415bb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 12:18:31 +00:00
Alessandro Portale
23168e93ae Flat Light Theme: Improved visibility of progress bar #2
The progress indicator does not have enough on the progress bar
background. This change increases the visibility by making the
background brighter, and conforms the success green with the run green
and error red with the stop red.

Task-number: QTCREATORBUG-16634
Change-Id: Icb1e5744b0ad59e9a11d35e6e8f8048326404cbd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-21 10:26:57 +00:00
Alessandro Portale
592dd9ecb7 Flat Light Theme: Improved visibility of progress bar
The progress indicator does not have enough on the progress bar
background. This change increases the visibility by making the
background brighter.

Task-number: QTCREATORBUG-16634
Change-Id: I35562e794e8787b6fa6016ceadafc91ce3906d5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 10:17:17 +00:00
Tim Jenssen
0a72e887aa QmlDesigner: add missing checkers.png
Change-Id: Ifbf3d13f8e586fcc3cbd284f2c23e99b10401c39
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 10:12:38 +00:00
Alessandro Portale
484550d785 Flat Light Theme: Improved visibility of navigation ions
The yellow navigation icons on gray background do not have enough
contrast. Yellow is simply too bright.

In fact, Diana specified blue as color for these icons. This change
turns thesem blue.

Task-number: QTCREATORBUG-16634
Change-Id: I4073da893486c11d4c3ba1da0b7ed3346c2bc4fc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 08:09:16 +00:00
Tim Jenssen
9f7dd3b47f QmlDesigner: show GradientStop value as tool tip
Task-number: QTCREATORBUG-5717
Change-Id: Ib4a775d217f80adab5558de8b8137b9ea9f819f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-20 15:36:47 +00:00
Tim Jenssen
e7843b3ffe QmlDesigner: fix warning if loader item is null
Change-Id: I4eecbbc9afdf9b9065ff2998a93ee22f331d92c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-20 14:50:53 +00:00
Alessandro Portale
a0f1e716c7 Themes: Draw optional toolbar borders
We need a new Theme flag for that. And it will initially only be set for
the flat light theme.

Task-number: QTCREATORBUG-16633
Change-Id: Id723e128364eb6186fe8e28e2087a3698b1bf632
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-19 16:42:35 +00:00
Orgad Shaneh
3b95ad3fa9 Dark style: Several improvements
* Make comments lighter
* Add background to disabled code
* Use the same "Value" for red and green shades in diff.

Change-Id: I075974098d8a88b21864483accabeba38b3b6063
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-19 15:24:59 +00:00
Alessandro Portale
76196abab8 Flat Dark Theme: Use "Qt Creator Dark" text editor scheme by default
Change-Id: I7a4cbde4488f82b98dc319de660e28666c71964a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-19 10:59:18 +00:00
Thomas Hartmann
6335fbf842 Qt Creator Dark syntax highlighting schema
This is a new dark theme for syntax highlighting,
that works well with the new dark theme.

Change-Id: I10df9cd2f9925687d30f6f621e252459c30e12f8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-19 09:47:34 +00:00
hjk
26fa769bab Debugger: Add dumper for QMeta{Enum,Method,Property}
Task-number: QTCREATORBUG-16593
Change-Id: Iaa710660d8ef69459596f93831cf8467913f0468
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2016-07-15 10:44:03 +00:00
hjk
5dcf23f62d Debugger: Disable QDateTime dumper for Qt >= 5.8
Chicken out for now after latest internal structure changes.

Change-Id: I66e283e52f9b51a51065520ecd3eb07b15e82fc2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-15 09:07:20 +00:00
Alessandro Portale
63eae6bd85 QmlDesigner: Theming of property editor checkbox and "tr" button
Change-Id: I599cd52c1b2b2e24952a9738f07eed0826802d4c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 08:33:00 +00:00
Lorenz Haas
676b317dd0 Tweak solarized editor themes
Use solarized yellow and red for warnings and errors.

Change-Id: I5164b1184e397eaaca68e06db74b43f6e59edfdd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 08:32:28 +00:00
Thomas Hartmann
e43773014a Adding Solarized editor themes
These color schemes are based on the Solarized color schemes, originally
created by Ethan Schoonover:

http://ethanschoonover.com/solarized/

Change-Id: I75848608f59bbb32a78520e7b1a1a2554f2eca44
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-14 15:58:59 +00:00
Ulf Hermann
25b9989749 Add wizard and mime type for SCXML
This allows us to easily add scxml files to a qmake project.

Change-Id: I2b5b21683f3e76062e6858fb8d0bceaa699a5569
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-14 11:41:05 +00:00
Thomas Hartmann
c44945032d QmlDesigner: Adding icons for property editor to icon provider
Change-Id: I0869138783230fe3ff54e59e4d9094d23f5d42cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 16:42:39 +00:00
hjk
a12420c995 Debugger: Improve QMetaObject dumper
Change-Id: I690e95f5f4651331f6b2407636253770a9bb92a0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-07-13 15:57:37 +00:00
Alessandro Portale
339327f7a3 Flat Light theme tweaks
Change-Id: I56a437c4f5ab7668124917731cd63fdd97b3b571
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 10:20:22 +00:00
Thomas Hartmann
a017138e58 QmlDesigner: Adding theming support for Qt Quick Designer
With this patch the Qt Quick Designer supports:

*Flat
*Flat Dark
*Flat Light
*Classic

I did not test the dark style.

I added a template engine for the .css files. The syntax for the .css
files
is identical to the QML syntax.

Known issues:
* The icons in the property editor do not play well with the
  Flat Light style. We have to get proper Core:Icon support for the
  icons
  and most icons have to be simplified/flattened to fit the new style/
  theme.
* Some colors in the connection editor are still dark and hardcoded. But
  this looks ok together with all themes.
* The highlight colors are not taken from the theme, yet.

Change-Id: I94f2b75f92db8e131c2b15867dbabe9ae4b2f25a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:23:29 +00:00
Thomas Hartmann
725771c472 QmlDesigner.PropertyEditor: Crash fix
Fixing infinite loop in java script.

Task-number: QTCREATORBUG-16573
Change-Id: I490d8b85635b7209f7923f9c8341bf77962c57b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 10:18:04 +00:00
Alessandro Portale
8667877baa Flat Dark theme tweaks
Change-Id: I05c7cd5769476ca4cc003cb8f8c2c40e86f929a4
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-07 13:22:23 +00:00
Alexandru Croitor
be72a94472 Debugger: Show formatted contents of WebKit strings in local view
Change-Id: I616c19be20bf32789ab052fdec2b228e145e6be2
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-07-06 07:49:06 +00:00
Thomas Hartmann
268fea1c5a QmlDesigner.StatesEditor: Add StatesEditorIconProvider
The StatesEditorIconProvider provides the proper icons
from ICore:Icon.
This icon provider should be generally available in the future.
For High DPI support we need hardcoded image sizes.

Change-Id: I323c07501664b8038c8777998901a28554c568f0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-05 18:39:01 +00:00
Oswald Buddenhagen
69c8b9271c fix qt namespace retrieval when an early break happened
the logic to retrigger the namespace retrieval was broken, so if it was
triggered for some reason before qt was "sufficiently available", the
bad/failed guess would persist.

Change-Id: I90e02247142814bdc3f6d5cddfc0c2fe37665a3e
Done-with: hjk
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-07-05 14:58:52 +00:00
Thomas Hartmann
a12184ea32 QmlDesigner.StatesEditor: Adjust margins
The "magic" -2 keeps the margins symmetric.
The states editor now nearly looks like the blog post proposal.
Only the highlight color is different, but already comes from the
theming engine.

Change-Id: Ibae5a3f19a7b07063ea44933498c24519bd34e94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-04 11:42:46 +00:00
Thomas Hartmann
ca5ce834ef QmlDesigner: Hide target buttons for centered anchoring
I never ever needed that feature and the functionality is
missing/incomplete.
Setting all anchor combinations for the left/right/top/bottom
anchors should be enough.

Change-Id: I2c1a165ff7ef0ecc666640aeba7e86166c90aa25
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-04 10:15:53 +00:00
Thomas Hartmann
2fc7b791ff QmlDesigner: Use smaller font in item library
This allows to show more items in the library.
While we get more and more components it is important
that we can show the increasing amount of items properly.

Change-Id: Ifc5db011b65b7accf96af5192ce2702b6f112da6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 13:47:50 +00:00
Thomas Hartmann
eb34226adb QmlDesigner: Remove animations from item library
The animation serves no purpose.

Change-Id: If17d1ee31ff5a0de9832edff204adbc4f82f6c43
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 13:47:31 +00:00
Thomas Hartmann
9b9a647aed Wizards: Remove Qt Quick 1 file wizard
Change-Id: I4ea4ab66cec327ef7a85a46dedb2c21ad3db8912
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 07:50:44 +00:00
Alessandro Portale
589792fe1c Welcome: Fix the handling of the new Theme::FlatToolBars flag
Small addition which should have been part of
8588cf268f

Change-Id: Iddc91e1ec98a944b2d44f615140025693cfc0fd0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
(cherry picked from commit 835ab0c44f)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-01 05:15:50 +00:00
Tim Jenssen
bb424cd8af QmlDesigner: use visible instead of enabled
Change-Id: Ic581f104a600ac24f89c497435d9a3a1efb3a570
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-30 09:00:33 +00:00
Tim Jenssen
d00b75a0b7 QmlDesigner: fix wrong AnchorRow initialization
Change-Id: I281f57fab8f5900362d2393b0b578957e77c6f4d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-30 09:00:26 +00:00
Tim Jenssen
f95f685d01 QmlDesigner: fix preferredWith is unknown warning
Change-Id: If660ac05e8c88d2fdde834689a2213c495a22eec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-30 09:00:17 +00:00
Thomas Hartmann
a63c431916 QmlDesigner: Fix fixResourcePaths()
QML does not accept absolute paths (e.g. C:\working\something\) as urls.
We need the file:/// prefix.

Change-Id: I9df74cd9c0e730fba056af971751f8eb88cdb536
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-29 13:14:52 +00:00
Thomas Hartmann
ba7016ab1e QmlDesigner: Fix UrlChoser
We have to set currentIndex to -1 if the url is not in the model.

Task-number: QTCREATORBUG-16494
Change-Id: I031a4f99d83b35ea1c0b805194b6aa42338f6509
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-28 15:51:58 +00:00
Christian Stenger
63e158b4d4 AutoTest: Enhance wizard to support GTest
Initially this adds basic gtest testing - to be improved later on.

Change-Id: I2121cd24493a8d65c5acd0be5c9dd5858702645d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-27 10:00:49 +00:00
Eike Ziller
07fccfe9f1 Merge remote-tracking branch 'origin/master' into 4.1
Change-Id: I56399e6938a5f5096c0b1a1561a54d34a5c96330
2016-06-27 11:40:35 +02:00