From f3500189999146f85ae6373226099849c2298bd8 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 8 Feb 2018 08:53:06 +0100 Subject: [PATCH] Welcome: Prohibit rename and delete of default session Task-number: QTCREATORBUG-19642 Change-Id: I97d9fa84aad510fd8c2d95d3324f77fbcae4e9d5 Reviewed-by: Christian Stenger Reviewed-by: Alessandro Portale --- share/qtcreator/themes/dark.creatortheme | 1 + share/qtcreator/themes/default.creatortheme | 1 + share/qtcreator/themes/flat-dark.creatortheme | 1 + share/qtcreator/themes/flat-light.creatortheme | 1 + share/qtcreator/themes/flat.creatortheme | 1 + src/libs/utils/theme/theme.h | 1 + src/plugins/projectexplorer/projectwelcomepage.cpp | 6 ++++-- 7 files changed, 10 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 545d662548c..6b16c8a8917 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -162,6 +162,7 @@ Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ff555555 Welcome_HoverColor=ff444444 Welcome_LinkColor=ff78bb39 +Welcome_DisabledLinkColor=textDisabled Timeline_TextColor=text Timeline_BackgroundColor1=normalBackground diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index e93d682b9f7..c5cf6b9c23a 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -154,6 +154,7 @@ Welcome_ButtonBackgroundColor=ffdfdfdf Welcome_DividerColor=ffd6d6d6 Welcome_HoverColor=ffe8e8e8 Welcome_LinkColor=ff5caa15 +Welcome_DisabledLinkColor=textDisabled Timeline_TextColor=darkText Timeline_BackgroundColor1=ffffffff diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index f966634f53f..f433bcb0988 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -167,6 +167,7 @@ Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ff555555 Welcome_HoverColor=ff444444 Welcome_LinkColor=ff7fc63c +Welcome_DisabledLinkColor=textDisabled Timeline_TextColor=text Timeline_BackgroundColor1=normalBackground diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 3946b312ddb..1975996d23b 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -165,6 +165,7 @@ Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ffd6d6d6 Welcome_HoverColor=fff6f6f6 Welcome_LinkColor=ff5caa15 +Welcome_DisabledLinkColor=textDisabled Timeline_TextColor=text Timeline_BackgroundColor1=normalBackground diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 29226c044d2..d6864c5abdd 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -163,6 +163,7 @@ Welcome_ButtonBackgroundColor=normalBackground Welcome_DividerColor=ffd6d6d6 Welcome_HoverColor=fff6f6f6 Welcome_LinkColor=ff5caa15 +Welcome_DisabledLinkColor=textDisabled Timeline_TextColor=text Timeline_BackgroundColor1=normalBackground diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index ea69e2fae76..26e90981583 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -252,6 +252,7 @@ public: Welcome_DividerColor, Welcome_LinkColor, Welcome_HoverColor, + Welcome_DisabledLinkColor, /* Timeline Library */ Timeline_TextColor, diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 141f6e55a3a..32840684cf5 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -336,8 +336,9 @@ public: const QString &action = actions.at(i); const int ww = fm.width(action); const QRect actionRect(xx, yy - 10, ww, 15); - const bool isActive = actionRect.contains(mousePos); - painter->setPen(linkColor); + const bool isForcedDisabled = (i != 0 && sessionName == "default"); + const bool isActive = actionRect.contains(mousePos) && !isForcedDisabled; + painter->setPen(isForcedDisabled ? disabledLinkColor : linkColor); painter->setFont(sizedFont(12, option.widget, isActive)); painter->drawText(xx, yy, action); if (i < 2) { @@ -404,6 +405,7 @@ private: const QColor hoverColor = themeColor(Theme::Welcome_HoverColor); const QColor textColor = themeColor(Theme::Welcome_TextColor); const QColor linkColor = themeColor(Theme::Welcome_LinkColor); + const QColor disabledLinkColor = themeColor(Theme::Welcome_DisabledLinkColor); const QColor backgroundColor = themeColor(Theme::Welcome_BackgroundColor); const QColor foregroundColor1 = themeColor(Theme::Welcome_ForegroundPrimaryColor); // light-ish. const QColor foregroundColor2 = themeColor(Theme::Welcome_ForegroundSecondaryColor); // blacker.