Commit Graph

68 Commits

Author SHA1 Message Date
Eike Ziller
89e9597365 Set palette also for light/mixed (flat) themes if needed
We cannot assume that the default palette on the platform
and its theme fits the Qt Creator theme. If the system is dark, but Qt
Creator's theme is light, we need to set the theme palette on the
application.

Some themes already enforce the theme palette unconditionally (design-
light, and the dark themes). We don't want to set the palette
unconditionally for our flat default themes though, because for example
on macOS the light and dark colors that we get from the system are
always good and match the Qt Creator theme (because we tell the system
that our application is light/dark explicitly). Add a new
DerivePaletteFromThemeIfNeeded flag as an alternative to
DerivePaletteFromTheme for this.

Fixes: QTCREATORBUG-18281
Task-number: QTCREATORBUG-23187
Fixes: QTCREATORBUG-26817
Fixes: QTCREATORBUG-28589
Fixes: QTCREATORBUG-30138
Change-Id: Id0042980807fa2efd663b856a45255bb453227fd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-04-17 14:03:10 +00:00
Alessandro Portale
903d01b934 Welcome: Implement new design
2024 redesign

Change-Id: I6629849921272d856f201693973a8e29c6465e94
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-27 16:42:10 +00:00
Alessandro Portale
2c45a3ffe4 Theming: Update of color tokens
Token_Background_Hover is gone.
Token_Foreground_Default, Token_Foreground_Muted and
Token_Foreground_Subtle were added.

Existing token colors were changed.

Change-Id: I9505ee54dd02f78bd722c0dcfe42ee6ae4e48d13
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-26 14:08:00 +00:00
Alessandro Portale
7a890f5e94 Utils: Add Qt Creator Color Tokens to QtC themes
The new design spec defines a generic palette of colors
which will first be used for the extension manager, then
the welcome Screen and eventually in all/most of QtC's
UI.

This change adds the new enum keys and the light and
dark variant as section to the respective creatorthemes.

Change-Id: Ifeb691cfe29914463b0e9f9af27b33341f316cdd
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-12-11 10:04:31 +00:00
Tim Jenssen
9f1d23df00 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Ic852bc9977d0292fb6cd93a319f4bfdebb22a1b0
2023-11-16 17:17:46 +01:00
Brook Cronin
84b0501693 QmlDesigner: Add micro toolbar for connection editor code preview buttons
Task-number: QDS-10732
Change-Id: I67fef29db4b6dfb184a60e39723a6ab9437c694b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-03 12:05:20 +00:00
David Schulz
6f4b9639ce TextEditor: highlight selected text
Change-Id: Ib46908decef51d478f6954a116108c48e4a07ed3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-23 07:33:45 +00:00
Tim Jenssen
85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
2023-10-05 15:53:42 +02:00
Brook Cronin
a496ac5d02 QmlDesigner: Design fixes for connections popout
Change-Id: I06968cfef23f8b296f1ba6b07e57cdc96701447b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-09-15 17:21:33 +00:00
Alessandro Portale
7de9667a7f Themes: Update DS* roles for all non-QDS themes
Update non-QDS "dark" themes with DS* values from "design".
Update non-QDS "light" themes with DS* values from "design-light".

Change-Id: I7561d5f9e5ad22cd791b5d9772a3ad2f7c2bb399
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-15 07:20:29 +00:00
Tim Jenssen
adb664f521 Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/libs/utils/filepath.cpp
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/unit/unittest/CMakeLists.txt

Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
2023-03-30 13:30:42 +00:00
Marcus Tillmanns
5f65dc84f3 Terminal: Adjust default colors
Dark Terminal theme now matches normal background

Change-Id: Icdb943e78995245d7e0e55bb11754935333953dd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-28 04:37:27 +00:00
Marcus Tillmanns
9417f8b99e Terminal: Add search
* Adds new search widget to terminal
* Adds new theme color "TerminalFindMatch"
* Fixes ESC key handling in terminal

