Commit Graph

110 Commits

Author SHA1 Message Date
Jan Kundrát
56e684fc37 Fix readability of TODO entries on dark themes
The TODO plugin provides default values for color-coding backgrounds
based on the severity of each item. These colors are rather light, and
there is just one default with no theme awareness.

It is a bug to use a theme-aware text color on a fixed-color background
-- just switch to a dark theme such as flat-dark and observe the
unreadability.

This patch simply ensures that the default settings have reasonable
readability. These defaults are still not theme-aware, but at least they
are consistent.

Change-Id: Ibf35a241c70e0f1ea001b55f84fd2e1dd1a0a2ea
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-14 14:00:49 +00:00
Orgad Shaneh
a6427453f4 Fix icons that moved from core to utils
Change-Id: Id3151b1cce2d97b2bfb6debaf3cebe53cd6d88ed
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 16:12:35 +00:00
Orgad Shaneh
0e134d260e Theme: Remove unused icon entries
Change-Id: I867aa0b8737b56fc3e8d357bb1559acad740ccf0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 09:39:42 +00:00
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
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
2016-09-13 12:15:09 +02:00
Konstantin Shtepa
a3739fb14b Dark theme: fix selection color in help mode
Change selectedBackground color to color from flat-dark theme. Now
selected text in help mode is visible.

Task-number: QTCREATORBUG-16375
Change-Id: Ifed68617784f1303bc168e783e4a73bb9da55c8c
Reviewed-by: Konstantin Shtepa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-05 07:44:25 +00:00
Konstantin Shtepa
590971e898 Dark theme: fix selection color in help mode
Change selectedBackground color to color from flat-dark theme. Now
selected text in help mode is visible.

Task-number: QTCREATORBUG-16375
Change-Id: Ifed68617784f1303bc168e783e4a73bb9da55c8c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-03 20:50:07 +00:00
Gabriel de Dietrich
8fecf8dc97 Welcome Screen: Improve link color in both dark themes
This is mostly tweaking the shades of green to provide
better constrast against the dark backgrounds. Since
the regular and flat dark themes have different back-
ground colors, the link color differ slightly as well.

Change-Id: I39b1aa82c89ff753513d203be696c64483812028
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-03 17:44:29 +00:00
Ulf Hermann
94ca84c1e4 Timeline: Add some theming
While we're at it, also remove all the weird borders and use standard
icons. The timeline doesn't have a "baroque" theme, it's all flat for
now. If the need arises we can add some gradients here and there.

Change-Id: Ia9ce22d7f412c4999feca2284959be4d734267ac
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 11:35:35 +00:00
Alessandro Portale
d6613a08fd Dark Theme: Make unfocussed minitargetchoser item easier to spot
The least invasive way to do that was to chose a brighter background
color.

Task-number: QTCREATORBUG-16702
Change-Id: I4d3d129ddc197e9747079484d9faf104e1b8c3bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-08-04 14:56:10 +00:00
Alessandro Portale
04c136b92f Qml Designer Theming: Fix background color
The background color for light theme is too dark. Instead of trying hard
to deduct that color mathematically, let's add a theme role for it.

Change-Id: I6a49d43e7e11c87427242819c67988b05b87518b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-04 14:56:08 +00:00
Alessandro Portale
985e7006cc Flat Light Theme: Fix inactive project tab in Projects mode
The text should not be white, since it is dran on a bright background.

Change-Id: I1671c84946b9449539c10f7863fe85e04d4dd362
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-03 10:14:29 +00:00
Alessandro Portale
f41e1d3a31 QmlDesigner: Fix Flat Dark QmlDesigner_HighlightColor
Selected items in the navigator tree are hard to read. This patch turns
the highlight slightly darker, which makes the light gray navigator item
text easier to read.

Change-Id: Ibe1de477f44ad8dfd7b53c3d7bd92b39ad0ed1a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 12:12:28 +00:00
Alessandro Portale
9f53b0e13c ProjectExplorer: Themable miniprojecttargetselector.cpp
Replace some hard-coded colors with theme colors. That is required for
the Flat Light theme.

Change-Id: I2ce289fce8c2e6437148eb691484e0441975979f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 15:30:17 +00:00
Alessandro Portale
4bdd1ffbf7 Themes: Enable using the original Window color for toolbars
This patch adds a flag which enables the "fancy" side/tool/status bars
to use the original Window color from the application palette.

The flag is disabled for all themes by default.

Task-number: QTCREATORBUG-16331
Change-Id: I1433e865e1903012d521a2cdb7083f110086e455
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 08:58:47 +00:00
Thomas Hartmann
b496ac8832 QmlDesigner: Adjust QmlDesigner_HighlightColor
I use the color from the flat style proposal.
This color seems to work good enough in all themes.

Change-Id: Ie543236fb578141bd3c1fb12c783597b26b12138
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-26 13:02:29 +00:00
Thomas Hartmann
8f393efec0 Adding QmlDesigner highlight color to Theme
Change-Id: I73d6ec3b7bff5e161de54a3287e3352435753234
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-26 11:07:32 +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
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
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
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
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
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
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
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
Andre Hartmann
3a78b610d7 VCS: Colorize unmerged files in submit editor
So far, conflicted files were displayed like added ones.

Now they are marked obvious, as they disable the commit button.

Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-20 12:15:53 +00:00
Alessandro Portale
5e32183c9b Theme: Separate run/stop/interrupt icons in menus
And for that, we also need separate theme color roles.

