diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-18 10:41:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-18 15:40:00 +0000 |
| commit | 61b772e0e318e7fd178c6da4e19998a3e8bcca09 (patch) | |
| tree | 4bee681b2d4bd1ca2d827b3c32715053c10bd682 /share | |
| parent | 368a718d3dac45567ce4f130bb9c85590e3a8302 (diff) | |
| download | qt-creator-61b772e0e318e7fd178c6da4e19998a3e8bcca09.tar.gz | |
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>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 1 | ||||
| -rw-r--r-- | share/qtcreator/themes/default.creatortheme | 7 | ||||
| -rw-r--r-- | share/qtcreator/themes/defaultflat.creatortheme | 3 | ||||
| -rw-r--r-- | share/qtcreator/welcomescreen/welcomescreen.qml | 2 | ||||
| -rw-r--r-- | share/qtcreator/welcomescreen/widgets/Button.qml | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index bc85e00676..2aeeabb8e3 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -139,6 +139,7 @@ Welcome_TextColor=text Welcome_ForegroundPrimaryColor=ff999999 Welcome_ForegroundSecondaryColor=ff808080 Welcome_BackgroundColor=normalBackground +Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ff555555 Welcome_HoverColor=ff444444 Welcome_LinkColor=ff5caa15 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index bd4329a772..0bca7e2dc1 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -130,11 +130,12 @@ Debugger_WatchItem_ValueChanged=ffc80000 Debugger_Breakpoint_TextMarkColor=ffff4040 Welcome_TextColor=ff000000 -Welcome_ForegroundPrimaryColor=ff404244 +Welcome_ForegroundPrimaryColor=ff555759 Welcome_ForegroundSecondaryColor=ff727476 -Welcome_BackgroundColor=ffffffff +Welcome_BackgroundColor=fff8f8f8 +Welcome_ButtonBackgroundColor=ffdfdfdf Welcome_DividerColor=ffd6d6d6 -Welcome_HoverColor=fff6f6f6 +Welcome_HoverColor=ffe8e8e8 Welcome_LinkColor=ff5caa15 VcsBase_FileStatusUnknown_TextColor=ff000000 diff --git a/share/qtcreator/themes/defaultflat.creatortheme b/share/qtcreator/themes/defaultflat.creatortheme index 38ca69ce86..a3899aed89 100644 --- a/share/qtcreator/themes/defaultflat.creatortheme +++ b/share/qtcreator/themes/defaultflat.creatortheme @@ -140,7 +140,8 @@ Debugger_Breakpoint_TextMarkColor=ffff4040 Welcome_TextColor=ff000000 Welcome_ForegroundPrimaryColor=ff404244 Welcome_ForegroundSecondaryColor=ff727476 -Welcome_BackgroundColor=ffffffff +Welcome_BackgroundColor=normalBackground +Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ffd6d6d6 Welcome_HoverColor=fff6f6f6 Welcome_LinkColor=ff5caa15 diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml index 1f42f24a98..62f3ccee54 100644 --- a/share/qtcreator/welcomescreen/welcomescreen.qml +++ b/share/qtcreator/welcomescreen/welcomescreen.qml @@ -62,6 +62,6 @@ Item { anchors.right: parent.right anchors.bottom: parent.bottom - color: creatorTheme.BackgroundColorNormal + color: creatorTheme.Welcome_BackgroundColor } } diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml index ca5f0b820f..75dca22d35 100644 --- a/share/qtcreator/welcomescreen/widgets/Button.qml +++ b/share/qtcreator/welcomescreen/widgets/Button.qml @@ -59,11 +59,12 @@ Button { ? creatorTheme.Welcome_ForegroundPrimaryColor : (button.hovered ? creatorTheme.Welcome_HoverColor - : creatorTheme.Welcome_BackgroundColor) + : creatorTheme.Welcome_ButtonBackgroundColor) border.width: 1 border.color: (button.checked || button.pressed) ? creatorTheme.Welcome_ForegroundPrimaryColor : creatorTheme.Welcome_ForegroundSecondaryColor + radius: (creatorTheme.WidgetStyle === 'StyleFlat') ? 0 : 4 } } |