Commit Graph

196 Commits

Author SHA1 Message Date
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
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02: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
Ali Kianian
a98c6583be QmlDesigner: Modify the style of slider for panelwidgets
Task-number: QDS-9134
Change-Id: Ie1a6ab94a546247e0cdd35798fc8085be005d13c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-21 15:41:58 +00:00
Brook Cronin
8925776620 QmlDesigner: Adapt push button icons to widget style
Change-Id: I755700ff345853d51c1cdc49d1da7bc223ac0601
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-20 16:23:23 +00:00
Brook Cronin
b35d02f0d9 QmlDesigner: Minor style adjustments
Change-Id: Ieafb8c16aed985847ed1dd66a8ace05c955601d6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-10 08:47:14 +00:00
Brook Cronin
c2af166e2a QmlDesigner: fix state controls highlight and selection
Change-Id: I4101c6cd2d9028579bdae3710f36e6a3e254b53d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-10 08:46:38 +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
770463877c QmlDesigner: Fix designer theme
Change-Id: I2585acd1105390287eac1b0a0729c08321cce298
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 14:36:32 +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
Thomas Hartmann
724eb54387 Add QDSTheme to theming and use it in ManhattanStyle
Change-Id: If3f634cd96665150b27605eaf7a2a5d4ea7078b6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 12:41:07 +00:00
Eike Ziller
33a33612c8 Theme 'dark': Use accent color on macOS
Fixes: QTCREATORBUG-28374
Change-Id: Ifb7fa83c8afc1be0a919c775f7d04e229f146438
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-11 13:52:49 +00:00
Orgad Shaneh
ac28843c3a Themes: Use lighter link colors in dark themes
Fixes: QTCREATORBUG-28152
Change-Id: Id387d20373a3e19a36af9ec8f8c44798e1008ed1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-17 16:21:43 +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
Thomas Hartmann
234cdd1255 QmlDesigner: Fix design themes for alternating rows
We use the same color for base and alternativeBase, which has the
same effect as setting setAlternatingRowColors to false.

Task-number: QDS-6245
Change-Id: I1308b70790227327808d042f5b2626dd92db19ef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-10 10:20:48 +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
Eike Ziller
501b6eff9c Merge remote-tracking branch 'origin/6.0'
Change-Id: Id84183d2ba73dbe98700af43074cc2d05b26f06d
2022-01-10 09:47:11 +01: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
Eike Ziller
d62d0f305b Merge remote-tracking branch 'origin/6.0'
Change-Id: I71b19dd8ecd96a7a2a58622f68283b8635264e48
2021-12-01 09:24:05 +01:00
Mahmoud Badri
53ffd806aa QmlDesigner: Remove faulty blue color behind docking widgets tabs
Fixes: QDS-5653
Change-Id: I71bc6267b1e40016fbcacc7ae4d6b21b76c8d701
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-11-30 13:14:38 +00:00
Eike Ziller
eba4115b82 Merge remote-tracking branch 'origin/6.0'
Change-Id: I3bab4e31bc5993c59c7025ebde0846bf6c75810e
2021-11-19 10:44:15 +01: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
Eike Ziller
3e83122888 Themes: Do not force Fusion style, use macOS dark mode instead
We forced Fusion style on all platforms if the theme was a dark one, so
the dark appearance would be handled correctly even if the "native"
QStyle didn't.

On macOS, use the system's dark mode instead, which handles window
decoration correctly and uses native controls. Switching the QStyle also
messed up things like labels of standard buttons.

Remove the hardcoded "Fusion" style from all themes and set the
preferred style to Fusion automatically on Windows and Linux if the
theme states a DarkUserInterface and no PreferredStyles is set.

Fixes: QTCREATORBUG-22477
Change-Id: I91c9143a8703fcec7aa08201de9fc33d1799196d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-11-01 07:54:04 +00:00
Samuel Ghinet
df8b62c6fa 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: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-14 12:32:29 +00:00
Alessandro Portale
a0a979a0ad Utils: Fix placeholder text color for dark themes (Qt6)
Qt 6 changed the color for QPalette::PlaceholderText to a hardcoded argb
value in qt_fusionPalette(), which does not work well with dark themes.

This change restores the rgb values for QPalette::PlaceholderText from
Qt 5 for Qt Creator's dark themes.

Task-number: QTCREATORBUG-25444
Change-Id: I197d367ac6e35085a093abfee07467291010e3ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-08-30 14:24:18 +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
d6f717d0f8 QmlDesigner: Fix blocked/disabled state colors
* Fix color controlsBackgroundDisabled color in light themes
* Fix color value in RealSpinBoxIndicator state disabled
* Remove opacity change in AnchorButtons on enabling/disabling

Task-number: QDS-4692
Change-Id: I9adb28f54b8016bfffdd28f022fc746c629afe9f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-07-08 17:58:31 +00:00
Henning Gruendl
f0983a08c9 QmlDesigner: Replace CSS color role
* Replace color role in CSS
* Add hover and focus state in CSS
* Fix hex color value in creator themes

Change-Id: I59626f369e2c02089f22bd51557d8226e2dc3631
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 17:18:31 +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
Mahmoud Badri
58b3afa728 QmlDesigner: Clean up flow tags remainings
Remove the remaining unused code related to flow tags. Flow tags feature
was removed as part of the new item library ui commit:
151184a609

Change-Id: Ic2f518cb7d345d4f5a183194bebb29c76b227c15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-02-23 14:01:47 +00:00
Alessandro Portale
19f2ed05d7 Dark Themes: Set the color for PaletteMid explicitly
Apparently, on macOS, the value of QPalette::Mid is set in a different
way than on the other OSes. Let's set it explicitly to ensure the same
painting of wigdets with dark themes.

The value PaletteMid=ffa0a0a0 was determined by manual trial and error,
to ensure that it does not change anything on non-macOS.

Fixes: QDS-3281
Change-Id: I7c044d3b41116e50b2c8a676f30a3b26019ad627
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-08 16:47:40 +00:00
Thomas Hartmann
43b5b6fe4b Define PaletteMid explicitly
Since QTCREATORBUG-23505 we use QPalette::Mid for CheckBox
and some other control. The value of QPalette::Mid depends
on the system.
On macOS this created issues with contrast see: QDS-3281

Task-number: QDS-3281
Change-Id: Ic6f83703d16778732992df6bbde50a235306d7c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-08 15:49:59 +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