Fixes: QTCREATORBUG-28946
Change-Id: I7b6057d13902a94a6bcd41dde6cc8ba8418cd585
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-24 16:12:01 +00:00
Marcus Tillmanns
a0924caea2 Terminal: Improve light default themes
* Made Ansi 11 easier to read ( darker )
* Fixed selection color to be black with 25% opacity

Change-Id: I2380e45b9cc15732085961f21eb6e5360321a9fe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-03-24 12:29:27 +00:00
Alessandro Portale
83d40683d9 Core: Fix error text color in SearchResultWidget
Remove the CanceledSearchTextColor theme role and use TextColorError
instead.

Change-Id: I3dde538d107ecfdd9c9a3f2406f6cd26ad28c902
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-24 08:47:24 +00:00
Marcus Tillmanns
10816ecbe0 Terminal: Add default themes to Creator themes
Fixes: QTCREATORBUG-28939
Change-Id: I51ded621cdd2e87743a93853686bba09aa9aa44d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-23 13:51:58 +00:00
Henning Gruendl
79586bc1a4 QmlDesigner: Add flag to non creator themes
Add missing QDSTheme flag to non creator theme to avoid soft assert
while parsing the theme file.

Change-Id: I105d6b91046ea97bda212e506c8358890f2cee12
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-06 14:03:10 +00:00
Brook Cronin
b122030925 QmlDesigner: New themes and control styles
Change-Id: I8783d8cda6a8c0b954a58d2f65c54cdc7dfa6166
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-03 12:11:18 +00:00
Thomas Hartmann
080c8af850 Add DStoolbarBackground
Change-Id: Ied42d086af2aba2ce54b2ad9ed411feea7817416
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-31 14:05:20 +00:00
Eike Ziller
7eaa36e6e5 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
2022-09-27 10:03:37 +02:00
Brook Cronin
e28810b50c QmlDesigner: Fix Scrollbar size and colors
Task-number: QDS-7741
Change-Id: I013fcfe1c80ef637388af190d27c4954be650d86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 15:19:31 +00:00
Eike Ziller
c37e273f27 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/qmldesigner/designercore/include/qmlstate.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: Iefff97499db72727c1b8058d53b1279fd8853ad9
2022-09-20 15:43:56 +02:00
Henning Gruendl
9ffc004beb QmlDesigner: Add new states editor
* Add responsive layout algorithm for states editor
* Add support for extending states
* Drag and drop states
* Display when condition in state thumbnail
* Toggle between property changes and thumbnail
* Display PropertyChanges properties
* Make property changes removable
* Add StateGroup support
* Add toolbar

Task-number: QDS-7639
Change-Id: Iabcbb0a02f7728c29abbdc1000102582c5638eba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-19 15:52:53 +00:00
Alessandro Portale
74f5ad6583 Utils: Unify and simplify Details(Button|Widget) and ExpandButton
This replaces lots of custom painting/animating code with a simplified
implementation and cross-platform visual unification.

Task-number: QTCREATORBUG-27801
Change-Id: I18b12e8c7f0bba4ba5d8a05271ab1e757769dc5f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-12 13:43:43 +00:00
Henning Gruendl
92c786d21e QmlDesigner: Add new color values
Add DSgreenLight, DSamberLight, DSredLight colors

Task-number: QDS-6174
Change-Id: I59e745aabc8b8182c36027f875af7709f8c62060
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 11:35:28 +00:00
Henning Gruendl
ac7ed5bebe QmlDesigner: Add switch to StudioControls
* Add switch control
* Add additional color to all themes

Task-number: QDS-6146
Change-Id: I75c8aa2dc0dd75cf5b3ac1e025b05ad5110d5b9e
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-07 09:24:53 +00:00
Alessandro Portale
ccafc11fa6 Utils: Remove unused theme role TextColorHighlight
TextColorHighlight is a harsh "egineer red" #ff0000 in all themes except
one, where it is grey. Actually, TextColorHighlight was used in one
place, which now instead uses TextColorError.