Change-Id: I27bf4499acb516f7f824f5e57632797653b150ec
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-21 15:57:56 +00:00
Alessandro Portale
ac04a91820 Flat theme: Make some icon colors opaque
Transparency channel plus shadow create more artifacts than benefits.

This change removes sets the alpha to ff and changes the rgb values so,
that the icons still look exactly as before on the standard toolbar
background.

Te icons will however be better visible on other backgrounds such as
menus.

Change-Id: Idbf2c5c838bad615844ebf2eb63d104f8939b991
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-20 09:16:27 +00:00
Alessandro Portale
25603f9dc8 Themes: New display names "Default" -> "Classic", "Default Flat" -> "Flat"
Also the defaultflat.creatortheme is renamed to flat.creatortheme.

The file name of the "Classic" theme remains default.creatortheme in
order to make sure that who previously actively switched to another theme
and back to default won't suddenly get the flat one.

Change-Id: I1a1f35aded00201a685ad221b70a9b728f2be972
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-15 14:11:13 +00:00
Alessandro Portale
0788ec7f48 GlslEditor: Remove duplicated icons
This change makes GlslCompletionAssist reuse the equivalent icons
from CPlusPlus, and adds specific ones for "Attribute", "Uniform"
and "Varying".

Change-Id: Ic8860274a9f421d28cfec86ed0d1badb7e1cf92e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-11 13:31:25 +00:00
Alessandro Portale
4c7cef82aa CPlusPlus: New code model icons
Change-Id: I9ad6445319d85ffb652377a00256a68d56754352
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-11 11:24:33 +00:00
Alessandro Portale
38ebfa9573 "Default Flat": Brighter text color on the fancy bars
White instead of gray.

Change-Id: I74f948c4b3cccb9dcad520eb6c08c1ad1175f651
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-11 10:53:32 +00:00
Alessandro Portale
a792f37c88 "Default Flat": Explicit normal and bold toolbar text colors
Nothing changes, but this makes it more manageable.

Change-Id: I30879625ae8a46f86499c5f033a3cac129797568
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-09 19:51:16 +00:00
Robert Loehning
f589e8b38d More contrast between enabled/disabled state of stop icon
Now also for Default Flat theme

Change-Id: I6d0962240b2eb19dbaecc390204c1af2de533d3c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-07 16:01:49 +00:00
Robert Loehning
ffac73b952 More contrast between enabled/disabled state of stop icon
Change-Id: I0096535c1cd7de6924046be62c04a4336a013b5a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-04 14:23:15 +00:00
Alessandro Portale
9647a97c66 Default Flat Theme: Improve toolbar separator color
Make it the same as disabled icons, so that they are clearly different
from enabled icons.

Change-Id: I8b467745a91dc94cbf2db1cb9a83c927d90ce5c1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-04 07:32:40 +00:00
Mitch Curtis
bbb0de0553 Dark theme: make "changed variable" text color in watch window readable
It was a pure red, which is really hard to read against a dark
background. This patch makes it a pastel red; the same color as error
messages in the application output, which was implemented in f4a9eaf3.

Change-Id: If013c7215d50c3a75d62031ab19874cfb8545cad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-23 11:55:10 +00:00
Alessandro Portale
ddde4bdd27 Utils: Improved handling of StyleHelper::baseColor
This change makes sure that the "UI coloring" feature respects the
original brightness of the current theme. It prevents dark themes from
getting a too light recoloring and vice versa.

Extra benefit: this allows to remove much recently introduced code.

Change-Id: Ib2c96e7ed172a4cc97520aa4b5d180cc6353c661
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-21 14:23:23 +00:00
Alessandro Portale
61b772e0e3 WelcomeScreen: little adjustments for default.creatortheme
..by rounding the buttons and adding a theme color role for their background

Change-Id: Icde7bb0be178ffbe65635d336227886ffd902129
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-18 15:40:00 +00:00
Alessandro Portale
a0806dedd5 Rename the "Dark Frame" theme to "Default Flat"
Change-Id: I1d2dc8af94466de29fc1429c82dbbd37bcf7310b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-18 11:18:03 +00:00
Alessandro Portale
748c4ac57f Welcome: Implement part of Diana's design
Removing font variations, colors, roundings and gaps.
And it is now better themable.

The examlpes and tutorial selection still needs to be done.

Change-Id: I520814ba9e8ce4fa1d1ca7ec14329955e8a0609a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-17 16:38:40 +00:00
Alessandro Portale
bc481dc399 Flat theme: Same disabled color all side/tool/status bar icons
And adapting darkframe.creatortheme accordingly to match Diana's
specification

Change-Id: I9e1f62869ff91d7cfd3a26f51d26225d549a0965
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-17 11:54:14 +00:00
Christian Stenger
1584328da9 AutoTest: Add some theming support for results pane
Change-Id: I6641dc92d54ea20263656fa77157d7d853cf0287
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-17 10:21:26 +00:00
Alessandro Portale
5ab8440e2f ProgressBar: Add a theme color for the background
The progress bar is important and custom enough to deserve its own theme
color for the background. This change adds "ProgressBarBackgroundColor"
and also sets it for dark.cretatortheme, so that it has a good contrast
to ProgressBarColorNormal.

Change-Id: I37731d7a918a862a28940e215c913f9ade8569ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-03-17 08:05:08 +00:00