Commit Graph

5173 Commits

Author SHA1 Message Date
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
Georger Araújo
c3a5eecfc5 Modnokai Night Shift v2 color scheme for QtC Text Editor
Change-Id: I7919dab34402ce5da0b77fb8fe0630c7c318479f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-06-23 18:34:58 +00:00
Christian Stenger
eeb1a8fe58 AutoTest: Use json based wizard
Change-Id: I75693037542ef64bcc094e092086dea65d77872c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-23 10:10:23 +00:00
Thomas Hartmann
8eeb657e75 QmlDesigner: Adding tool tips for anchoring
Task-number: QTCREATORBUG-13503
Change-Id: I2c65e47797ba77d3cc2e5b2c6723b1c010982d8f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-06-22 15:53:02 +00:00
Tim Jenssen
5dd8e7214a QmlDesigner: fix url
Problem was that a file added to resource it
wasn't shown in the canvas.

Change-Id: I57610db8a55791c409bd249d698bf757cde153b9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-22 13:17:05 +00:00
Tim Jenssen
18e5dabd72 QmlDesigner: add workaround for broken tooltip calls
Change-Id: I2315ad0ebdaca5399e6080a12852f7118399654e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-22 13:16:45 +00:00
Tim Jenssen
5a11d5cd5b QmlDesigner: use initializer lists
Change-Id: Ie93861c7d8a5b2863ec8b111afceacc2c163715b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-22 13:16:33 +00:00
Alessandro Portale
2734d27b8d Theming: Set flat flag on flat themes
Change-Id: If505551fbf0dea6fa3e6f9897ab3fec6e6a7a1b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:28:48 +00:00
Alessandro Portale
8588cf268f Utils: Replace Theme::widgetStyle with a flag
Theme::widgetStyle with its two possible return values makes less sense
than a bool flag. Especially since we already have several separate
theme flags for ui elements which might be "flat" or not.

Change-Id: Ic521bb58c04386b735b784079de05e521bc1f45f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:24:58 +00:00
Alessandro Portale
eeadfbba8c Theming: Add the "Flat Light" theme
As specified by Diana

Change-Id: Ic0a75927a3912c064f8b6b9f03b1f115071c6c89
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:24:44 +00:00
Alessandro Portale
3994f595a8 Theming: Add the "Flat Dark" theme
As defined by Diana.

Change-Id: Id7291ea80bddcb2388b26b4ba745c2b53feb11d0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-21 15:24:31 +00:00
Alessandro Portale
abb63602de Utils: Make the "shadow" under toolbar icons optional
In preparation od a "Flat Light" theme, where shadows under the icons
would have a negative impact.

Change-Id: I2d9d3563c90336640513c1a970a432898dd63cfc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-20 07:49:56 +00:00
Alessandro Portale
6a8d6296b1 Utils: fix typo in Utils::Theme enum
IconsModeProjetcsActiveColor -> IconsModeProjectActiveColor

Change-Id: Id13039b49102e75ac3d7558ff79e971bce54ed43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-06-17 13:40:30 +00:00
Thomas Hartmann
9065697572 QmlDesigner: Support .qrc files in the qml2puppet
The code model knows about .qrc files and has a mapping
that we forward to the qml2puppet.
Support for .qrc was broken when introducing the QmlPrivateGate.

Change-Id: I22d1c1add65d0c9a914e471dbe51ef505f308494
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 14:24:26 +00:00
hjk
726b907cc3 Debugger: Remove debuggerstringutils.h
With QT_RESTRICTED_CAST_FROM_ASCII making GdbMi etc operate on
QString is feasible again. Take this as opportunity to move
debugger encoding handling closer to a 'conversion on input and
output if needed, storage in QString only' scheme.

Change-Id: I2f10c9fa8a6c62c44f4e6682efe3769e9fba30f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-09 08:09:46 +00:00
Christian Kandeler
a0f956f050 qbs build: Introduce new module "qtc".
The qtc module gathers properties that used to live in the top-level
project file. This is the first step towards making it possible to build
plugins against an installed Qt Creator ("out of source build").

Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-08 08:46:00 +00:00
Filippo Cucchetto
94fdd4d900 Added plugin for supporting the Nim programming language
The plugin support:
- basic syntax highlighting
- indentation
- project management
- run and build configuration
- debugging
- code style

Change-Id: Idfbb02a11ed570c90149a54b726beb956712e2bd
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-07 07:17:55 +00:00
hjk
b198d482cf Debugger: Robustify Qt version extraction
Task-number: QTCREATORBUG-15497
Change-Id: I61b52d23e0acf69e2030f8dca2691fbaa6b309ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-07 05:33:13 +00:00
Orgad Shaneh
33c3a1fbbf Wizard: Use Qt5-style connects
Change-Id: Ibe5d1543e99644ff2c07146b9a83d9fe5b4121e1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 07:41:53 +00:00
Orgad Shaneh
75b1a8e41e QmlPuppet: Use Qt5-style connect
Change-Id: I6d0599a80ba06fffdbaa067db5a98dd72118cac3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-02 09:24:11 +00:00
David Schulz
d21cd57e13 Editor: Animate automatic completed text.
This gives a clear hint that something has changed.
And gets the attention of the author in the case he didn't
expect some kind of automatic brace or quote completion.

Change-Id: I33e383db9a1e797ecb285a407e46671f41be7051
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 12:58:19 +00:00
hjk
e108d6fe48 Debugger: Fix transport of negative signed chars
Change-Id: I9b25d4b8e4b68d9cef674581d1a42eb75e21ec56
Task-number: QTCREATORBUG-16353
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-31 12:12:33 +00:00
Alessandro Portale
bb0a96a1ba Wizards: Remove deployment.pri. Inline the deployment rules instead.
After having been reduced drastically a while ago, deployment.pri still
contained a fragment regarding deployment. This change inlines the 3
relevant lines into the main .pro file and reduces the size of generated
projects.

One side effect of these new qmake code lines is that if target.path is
defined before them, an install target is created also on non-"unix".

Change-Id: Id0893d563924c1ba9f9599c0bfe5218e82c16d1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 08:50:34 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0'
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
2016-05-27 12:01:36 +02:00
Takayuki ORITO
6b506b34ec Add properties to template for Qt Quick Application.
It imitate template for Qt Quick Controls Application.

Change-Id: I3440c96f06f3607b43811399427e341e73dea657
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-27 08:48:32 +00:00
hjk
fbc82d3f88 Debugger: Fix dumping of numeric QJsonValue inside arrays
Task-number: QTCREATORBUG-16313
Change-Id: I544e89fc964cd404652d8ea0c8df127e51235292
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 13:09:19 +00:00