Change-Id: Idcd61637edaa045fc718cf35a9d34ff1d5a64dad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-02-02 21:19:03 +00:00
Eike Ziller
be5fb98f1f Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I72684fe4b0857e52a15ee83721f9d7975582a8d2
2022-01-26 09:25:13 +01:00
Henning Gruendl
c7c7747906 QmlDesigner: Adapt theme colors to welcome screen
Change-Id: I566a692c05f9799e4f44718a426d9536d5e2b9cd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-24 16:36:05 +00:00
Alessandro Portale
196aee97b1 Welcome: Unify design with Qt Design Studio
This applies the design of the new Welcome Screen for the Qt Design
Studio to the Welcome Screen of Qt Creator.

Change-Id: Id63283da1db43ac1036d371694cc2ea4a6de8d8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-14 12:12:21 +00:00
Thomas Hartmann
d987d305ef Theming: Extend theme with color roles for WelcomePage
Change-Id: I1eb8b6231a15cdc427d6d2a08d657bd697379229
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-06 22:08:00 +00:00
Samuel Ghinet
d8c8d7a25e Update background colors in all themes other than design dark
While we have chosen lower contrast lighter values for the design dark
theme (via normalBackground and alternateBackground from Palette), the
New Project dialog box did not look well on other themes. I have
replaced the background colors for those other themes, so that
DSBackgroundColorNormal is now set to the value of
DSsectionHeadBackground, while DSBackgroundColorAlternate is set to the
value of DSpanelBackground, which makes the dialog look more like the
property editor.

Also, fixed the item delegate in NewProjectView, which had a
non-transparent background. This background was visible on light
versions of the theme.

Change-Id: Iad7dea1ea1a03839293148178dbc441c05b3fb7f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-15 14:57:09 +00:00
Samuel Ghinet
b7d0902257 Add new theme colors necessary for New Project Dialog on QDS
We need colors for the dialog box background, and for warning text messages.

Note: We currently don't have carefully picked colors for warning, so I used
standard yellow (ffff00). The values, for each theme, will need to be adjusted
later on.

Task-number: QDS-4490
Change-Id: I257522216b03610d9f12951e7cb6f7cfa182489f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-04 11:18:40 +00:00
Mahmoud Badri
72536eb155 QmlDesigner: Fix assets library theming
Also define the themeUnimportedModuleColor value in the theme files.

Fixes: QDS-4935
Change-Id: I3fc0b2316ebc1b11e4de87c09e2136e768e5cbe2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-24 18:09:23 +00:00
Henning Gruendl
db6ad528bb QmlDesigner: Implement new control design
* Update creator theme files and related enum
* Remove unused ActionIndicator functionality
* Update all controls (Colors, Positions, Sizes)
* Add global hover state and cleanup all other states
* Add global hover functionality to ButtonRow
* Add missing states
* Add new MenuItemWithIcon
* Add checkers.png for StateDelegate preview background
* Update copyright headers
* Replace AnchorButtons spacing
* Make ADS title bar buttons and tab bar buttons themeable
* Fix replace CSS colors to allow specifing alpha
* Fix replace CSS overwritting consecutive variables
* Make navigator icons and other elements themeable
* Make connection view themeable
* Make item library themeable
* Fix item library import path
* Update all HelperWidgets
* Fix GradientDialogPopup

Task-number: QDS-3768
Change-Id: I28a5fed178c95d098db052b8c2eabaa083d37b81
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-16 09:11:38 +00:00
Miikka Heikkinen
6eee8aa99d QmlDesigner: Add 3d axis colors to theme
Task-number: QDS-2404
Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-11 06:55:09 +00:00
Andre Hartmann
c9eedbe0f3 Git: Port colorful log to text colors
Fixes: QTCREATORBUG-24198
Change-Id: Icde06da5ac848fb0f7faf02a8e55fb26136f318c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-07-06 10:55:43 +00:00
Andre Hartmann
cbb70513bf Git: Allow colorful logs
Requires Git 2.3 or higher for RGB colors.

Can be enabled for the normal or graph log
with the "Color" tool button. For the diff
log, the old behavior is kept (highlighter
is used for the "normal" log, no colors at
all for the graph log)

Fixes: QTCREATORBUG-19624
Change-Id: I8a42a7ad0ebf99ceb459355310311d702dcf9977
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-05-13 14:03:46 +00:00
Brook Cronin
96cd1bffae Theme: add controls theme to creator themes and map to controls theme values
Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-30 15:43:45 +00:00
Alessandro Portale
ec5c3b59ea Improve visual contrast for toolbar items in flat/flat-dark themes
Change-Id: I0b9c25100ae4818455b830d30feb1c61bebb1788
Reviewed-by: Aaron Barany <akb825@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-01-16 14:29:10 +00:00
Aaron Barany
9eb4df7a1f Editor: Improve icon/panel selection colors
Improve the visibility and clarity for the output panel and selected icons
for dark and creator themes. This should make it easier to tell what item
is selected across each of these themes.

Task-number: QTCREATORBUG-18888
Change-Id: I4cf4203a0d5b46978d32810cc81dfcdb5ac8b3ef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-01-12 20:59:36 +00:00
Christian Stenger
8b397d6501 Theme: Fix typo
Amends c79f436e2a.

Change-Id: I211b667b50675b8fa48bdf231146ff7e406f592d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-27 09:14:45 +00:00
Morten Johan Sørvig
c79f436e2a Improve macOS dark mode support
The current theme support in Creator works well, also
in macOS dark mode. This change makes sure that the
native macOS appearance setting (for the Creator process)
and the creator theme setting are in sync.

This is required to avoid light/dark palette issues for
the light Creator themes when the desktop is configured
for dark appearance.

Add a “DarkUserInterface” flag to the creatortheme files.
This flag indicates if the theme is overall dark, with
light text on dark background.

Make setCreatorTheme() force the standard light aqua
appearance for light Creator themes.

Change-Id: I1a5c183230ab0e66641fd834df19d7e0ad1b6a53
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-24 07:50:25 +00:00
David Schulz
d4c7814e9e Utils: remove Clang from ClangCodeModel_*_TextMarkColor
They are also used by the qml code model, and may be used by additional
code models in the future.

Change-Id: If216cbeb7b77be0f3b6f31671c71d913206315cb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-05-17 05:55:53 +00:00
Thomas Hartmann
5c8c208f26 QmlDesigner: Add a couple of new theme colors
Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-17 10:34:13 +00:00
Alessandro Portale
98e26dc6fb QmlDesigner: Remove programmatical derivation of theme colors
The Qt Quick Designer synthesized a few theme colors from existing theme
colors. That was in order to prevent the need for 6 theme colors being
defined in every theme. It turned out, however, that being able to
define these if favorable.

Todo in follow-up commit: remove QmlDesigner::Theme::qmlDesigner...()
functions, and fix up the qml, accordingly.

Change-Id: Ica85df5472cd7b9da8bf215eb6dbdcf608a4fb2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-05 10:41:12 +00:00
Christian Stenger
f350018999 Welcome: Prohibit rename and delete of default session
Task-number: QTCREATORBUG-19642
Change-Id: I97d9fa84aad510fd8c2d95d3324f77fbcae4e9d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-20 19:39:06 +00:00
Orgad Shaneh
91c50e797b Themes: Fix gradient color in Projects mode
Change-Id: Ic8187fa3a04e76111afa231f993b115933cd3ac5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-01-05 14:53:59 +00:00
Orgad Shaneh
add1bdf43f Theme: Fix parsing of colors without alpha
Use QColor(const QString &) ctor instead of manual parsing.

Uncovered by a19005fc38 which made the
locator highlighting black.

Change-Id: Ic11483613510e3cf97eede396e9b7d53bbc3ff61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-05 09:03:10 +00:00
Serhii Moroz
6ecb1c4018 Locator: Add highlighting of the search text
Change-Id: Ia166e9667076e46770a754b626ceb28080139e79
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-21 12:31:46 +00:00