From 748c4ac57fe17469503dfb746c7632e1a8afdafe Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 14 Mar 2016 16:17:30 +0100 Subject: [PATCH] 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 Reviewed-by: Alessandro Portale --- share/qtcreator/themes/dark.creatortheme | 26 +- share/qtcreator/themes/darkframe.creatortheme | 24 +- share/qtcreator/themes/default.creatortheme | 26 +- share/qtcreator/welcomescreen/develop.qml | 70 ++--- share/qtcreator/welcomescreen/examples.qml | 1 - .../welcomescreen/widgets/Button.qml | 100 ++---- .../welcomescreen/widgets/CustomTab.qml | 51 ---- .../welcomescreen/widgets/Delegate.qml | 37 +-- .../welcomescreen/widgets/IconAndLink.qml | 27 +- .../welcomescreen/widgets/LeftSideBar.qml | 51 ---- .../welcomescreen/widgets/LinkedText.qml | 106 ------- .../welcomescreen/widgets/LinksBar.qml | 146 --------- .../welcomescreen/widgets/PageCaption.qml | 54 ---- .../welcomescreen/widgets/PageLoader.qml | 1 - .../welcomescreen/widgets/ProjectItem.qml | 62 ++-- .../welcomescreen/widgets/RecentProjects.qml | 9 +- .../welcomescreen/widgets/SearchBar.qml | 11 +- .../{Logo.qml => SessionActionLabel.qml} | 27 +- .../welcomescreen/widgets/SessionItem.qml | 194 +++++------- .../welcomescreen/widgets/Sessions.qml | 5 +- .../welcomescreen/widgets/SideBar.qml | 133 +++----- .../welcomescreen/widgets/ToolTip.qml | 16 +- .../welcomescreen/widgets/images/arrowBig.png | Bin 213 -> 0 bytes .../widgets/images/arrow_down.png | Bin 148 -> 0 bytes .../widgets/images/arrow_down@2x.png | Bin 174 -> 0 bytes .../welcomescreen/widgets/images/arrow_up.png | Bin 146 -> 0 bytes .../widgets/images/arrow_up@2x.png | Bin 174 -> 0 bytes .../widgets/images/background.png | Bin 142 -> 0 bytes .../welcomescreen/widgets/images/bullet.png | Bin 88 -> 0 bytes .../widgets/images/icons/blogs.png | Bin 1588 -> 0 bytes .../widgets/images/icons/clone.png | Bin 207 -> 0 bytes .../widgets/images/icons/clone@2x.png | Bin 306 -> 0 bytes .../widgets/images/icons/delete.png | Bin 243 -> 0 bytes .../widgets/images/icons/delete@2x.png | Bin 367 -> 0 bytes .../widgets/images/icons/onlineCommunity.png | Bin 1145 -> 0 bytes .../widgets/images/icons/qt_account.png | Bin 540 -> 0 bytes .../widgets/images/icons/qt_cloud.png | Bin 527 -> 0 bytes .../widgets/images/icons/rename.png | Bin 288 -> 0 bytes .../widgets/images/icons/rename@2x.png | Bin 462 -> 0 bytes .../widgets/images/icons/userGuide.png | Bin 1562 -> 0 bytes .../welcomescreen/widgets/images/info.png | Bin 206 -> 0 bytes .../welcomescreen/widgets/images/info@2x.png | Bin 304 -> 0 bytes .../welcomescreen/widgets/images/more.png | Bin 198 -> 0 bytes .../welcomescreen/widgets/images/new.png | Bin 4714 -> 0 bytes .../welcomescreen/widgets/images/open.png | Bin 3202 -> 0 bytes .../welcomescreen/widgets/images/project.png | Bin 662 -> 0 bytes .../widgets/images/project@2x.png | Bin 1420 -> 0 bytes .../widgets/images/qtcreator.png | Bin 1953 -> 0 bytes .../welcomescreen/widgets/images/sessions.png | Bin 1645 -> 0 bytes .../welcomescreen/widgets/images/tab.png | Bin 200 -> 0 bytes src/libs/utils/theme/theme.h | 28 +- src/plugins/welcome/images/blogs.png | Bin 0 -> 252 bytes src/plugins/welcome/images/blogs@2x.png | Bin 0 -> 458 bytes src/plugins/welcome/images/community.png | Bin 0 -> 116 bytes src/plugins/welcome/images/community@2x.png | Bin 0 -> 167 bytes src/plugins/welcome/images/expandarrow.png | Bin 0 -> 106 bytes src/plugins/welcome/images/expandarrow@2x.png | Bin 0 -> 148 bytes src/plugins/welcome/images/new.png | Bin 0 -> 92 bytes src/plugins/welcome/images/new@2x.png | Bin 0 -> 95 bytes src/plugins/welcome/images/open.png | Bin 0 -> 127 bytes src/plugins/welcome/images/open@2x.png | Bin 0 -> 182 bytes src/plugins/welcome/images/project.png | Bin 0 -> 106 bytes src/plugins/welcome/images/project@2x.png | Bin 0 -> 112 bytes src/plugins/welcome/images/qtaccount.png | Bin 0 -> 177 bytes src/plugins/welcome/images/qtaccount@2x.png | Bin 0 -> 300 bytes src/plugins/welcome/images/session.png | Bin 0 -> 118 bytes src/plugins/welcome/images/session@2x.png | Bin 0 -> 161 bytes src/plugins/welcome/images/userguide.png | Bin 0 -> 235 bytes src/plugins/welcome/images/userguide@2x.png | Bin 0 -> 457 bytes src/plugins/welcome/welcome.qrc | 19 ++ src/plugins/welcome/welcomeplugin.cpp | 40 +++ src/tools/icons/qtcreatoricons.svg | 285 +++++++++++------- 72 files changed, 513 insertions(+), 1036 deletions(-) delete mode 100644 share/qtcreator/welcomescreen/widgets/CustomTab.qml delete mode 100644 share/qtcreator/welcomescreen/widgets/LeftSideBar.qml delete mode 100644 share/qtcreator/welcomescreen/widgets/LinkedText.qml delete mode 100644 share/qtcreator/welcomescreen/widgets/LinksBar.qml delete mode 100644 share/qtcreator/welcomescreen/widgets/PageCaption.qml rename share/qtcreator/welcomescreen/widgets/{Logo.qml => SessionActionLabel.qml} (77%) delete mode 100644 share/qtcreator/welcomescreen/widgets/images/arrowBig.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/arrow_down.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/arrow_down@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/arrow_up.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/arrow_up@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/background.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/bullet.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/blogs.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/clone.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/clone@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/delete.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/delete@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/onlineCommunity.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/qt_account.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/qt_cloud.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/rename.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/rename@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/icons/userGuide.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/info.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/info@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/more.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/new.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/open.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/project.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/project@2x.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/qtcreator.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/sessions.png delete mode 100644 share/qtcreator/welcomescreen/widgets/images/tab.png create mode 100644 src/plugins/welcome/images/blogs.png create mode 100644 src/plugins/welcome/images/blogs@2x.png create mode 100644 src/plugins/welcome/images/community.png create mode 100644 src/plugins/welcome/images/community@2x.png create mode 100644 src/plugins/welcome/images/expandarrow.png create mode 100644 src/plugins/welcome/images/expandarrow@2x.png create mode 100644 src/plugins/welcome/images/new.png create mode 100644 src/plugins/welcome/images/new@2x.png create mode 100644 src/plugins/welcome/images/open.png create mode 100644 src/plugins/welcome/images/open@2x.png create mode 100644 src/plugins/welcome/images/project.png create mode 100644 src/plugins/welcome/images/project@2x.png create mode 100644 src/plugins/welcome/images/qtaccount.png create mode 100644 src/plugins/welcome/images/qtaccount@2x.png create mode 100644 src/plugins/welcome/images/session.png create mode 100644 src/plugins/welcome/images/session@2x.png create mode 100644 src/plugins/welcome/images/userguide.png create mode 100644 src/plugins/welcome/images/userguide@2x.png diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 339b2f2d2ad..60ab5492723 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -135,25 +135,13 @@ Debugger_WatchItem_ValueChanged=ffbf0303 Debugger_Breakpoint_TextMarkColor=ffff4040 -Welcome_BackgroundColorNormal=normalBackground -Welcome_Button_BorderColorNormal=0 -Welcome_Button_BorderColorPressed=0 -Welcome_Button_TextColorNormal=ffe7e7e7 -Welcome_Button_TextColorPressed=ffffffff -Welcome_Caption_TextColorNormal=ff4acb47 -Welcome_DividerColor=ff232323 -Welcome_Link_BackgroundColor=ff333333 -Welcome_Link_TextColorActive=fff0f0f0 -Welcome_Link_TextColorNormal=text -Welcome_ProjectItem_BackgroundColorHover=0 -Welcome_ProjectItem_TextColorFilepath=textDisabled -Welcome_SessionItemExpanded_BackgroundColorHover=hoverBackground -Welcome_SessionItemExpanded_BackgroundColorNormal=selectedBackground -Welcome_SessionItem_BackgroundColorHover=hoverBackground -Welcome_SessionItem_BackgroundColorNormal=0 -Welcome_SideBar_BackgroundColor=ff434343 -Welcome_TextColorHeading=text -Welcome_TextColorNormal=text +Welcome_TextColor=text +Welcome_ForegroundPrimaryColor=ff999999 +Welcome_ForegroundSecondaryColor=ff808080 +Welcome_BackgroundColor=normalBackground +Welcome_DividerColor=ff555555 +Welcome_HoverColor=ff444444 +Welcome_LinkColor=ff5caa15 VcsBase_FileStatusUnknown_TextColor=text VcsBase_FileAdded_TextColor=ff00ff00 diff --git a/share/qtcreator/themes/darkframe.creatortheme b/share/qtcreator/themes/darkframe.creatortheme index 649877b7343..129f7f9fcb9 100644 --- a/share/qtcreator/themes/darkframe.creatortheme +++ b/share/qtcreator/themes/darkframe.creatortheme @@ -137,25 +137,13 @@ Debugger_WatchItem_ValueChanged=ffbf0303 Debugger_Breakpoint_TextMarkColor=ffff4040 -Welcome_BackgroundColorNormal=normalBackground -Welcome_Button_BorderColorNormal=ff727476 -Welcome_Button_BorderColorPressed=ff727476 -Welcome_Button_TextColorNormal=text -Welcome_Button_TextColorPressed=text -Welcome_Caption_TextColorNormal=text +Welcome_TextColor=ff000000 +Welcome_ForegroundPrimaryColor=ff404244 +Welcome_ForegroundSecondaryColor=ff727476 +Welcome_BackgroundColor=ffffffff Welcome_DividerColor=ffd6d6d6 -Welcome_Link_BackgroundColor=normalBackground -Welcome_Link_TextColorActive=text -Welcome_Link_TextColorNormal=text -Welcome_ProjectItem_BackgroundColorHover=ffd2d4d6 -Welcome_ProjectItem_TextColorFilepath=textDisabled -Welcome_SessionItemExpanded_BackgroundColorHover=hoverBackground -Welcome_SessionItemExpanded_BackgroundColorNormal=selectedBackground -Welcome_SessionItem_BackgroundColorHover=hoverBackground -Welcome_SessionItem_BackgroundColorNormal=normalBackground -Welcome_SideBar_BackgroundColor=normalBackground -Welcome_TextColorHeading=text -Welcome_TextColorNormal=text +Welcome_HoverColor=fff6f6f6 +Welcome_LinkColor=ff5caa15 VcsBase_FileStatusUnknown_TextColor=ff000000 VcsBase_FileAdded_TextColor=ff00aa00 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index ac9513e0442..f12ed4a3a71 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -129,25 +129,13 @@ Debugger_WatchItem_ValueChanged=ffc80000 Debugger_Breakpoint_TextMarkColor=ffff4040 -Welcome_BackgroundColorNormal=ffffffff -Welcome_Button_BorderColorNormal=ff737373 -Welcome_Button_BorderColorPressed=ff333333 -Welcome_Button_TextColorNormal=ff000000 -Welcome_Button_TextColorPressed=ffc0c0c0 -Welcome_Caption_TextColorNormal=ff328930 -Welcome_DividerColor=ff737373 -Welcome_Link_BackgroundColor=ff909090 -Welcome_Link_TextColorActive=fff0f0f0 -Welcome_Link_TextColorNormal=ff328930 -Welcome_ProjectItem_BackgroundColorHover=fff9f9f9 -Welcome_ProjectItem_TextColorFilepath=ff6b6b6b -Welcome_SessionItemExpanded_BackgroundColorHover=ffe9e9e9 -Welcome_SessionItemExpanded_BackgroundColorNormal=fff1f1f1 -Welcome_SessionItem_BackgroundColorHover=fff9f9f9 -Welcome_SessionItem_BackgroundColorNormal=19f9f9f9 -Welcome_SideBar_BackgroundColor=ffebebeb -Welcome_TextColorHeading=ff535353 -Welcome_TextColorNormal=ff000000 +Welcome_TextColor=ff000000 +Welcome_ForegroundPrimaryColor=ff404244 +Welcome_ForegroundSecondaryColor=ff727476 +Welcome_BackgroundColor=ffffffff +Welcome_DividerColor=ffd6d6d6 +Welcome_HoverColor=fff6f6f6 +Welcome_LinkColor=ff5caa15 VcsBase_FileStatusUnknown_TextColor=ff000000 VcsBase_FileAdded_TextColor=ff00aa00 diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml index e865fc8c17d..a226b83f855 100644 --- a/share/qtcreator/welcomescreen/develop.qml +++ b/share/qtcreator/welcomescreen/develop.qml @@ -25,12 +25,14 @@ import QtQuick 2.1 import widgets 1.0 -import QtQuick.Controls 1.2 as Controls +import QtQuick.Controls 1.0 as Controls Controls.ScrollView { id: rectangle1 + readonly property int buttonWidth: 190 + readonly property int titleY: 50 Item { id: canvas @@ -40,90 +42,68 @@ Controls.ScrollView { Button { y: screenDependHeightDistance + width: buttonWidth text: qsTr("New Project") anchors.left: sessionsTitle.left onClicked: projectWelcomePage.newProject(); - iconSource: "widgets/images/new.png" - + iconSource: "image://icons/new/" + + ((checked || pressed) + ? "Welcome_DividerColor" + : "Welcome_ForegroundSecondaryColor") } Button { y: screenDependHeightDistance + width: buttonWidth text: qsTr("Open Project") anchors.left: recentProjectsTitle.left onClicked: projectWelcomePage.openProject(); - iconSource: "widgets/images/open.png" + iconSource: "image://icons/open/" + + ((checked || pressed) + ? "Welcome_DividerColor" + : "Welcome_ForegroundSecondaryColor") } NativeText { id: sessionsTitle x: 32 - y: screenDependHeightDistance + 77 + y: screenDependHeightDistance + titleY - color: creatorTheme.Welcome_TextColorHeading + color: creatorTheme.Welcome_TextColor text: qsTr("Sessions") font.pixelSize: 16 font.family: "Helvetica" - font.bold: true } NativeText { id: recentProjectsTitle x: 406 - y: screenDependHeightDistance + 77 - color: creatorTheme.Welcome_TextColorHeading + y: screenDependHeightDistance + titleY + color: creatorTheme.Welcome_TextColor text: qsTr("Recent Projects") anchors.left: sessionsTitle.right anchors.leftMargin: 280 - font.bold: true font.family: "Helvetica" font.pixelSize: 16 } - RecentProjects { - x: screenDependLeftMargin - - id: recentProjects - - anchors.leftMargin: 12 - anchors.left: recentProjectsTitle.left - - anchors.top: recentProjectsTitle.bottom - anchors.topMargin: 20 - - model: projectList - } - - Item { - id: actions - x: pageCaption.x + pageCaption.textOffset - - y: screenDependHeightDistance + 244 - width: 140 - height: 70 - - anchors.topMargin: 42 - anchors.top: sessions.bottom - } - - Sessions { - id: sessions - - x: 96 - y: 144 - width: 274 - - anchors.leftMargin: 12 anchors.left: sessionsTitle.left anchors.right: recentProjectsTitle.left - anchors.rightMargin: 40 anchors.top: sessionsTitle.bottom anchors.topMargin: 20 model: sessionList } + + RecentProjects { + anchors.left: recentProjectsTitle.left + anchors.top: recentProjectsTitle.bottom + anchors.topMargin: 20 + + model: projectList + } } } diff --git a/share/qtcreator/welcomescreen/examples.qml b/share/qtcreator/welcomescreen/examples.qml index 643f3727a54..063a1f5a49b 100644 --- a/share/qtcreator/welcomescreen/examples.qml +++ b/share/qtcreator/welcomescreen/examples.qml @@ -41,7 +41,6 @@ Item { model: exampleSetModel textRole: "text" - onCurrentIndexChanged: { if (comboBox.model === undefined) return; diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml index c7be8574e04..ca5f0b820f6 100644 --- a/share/qtcreator/welcomescreen/widgets/Button.qml +++ b/share/qtcreator/welcomescreen/widgets/Button.qml @@ -38,93 +38,47 @@ Button { padding.right: 14 background: Item { anchors.fill: parent + implicitWidth: 160 + implicitHeight: 30 Image { id: icon + x: 11 + y: 8 z: 1 - x: 4 - y: -6 - width: 32 - height: 32 + height: 16 + width: 16 source: button.iconSource visible: button.iconSource != "" } - implicitWidth: 160 - implicitHeight: 30 - Rectangle { + id: rectangle anchors.fill: parent - antialiasing: true - radius: (creatorTheme.WidgetStyle === 'StyleFlat') ? 0 : 3 - - visible: !(button.pressed || button.checked) - - gradient: Gradient { - GradientStop { - position: 0 - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#232323" : "#f9f9f9" - } - - GradientStop { - position: 0.49 - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#232323" : "#f9f9f9" - } - - GradientStop { - position: 0.5 - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#232323" : "#eeeeee" - } - - GradientStop { - position: 1 - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#232323" : "#eeeeee" - } - } - border.color: creatorTheme.Welcome_Button_BorderColorNormal - } - - Rectangle { - anchors.fill: parent - antialiasing: true - radius: (creatorTheme.WidgetStyle === 'StyleFlat') ? 0 : 3 - - visible: button.pressed || button.checked - - gradient: Gradient { - GradientStop { - position: 0.00; - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#151515" : "#4c4c4c" - } - GradientStop { - position: 0.49; - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#151515" : "#4c4c4c" - } - GradientStop { - position: 0.50; - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#151515" : "#424242" - } - GradientStop { - position: 1.00; - color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#151515" : "#424242" - } - } - border.color: creatorTheme.Welcome_Button_BorderColorPressed - + color: (button.checked || button.pressed) + ? creatorTheme.Welcome_ForegroundPrimaryColor + : (button.hovered + ? creatorTheme.Welcome_HoverColor + : creatorTheme.Welcome_BackgroundColor) + border.width: 1 + border.color: (button.checked || button.pressed) + ? creatorTheme.Welcome_ForegroundPrimaryColor + : creatorTheme.Welcome_ForegroundSecondaryColor } } label: Text { - renderType: Text.NativeRendering - verticalAlignment: Text.AlignVCenter - text: button.text - color: button.pressed || button.checked - ? creatorTheme.Welcome_Button_TextColorPressed - : creatorTheme.Welcome_Button_TextColorNormal - font.pixelSize: 15 - font.bold: false - smooth: true - } + id: text + renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter + text: button.text + color: (button.checked || button.pressed) + ? creatorTheme.Welcome_BackgroundColor + : creatorTheme.Welcome_TextColor + font.pixelSize: 15 + font.bold: false + smooth: true + } } } } diff --git a/share/qtcreator/welcomescreen/widgets/CustomTab.qml b/share/qtcreator/welcomescreen/widgets/CustomTab.qml deleted file mode 100644 index 823d8a19405..00000000000 --- a/share/qtcreator/welcomescreen/widgets/CustomTab.qml +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.1 - -Row { - id: customTab - property alias model: repeater.model - spacing: 24 - - signal itemChanged - property int currentIndex: 0 - - onCurrentIndexChanged: welcomeMode.activePlugin = currentIndex - Component.onCompleted: currentIndex = welcomeMode.activePlugin - - Repeater { - id: repeater - - LinkedText { - text: title - active: customTab.currentIndex === index - - onClicked: { - customTab.currentIndex = index - } - } - } -} diff --git a/share/qtcreator/welcomescreen/widgets/Delegate.qml b/share/qtcreator/welcomescreen/widgets/Delegate.qml index 9cf1d28586c..f3ce5b5b657 100644 --- a/share/qtcreator/welcomescreen/widgets/Delegate.qml +++ b/share/qtcreator/welcomescreen/widgets/Delegate.qml @@ -29,7 +29,7 @@ Rectangle { id: delegate height: 240 width: 216 - color: creatorTheme.Welcome_BackgroundColorNormal + color: creatorTheme.Welcome_BackgroundColor property alias caption: captionItem.text property alias imageSource: imageItem.source @@ -102,7 +102,7 @@ Rectangle { y: 161 width: 200 height: 69 - color: creatorTheme.Welcome_BackgroundColorNormal + color: creatorTheme.Welcome_BackgroundColor anchors.bottom: parent.bottom anchors.right: parent.right anchors.left: parent.left @@ -112,7 +112,7 @@ Rectangle { id: captionItem x: 16 y: 170 - color: creatorTheme.Welcome_Caption_TextColorNormal + color: creatorTheme.Welcome_TextColor text: qsTr("2D PAINTING EXAMPLE long description") elide: Text.ElideRight anchors.right: parent.right @@ -127,7 +127,7 @@ Rectangle { NativeText { id: descriptionItem height: 43 - color: "#7e7e7e" + color: creatorTheme.Welcome_ForegroundPrimaryColor text: qsTr("The 2D Painting example shows how QPainter and QGLWidget work together.") anchors.top: captionItem.bottom anchors.topMargin: 10 @@ -159,7 +159,7 @@ Rectangle { x: 16 y: 198 text: qsTr("Tags:") - color: creatorTheme.Welcome_TextColorNormal + color: creatorTheme.Welcome_ForegroundSecondaryColor smooth: true font.italic: false font.pixelSize: 11 @@ -187,7 +187,7 @@ Rectangle { Rectangle { id: border color: "#00000000" - radius: 6 + radius: creatorTheme.WidgetStyle === 'StyleFlat' ? 0 : 6 anchors.rightMargin: 4 anchors.leftMargin: 4 anchors.bottomMargin: 4 @@ -268,11 +268,6 @@ Rectangle { target: border visible: true } - - PropertyChanges { - target: highlight - opacity: 0 - } } ] @@ -339,25 +334,26 @@ Rectangle { Repeater { id: repeater model: mockupTags - LinkedText { + NativeText { id: text4 - color: "#777777" text: modelData smooth: true font.pixelSize: 11 height: 12 font.family: "Helvetica" //setting the pixelSize will set the family back to the default + font.underline: tagMouseArea.containsMouse + color: creatorTheme.Welcome_LinkColor wrapMode: Text.WordWrap - onEntered: { - delegate.state="hover" - } - onExited: { - delegate.state="" - } - onClicked: appendTag(modelData) property bool hugeTag: (text.length > 12) && index > 1 property bool isExampleTag: text === "example" visible: !hugeTag && !isExampleTag && index < 8 && y < 32 + MouseArea { + id: tagMouseArea + anchors.fill: parent + onClicked: appendTag(modelData) + // hoverEnabled: true + cursorShape: Qt.PointingHandCursor + } } } } @@ -372,6 +368,5 @@ Rectangle { ListElement { modelData: "OpenGl" } - } } diff --git a/share/qtcreator/welcomescreen/widgets/IconAndLink.qml b/share/qtcreator/welcomescreen/widgets/IconAndLink.qml index 0fab78d9b70..003867b9680 100644 --- a/share/qtcreator/welcomescreen/widgets/IconAndLink.qml +++ b/share/qtcreator/welcomescreen/widgets/IconAndLink.qml @@ -25,21 +25,39 @@ import QtQuick 2.1 -Row { +Rectangle { property string iconSource property string title: "title" property string openUrl property string openHelpUrl - spacing: 7 + height: 30 + width: 231 + + color: mouseArea.containsMouse + ? creatorTheme.Welcome_HoverColor + : creatorTheme.Welcome_BackgroundColor + Image { + id: image width: 16 height: 16 + x: 34 source: iconSource + anchors.verticalCenter: parent.verticalCenter } - LinkedText { + NativeText { text: title + anchors.verticalCenter: parent.verticalCenter + anchors.left: image.right + anchors.leftMargin: 8 + color: creatorTheme.Welcome_TextColor font.pixelSize: 11 - color: creatorTheme.Welcome_TextColorNormal // 'Qt Account' .. 'User Guide' on lower left + font.underline: mouseArea.containsMouse + } + MouseArea { + id: mouseArea + anchors.fill: parent + hoverEnabled: true onClicked: { if (openUrl) gettingStarted.openUrl(openUrl); @@ -48,3 +66,4 @@ Row { } } } + diff --git a/share/qtcreator/welcomescreen/widgets/LeftSideBar.qml b/share/qtcreator/welcomescreen/widgets/LeftSideBar.qml deleted file mode 100644 index 823d8a19405..00000000000 --- a/share/qtcreator/welcomescreen/widgets/LeftSideBar.qml +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.1 - -Row { - id: customTab - property alias model: repeater.model - spacing: 24 - - signal itemChanged - property int currentIndex: 0 - - onCurrentIndexChanged: welcomeMode.activePlugin = currentIndex - Component.onCompleted: currentIndex = welcomeMode.activePlugin - - Repeater { - id: repeater - - LinkedText { - text: title - active: customTab.currentIndex === index - - onClicked: { - customTab.currentIndex = index - } - } - } -} diff --git a/share/qtcreator/welcomescreen/widgets/LinkedText.qml b/share/qtcreator/welcomescreen/widgets/LinkedText.qml deleted file mode 100644 index 525c3c477cf..00000000000 --- a/share/qtcreator/welcomescreen/widgets/LinkedText.qml +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.1 - -NativeText { - id: root - height: 16 - color: active ? creatorTheme.Welcome_Link_TextColorActive - : creatorTheme.Welcome_Link_TextColorNormal - verticalAlignment: Text.AlignVCenter - - font: fonts.linkFont - - signal clicked - signal entered - signal exited - - property bool active: false - - property bool hovered: mouseArea.state === "hovered" - onActiveChanged: { - if (active) - mouseArea.state = "" - } - - property bool enlargeMouseArea: true - - Rectangle { - color: "#909090" // FIXME: theming: Where is this ever visible? - radius: 6 - opacity: root.active - z: -1 - anchors.rightMargin: -6 - anchors.leftMargin: -6 - anchors.bottomMargin: -4 - anchors.topMargin: -4 - anchors.fill: parent - } - - Rectangle { - color: "#909090" // FIXME: theming: Where is this ever visible? - opacity: root.active - z: -1 - anchors.rightMargin: -6 - anchors.leftMargin: -6 - anchors.bottomMargin: -4 - anchors.topMargin: 10 - anchors.fill: parent - } - - MouseArea { - id: mouseArea - anchors.fill: parent - anchors.margins: enlargeMouseArea ? -8 : 0 - hoverEnabled: true - - cursorShape: Qt.PointingHandCursor - onEntered: { - if (!root.active) - mouseArea.state = "hovered" - root.entered(); - } - onExited: { - mouseArea.state = "" - root.exited(); - } - onClicked: { - root.focus = true; - root.clicked(); - } - - states: [ - State { - name: "hovered" - PropertyChanges { - target: root - font.underline: true - } - } - ] - } - Accessible.role: Accessible.Link -} diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml deleted file mode 100644 index 6ef8b1632b3..00000000000 --- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.1 - -Item { - id: tabBar - - height: 60 - width: parent.width - - property alias model: tabs.model - - Rectangle { - id: row - width: 100 - height: 26 - anchors.top: parent.top - anchors.left: parent.left - gradient: Gradient { - GradientStop { position: 0; color: "#f7f7f7" } - GradientStop { position: 1; color: "#e4e4e4" } - } - NativeText { - id: text - horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter - anchors.fill: parent - text: qsTr("Qt Creator") - } - } - - Item { - anchors.top: parent.top - anchors.left: row.right - anchors.right: parent.right - anchors.bottom: row.bottom - - Rectangle { - id: left1 - anchors.top: parent.top - anchors.left: parent.left - anchors.bottom: parent.bottom - width: 1 - gradient: Gradient { - GradientStop { position: 0; color: "#fcfcfc" } - GradientStop { position: 1; color: "#f7f7f7" } - } - } - - Rectangle { - id: left2 - anchors.top: parent.top - anchors.left: left1.right - anchors.bottom: parent.bottom - width: 1 - color: "#313131" - } - - Rectangle { - id: bottom1 - height: 1 - anchors.left: left1.right - anchors.right: parent.right - anchors.bottom: parent.bottom - color: "#fbfbfb" - } - - Rectangle { - id: bottom2 - height: 1 - anchors.left: left2.right - anchors.right: parent.right - anchors.bottom: bottom1.top - width: 1 - color: "#313131" - } - - Rectangle { - anchors.top: parent.top - anchors.left: left2.right - anchors.right: parent.right - anchors.bottom: bottom2.top - gradient: Gradient { - GradientStop { position: 0.00; color: "#8e8e8e" } - GradientStop { position: 0.07; color: "#8e8e8e" } - GradientStop { position: 0.08; color: "#757575" } - GradientStop { position: 0.40; color: "#666666" } - GradientStop { position: 0.41; color: "#585858" } - GradientStop { position: 1.00; color: "#404040" } - } - } - } - - Rectangle { - id: background - anchors.bottom: parent.bottom - width: parent.width - anchors.top: row.bottom - gradient: Gradient { - GradientStop { position: 0; color: "#e4e4e4" } - GradientStop { position: 1; color: "#cecece" } - } - Rectangle { - color: "black" - height: 1 - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - } - } - - Row { - height: background.height - anchors.top: row.bottom - anchors.topMargin: 6 - width: parent.width - Repeater { - id: tabs - height: parent.height - model: tabBar.model - delegate: SingleTab { } - } - } -} diff --git a/share/qtcreator/welcomescreen/widgets/PageCaption.qml b/share/qtcreator/welcomescreen/widgets/PageCaption.qml deleted file mode 100644 index 66772a1e4e0..00000000000 --- a/share/qtcreator/welcomescreen/widgets/PageCaption.qml +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -import QtQuick 2.1 - -Item { - id: pageCaption - width: 960 - height: 40 - - property int textOffset: captionText.x + captionText.width - property alias caption: captionText.text - - NativeText { - id: captionText - y: 9 - color: "#515153" - anchors.left: parent.left - anchors.leftMargin: 8 - font.pixelSize: 18 - font.bold: false - font.family: "Helvetica" - } - Rectangle { - height: 1 - color: "#a0a0a0" - anchors.bottomMargin: 8 - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - } -} diff --git a/share/qtcreator/welcomescreen/widgets/PageLoader.qml b/share/qtcreator/welcomescreen/widgets/PageLoader.qml index 75d8422b34e..18d01cd2781 100644 --- a/share/qtcreator/welcomescreen/widgets/PageLoader.qml +++ b/share/qtcreator/welcomescreen/widgets/PageLoader.qml @@ -31,7 +31,6 @@ Rectangle { property alias model: repeater.model property int currentIndex: 0 - Repeater { id: repeater anchors.fill: parent diff --git a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml index 87cc0a6986f..eb831d54519 100644 --- a/share/qtcreator/welcomescreen/widgets/ProjectItem.qml +++ b/share/qtcreator/welcomescreen/widgets/ProjectItem.qml @@ -25,54 +25,48 @@ import QtQuick 2.1 -Item { +Rectangle { id: projectItem - width: row.width + 8 - height: text.height + width: Math.max(projectNameText.width, pathText.width) + projectNameText.x + 11 + height: 48 - Rectangle { // background shown on hover over project item - anchors.fill: parent - color: creatorTheme.Welcome_ProjectItem_BackgroundColorHover - visible: mouseArea.containsMouse - } + color: mouseArea.containsMouse + ? creatorTheme.Welcome_HoverColor + : creatorTheme.Welcome_BackgroundColor property alias projectName: projectNameText.text property alias projectPath: pathText.text - Row { - id: row - spacing: 5 + Image { + id: icon + x: 11 + y: 6 + source: "image://icons/project/Welcome_ForegroundSecondaryColor" + } - Image { - y: 3 - source: "images/project.png" - } + NativeText { + x: 38 + id: projectNameText + font.pixelSize: fonts.linkFont.pixelSize + font.family: fonts.linkFont.family + font.underline: mouseArea.containsMouse + color: creatorTheme.Welcome_LinkColor + anchors.verticalCenter: icon.verticalCenter + } - Column { - id: text - - LinkedText { - id: projectNameText - height: 20 - font.underline: mouseArea.containsMouse - font.pixelSize: fonts.linkFont.pixelSize - font.family: fonts.linkFont.family - enlargeMouseArea: false - } - NativeText { - id: pathText - height: 20 - color: creatorTheme.Welcome_ProjectItem_TextColorFilepath - font: fonts.smallPath - } - } + NativeText { + id: pathText + anchors.left: projectNameText.left + anchors.bottom: projectItem.bottom + anchors.bottomMargin: 6 + color: creatorTheme.Welcome_ForegroundPrimaryColor + font: fonts.smallPath } MouseArea { id: mouseArea anchors.fill: parent hoverEnabled: true - cursorShape: Qt.PointingHandCursor onClicked: projectWelcomePage.requestProject(filePath); } } diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml index 9474f927af2..3bde97484e8 100644 --- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml +++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml @@ -30,16 +30,9 @@ Rectangle { id: projectList height: column.height + 200 width: column.width - color: creatorTheme.Welcome_BackgroundColorNormal + color: creatorTheme.Welcome_BackgroundColor property alias model: repeater.model -// Behavior on verticalScrollBar.opacity { -// PropertyAnimation { - -// } -// } - -// frameVisible: false Column { id: column diff --git a/share/qtcreator/welcomescreen/widgets/SearchBar.qml b/share/qtcreator/welcomescreen/widgets/SearchBar.qml index 974f3782c9a..e7bd007a01b 100644 --- a/share/qtcreator/welcomescreen/widgets/SearchBar.qml +++ b/share/qtcreator/welcomescreen/widgets/SearchBar.qml @@ -31,10 +31,9 @@ Rectangle { id: searchBar width: 930 - height: 27 - color: creatorTheme.Welcome_BackgroundColorNormal - radius: 6 - border.color: "#cccccc" // FIXME: make themable + height: 30 + color: creatorTheme.Welcome_BackgroundColor + border.color: creatorTheme.Welcome_ForegroundSecondaryColor property alias placeholderText: lineEdit.placeholderText property alias text: lineEdit.text @@ -51,8 +50,8 @@ Rectangle { font.pixelSize: 14 placeholderText: qsTr("Search...") style: TextFieldStyle { - placeholderTextColor: creatorTheme.Welcome_TextColorNormal - textColor: creatorTheme.Welcome_TextColorNormal + placeholderTextColor: creatorTheme.Welcome_ForegroundSecondaryColor + textColor: creatorTheme.Welcome_TextColor background: Item { } } diff --git a/share/qtcreator/welcomescreen/widgets/Logo.qml b/share/qtcreator/welcomescreen/widgets/SessionActionLabel.qml similarity index 77% rename from share/qtcreator/welcomescreen/widgets/Logo.qml rename to share/qtcreator/welcomescreen/widgets/SessionActionLabel.qml index a94707ba1ff..75e44875d69 100644 --- a/share/qtcreator/welcomescreen/widgets/Logo.qml +++ b/share/qtcreator/welcomescreen/widgets/SessionActionLabel.qml @@ -25,19 +25,18 @@ import QtQuick 2.1 -Image { - id: logo - source: "images/qtcreator.png" - NativeText { - y: 21 - color: "#424242" - text: "Qt Creator" - font.bold: true - anchors.left: parent.left - anchors.leftMargin: 52 - anchors.bottom: parent.bottom - anchors.bottomMargin: 6 - font.pixelSize: 16 - font.family: "Helvetica" +NativeText { + id: root + signal clicked() + text: qsTr("Clone") + font.pixelSize: 13 + font.underline: area.containsMouse + color: creatorTheme.Welcome_LinkColor + MouseArea { + id: area + anchors.fill: parent + hoverEnabled: true + onClicked: root.clicked() + anchors.margins: -6 } } diff --git a/share/qtcreator/welcomescreen/widgets/SessionItem.qml b/share/qtcreator/welcomescreen/widgets/SessionItem.qml index c9f14de21b9..f617dfeedc3 100644 --- a/share/qtcreator/welcomescreen/widgets/SessionItem.qml +++ b/share/qtcreator/welcomescreen/widgets/SessionItem.qml @@ -26,49 +26,49 @@ import QtQuick 2.1 Item { - x: 5 id: delegate property bool expanded: false height: columns.height width: columns.width - property alias name: text.text + property alias name: titleText.text Column { id: columns - Row { - id: row1 - height: text.height + Rectangle { + id: rectangle + height: 30 + width: 260 - spacing: 7 + color: (titleArea.containsMouse || collapseArea.containsMouse || delegate.expanded) + ? creatorTheme.Welcome_HoverColor + : creatorTheme.Welcome_BackgroundColor Image { - source: "images/sessions.png" - anchors.verticalCenter: text.verticalCenter - width: 16 - height: 16 + id: sessionIcon + source: "image://icons/session/Welcome_ForegroundSecondaryColor" + x: 11 + anchors.verticalCenter: parent.verticalCenter } - LinkedText { - id: text - - onClicked: projectWelcomePage.requestSession(sessionName); - - width: delegate.ListView.view.width - 80 - height: 28 + NativeText { + id: titleText + anchors.fill: parent + anchors.leftMargin: 38 elide: Text.ElideRight + color: creatorTheme.Welcome_LinkColor + verticalAlignment: Text.AlignVCenter + font.pixelSize: fonts.linkFont.pixelSize + font.family: fonts.linkFont.family + font.underline: titleArea.containsMouse + } - enlargeMouseArea: false - - Rectangle { - z: -4 - // background of session item - color: creatorTheme.Welcome_SessionItem_BackgroundColorHover - anchors.fill: parent - visible: iArea.containsMouse || text.hovered - anchors.topMargin: 1 - anchors.bottomMargin: 1 - anchors.leftMargin: -row1.spacing / 2 + MouseArea { + id: titleArea + hoverEnabled: true + anchors.fill: parent + onClicked: { + projectWelcomePage.requestSession(sessionName); } } } @@ -76,10 +76,9 @@ Item { z: -1 property int margin: 6 id: details - height: expanded ? innerColumn.height + margin * 2 : 0 - width: delegate.ListView.view.width - 8 - margin * 2 - color: "#f1f1f1" - radius: 4 + height: expanded ? innerColumn.height + margin + 16 : 0 + width: titleArea.width + collapseArea.width + color: creatorTheme.Welcome_HoverColor clip: true visible: false @@ -89,7 +88,7 @@ Item { script: if (expanded) details.visible = true; } NumberAnimation { - duration: 200 + duration: 180 easing.type: Easing.InOutQuad } ScriptAction { @@ -99,45 +98,27 @@ Item { } Column { - x: parent.margin + 8 + x: titleText.x y: parent.margin id: innerColumn spacing: 12 - width: parent.width - 16 Repeater { model: projectsPath delegate: Column { + spacing: 4 NativeText { text: projectsName[index] - font: fonts.boldDescription - color: creatorTheme.Welcome_TextColorNormal + font: fonts.smallPath + color: creatorTheme.Welcome_TextColor + width: titleText.width } NativeText { - x: 4 - function multiLinePath(path) { - if (path.length < 42) - return path; - var index = 0; - var oldIndex = 0; - while (index != -1 && index < 40) { - oldIndex = index; - index = path.indexOf("/", oldIndex + 1); - if (index == -1) - index = path.indexOf("\\", oldIndex + 1); - } - var newPath = path.substr(0, oldIndex + 1) + "\n" - + path.substr(oldIndex + 1, path.length - oldIndex - 1); - return newPath; - } - text: multiLinePath(modelData) + text: modelData font: fonts.smallPath - wrapMode: Text.WrapAnywhere - maximumLineCount: 2 elide: Text.ElideRight - height: lineCount == 2 ? font.pixelSize * 2 + 4 : font.pixelSize + 2 - color: creatorTheme.Welcome_ProjectItem_TextColorFilepath - width: delegate.ListView.view.width - 48 + color: creatorTheme.Welcome_ForegroundPrimaryColor + width: titleText.width MouseArea { anchors.fill: parent hoverEnabled: true @@ -147,7 +128,6 @@ Item { onExited: { toolTip.hide() } - } ToolTip { x: 10 @@ -160,51 +140,39 @@ Item { } Flow { - x: parent.margin width: parent.width - 2 * parent.margin height: 18 - spacing: 4 + spacing: 6 - Image { source: "images/icons/clone.png" } - LinkedText { + SessionActionLabel { text: qsTr("Clone") - onClicked: { - root.model.cloneSession(sessionName); - } + onClicked: root.model.cloneSession(sessionName) } - Item { + Rectangle { visible: !defaultSession - width: 16; - height: 10; + width: 1; + height: 13; + color: creatorTheme.Welcome_ForegroundSecondaryColor } - Image { - visible: !defaultSession - source: "images/icons/rename.png" - } - LinkedText { + + SessionActionLabel { visible: !defaultSession text: qsTr("Rename") - onClicked: { - root.model.renameSession(sessionName); - } + onClicked: root.model.renameSession(sessionName) } - Item { + Rectangle { visible: y === 0 && !defaultSession - width: 16; - height: 10; + width: 1; + height: 13; + color: creatorTheme.Welcome_ForegroundSecondaryColor } - Image { - visible: !defaultSession - source: "images/icons/delete.png" - } - LinkedText { + + SessionActionLabel { visible: !defaultSession text: qsTr("Delete") - onClicked: { - root.model.deleteSession(sessionName); - } + onClicked: root.model.deleteSession(sessionName) } } } @@ -212,47 +180,27 @@ Item { } Item { - x: delegate.ListView.view.width - 65 - width: 38 - height: text.height - Item { + x: rectangle.width + width: 28 + height: titleArea.height + Rectangle { id: collapseButton - visible: text.hovered || iArea.containsMouse || delegate.expanded - - property color color: iArea.containsMouse ? creatorTheme.Welcome_SessionItemExpanded_BackgroundColorHover - : creatorTheme.Welcome_SessionItemExpanded_BackgroundColorNormal - anchors.fill: parent - Image { - x: 4 - y: 7 - source: "images/info.png" - } - Image { - x: 20 - y: 7 - source: delegate.expanded ? "images/arrow_up.png" : "images/arrow_down.png" - } - Rectangle { - color: collapseButton.color - z: -1 - radius: creatorTheme.WidgetStyle === 'StyleFlat' ? 0 : 6 - anchors.fill: parent - anchors.topMargin: 1 - anchors.bottomMargin: 1 - } + color: (collapseArea.containsMouse || delegate.expanded) + ? creatorTheme.Welcome_HoverColor + : creatorTheme.Welcome_BackgroundColor - Rectangle { - color: collapseButton.color - z: -1 - anchors.fill: parent - anchors.topMargin: 6 - visible: details.visible + Image { + x: 6 + y: 7 + visible: (collapseArea.containsMouse || delegate.expanded || titleArea.containsMouse) + source: "image://icons/expandarrow/Welcome_ForegroundSecondaryColor" + rotation: delegate.expanded ? 180 : 0 } } MouseArea { - id: iArea + id: collapseArea anchors.fill: parent hoverEnabled: true onClicked: { diff --git a/share/qtcreator/welcomescreen/widgets/Sessions.qml b/share/qtcreator/welcomescreen/widgets/Sessions.qml index e99e39ca6c6..bee7e3b4fc6 100644 --- a/share/qtcreator/welcomescreen/widgets/Sessions.qml +++ b/share/qtcreator/welcomescreen/widgets/Sessions.qml @@ -26,18 +26,17 @@ import QtQuick 2.1 import widgets 1.0 -Item { +Rectangle { id: root property var model - property int topMargin: 6 height: content.contentHeight + 200 + color: creatorTheme.Welcome_BackgroundColor ListView { id: content model: root.model anchors.fill: parent - anchors.topMargin: topMargin snapMode: ListView.SnapToItem clip: true interactive: false diff --git a/share/qtcreator/welcomescreen/widgets/SideBar.qml b/share/qtcreator/welcomescreen/widgets/SideBar.qml index 31495f759eb..2c74b638aff 100644 --- a/share/qtcreator/welcomescreen/widgets/SideBar.qml +++ b/share/qtcreator/welcomescreen/widgets/SideBar.qml @@ -35,115 +35,70 @@ ColumnLayout { property alias currentIndex: tabs.currentIndex property alias model: tabs.model + readonly property int lrPadding: 34 + Item { id: modeArea z: 1 Layout.fillWidth: true - Layout.preferredWidth: tabs.width + 16 * 2 + Layout.preferredWidth: tabs.width + lrPadding * 2 Layout.preferredHeight: tabs.height + screenDependHeightDistance * 2 - Component { - id: imageBackground - Image { - fillMode: Image.Tile - source: "images/background.png" - anchors.fill: parent - } - } - Component { - id: flatBackground - Rectangle { - color: creatorTheme.Welcome_SideBar_BackgroundColor - } - } - Loader { - id: topLeftLoader + Rectangle { + color: creatorTheme.Welcome_BackgroundColor anchors.fill: parent - sourceComponent: creatorTheme.WidgetStyle === 'StyleFlat' ? flatBackground : imageBackground; } Tabs { anchors.verticalCenter: parent.verticalCenter - x: 16 - width: Math.max(modeArea.width - 16 * 2, implicitWidth) + x: lrPadding + width: Math.max(modeArea.width - lrPadding * 2, implicitWidth) id: tabs spacing: Math.round((screenDependHeightDistance / count) + 10) } - - Rectangle { - color: creatorTheme.WidgetStyle === 'StyleFlat' ? - creatorTheme.Welcome_SideBar_BackgroundColor : creatorTheme.Welcome_DividerColor - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - height: 1 - } - - Rectangle { - color: creatorTheme.WidgetStyle === 'StyleFlat' ? - creatorTheme.Welcome_SideBar_BackgroundColor : creatorTheme.Welcome_DividerColor - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: -1 - height: 1 - opacity: 0.6 - } - - Rectangle { - color: creatorTheme.WidgetStyle === 'StyleFlat' ? - creatorTheme.Welcome_SideBar_BackgroundColor : creatorTheme.Welcome_DividerColor - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.bottomMargin: -2 - height: 1 - opacity: 0.2 - } } Rectangle { - color: creatorTheme.Welcome_SideBar_BackgroundColor + color: creatorTheme.Welcome_BackgroundColor Layout.fillWidth: true - Layout.preferredWidth: innerColumn.width + 20 + Layout.preferredWidth: upperColumn.width + 20 Layout.fillHeight: true ColumnLayout { - id: innerColumn + id: upperColumn - x: 12 + x: lrPadding - spacing: 4 + spacing: 8 - property int spacerHeight: screenDependHeightDistance - 14 + property int spacerHeight: screenDependHeightDistance Item { - Layout.preferredHeight: innerColumn.spacerHeight + Layout.preferredHeight: upperColumn.spacerHeight } NativeText { text: qsTr("New to Qt?") - color: creatorTheme.Welcome_TextColorNormal + color: creatorTheme.Welcome_TextColor font.pixelSize: 18 } NativeText { id: gettingStartedText - Layout.preferredWidth: innerColumn.width + Layout.preferredWidth: upperColumn.width text: qsTr("Learn how to develop your own applications and explore Qt Creator.") - color: creatorTheme.Welcome_TextColorNormal + color: creatorTheme.Welcome_ForegroundPrimaryColor font.pixelSize: 12 wrapMode: Text.WrapAtWordBoundaryOrAnywhere } Item { - Layout.preferredHeight: innerColumn.spacerHeight + Layout.preferredHeight: 4 } Button { @@ -156,37 +111,33 @@ ColumnLayout { } Item { - Layout.preferredHeight: innerColumn.spacerHeight + Layout.preferredHeight: upperColumn.spacerHeight * 2 } + } - ColumnLayout { - spacing: 16 + ColumnLayout { + anchors.top: upperColumn.bottom + anchors.topMargin: 8 - IconAndLink { - iconSource: "images/icons/qt_account.png" - title: qsTr("Qt Account") - openUrl: "https://account.qt.io" - } - IconAndLink { - iconSource: "images/icons/qt_cloud.png" - title: qsTr("Qt Cloud Services") - openUrl: "https://developer.qtcloudservices.com" - } - IconAndLink { - iconSource: "images/icons/onlineCommunity.png" - title: qsTr("Online Community") - openUrl: "http://forum.qt.io" - } - IconAndLink { - iconSource: "images/icons/blogs.png" - title: qsTr("Blogs") - openUrl: "http://planet.qt.io" - } - IconAndLink { - iconSource: "images/icons/userGuide.png" - title: qsTr("User Guide") - openHelpUrl: "qthelp://org.qt-project.qtcreator/doc/index.html" - } + IconAndLink { + iconSource: "image://icons/qtaccount" + title: qsTr("Qt Account") + openUrl: "https://account.qt.io" + } + IconAndLink { + iconSource: "image://icons/community" + title: qsTr("Online Community") + openUrl: "http://forum.qt.io" + } + IconAndLink { + iconSource: "image://icons/blogs" + title: qsTr("Blogs") + openUrl: "http://planet.qt.io" + } + IconAndLink { + iconSource: "image://icons/userguide" + title: qsTr("User Guide") + openHelpUrl: "qthelp://org.qt-project.qtcreator/doc/index.html" } } } diff --git a/share/qtcreator/welcomescreen/widgets/ToolTip.qml b/share/qtcreator/welcomescreen/widgets/ToolTip.qml index e7d1c49d265..ff3b4deb7b9 100644 --- a/share/qtcreator/welcomescreen/widgets/ToolTip.qml +++ b/share/qtcreator/welcomescreen/widgets/ToolTip.qml @@ -78,25 +78,15 @@ Item { Rectangle { anchors.fill: parent - + color: creatorTheme.Welcome_BackgroundColor border.width: 1 - smooth: true - radius: 2 - gradient: Gradient { - GradientStop { - position: 0.00; - color: "#ffffff"; - } - GradientStop { - position: 1.00; - color: "#e4e5f0"; - } - } + border.color: creatorTheme.Welcome_ForegroundSecondaryColor } NativeText { x: toolTip.margin y: toolTip.margin id: text + color: creatorTheme.Welcome_TextColor } } diff --git a/share/qtcreator/welcomescreen/widgets/images/arrowBig.png b/share/qtcreator/welcomescreen/widgets/images/arrowBig.png deleted file mode 100644 index 02618066cb85d96e6676b46126750838b2fb59b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0y~yU=U(pV36ZrVPIhBW^G%}z`!ua)5S5w;`G$X3xygC zc$}3dPCntOGT*?w(?v;LUHxatgf%;R4jtWh`pSHbj-><^~W!~ne&NwxH`91lO+*AJJKiB;Gex~;B^UjGy VE7dt)F)%PNc)I$ztaD0e0szM}RhR$( diff --git a/share/qtcreator/welcomescreen/widgets/images/arrow_down.png b/share/qtcreator/welcomescreen/widgets/images/arrow_down.png deleted file mode 100644 index 722f70fb5635e2b70a0dae369a6ca87394077d28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r9R|Noznk&y-i-RVLz z85kH?N`m}?859Z{JR@(dVPIe|@N{tu;fPL7P~hZf4AExV*u}`qyjgg{!8d0PBrrW` q@DPyJVG(5Da%5?6N)UBnV0f*`Tv}*0Kc9htfx*+&&t;ucLK6UE#3@Ap diff --git a/share/qtcreator/welcomescreen/widgets/images/arrow_down@2x.png b/share/qtcreator/welcomescreen/widgets/images/arrow_down@2x.png deleted file mode 100644 index 34421b66bf5501f27e9118dabfda218a0046269a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EJOMr-uK)l4&&bF~1A~?K z9$sT$U|=o@@(X5gXn4Mz<2M5XgP*61V~B+0)`J@b8yq+o4oV;EIpVd%Me}q|m`1b9 zvHJb2cb~dTALf(c5ihVh!5h&ewt#h7gGq~Vi??xPmSJY3k!SnouC$Fw7gGeETl1f5 X7W03y=7}H!0|SGntDnm{r-UW|t1miH diff --git a/share/qtcreator/welcomescreen/widgets/images/arrow_up.png b/share/qtcreator/welcomescreen/widgets/images/arrow_up.png deleted file mode 100644 index c589c349e95f5f5009ac23fd45461b1c9f63fa5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu#id_r9R|Noznk&y-i-RVLz z85kH?N`m}?859Z{JR@(dVPIg;^K@|x;fPL7P~bC=cDOpz!dc?XIW+-AVdk_A0v#;e oD;YS`)D@gLRMv1Pb+9wAwlJ5fFF7N^z`(%Z>FVdQ&MBb@0NJJ|7XSbN diff --git a/share/qtcreator/welcomescreen/widgets/images/arrow_up@2x.png b/share/qtcreator/welcomescreen/widgets/images/arrow_up@2x.png deleted file mode 100644 index 7d48c05be7b9bc8525317759a987bbde17ec3516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EJOMr-uK)l4&&bF~1A~?K z9$sT$U|=o@@(X5gXn4Mz<2M5XgP*61V~B+0)`J@b8yq+o4oV;EIpVd%Me}q|m`1b9 zvHJb2cb_^x(wU_brgL%6lEX8%=*-mFI^)n%$t8+17nr;c2yJP&?3ni;VMjx6;&Xd` Zo3CR2o2~8FGB7YOc)I$ztaD0e0sxjXK9K+b diff --git a/share/qtcreator/welcomescreen/widgets/images/background.png b/share/qtcreator/welcomescreen/widgets/images/background.png deleted file mode 100644 index 33ddf9ed55cae25c2b92f0c4c94938a0cbccba63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0y~yU@&4}U@+uhU|?X_dtm8d1_p*uPZ!4!kK=DAZ4_is zWN5xoFTd5GaNGRGZ(A2GJ|TF_ZyQszwTrciWS~OsGNxc_7wZt~EptN`JTKAQu*G@n x;fs7#UY2$L=5O1he*e#t@c&oqzph{NpON7RfaQr(3{#UN=T7%B2I*z+boFyt=akR{00?0fi2wiq diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/blogs.png b/share/qtcreator/welcomescreen/widgets/images/icons/blogs.png deleted file mode 100644 index c10b4a6f40451f251dc724407aca9f0e88f1d02d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1588 zcmeAS@N?(olHy`uVBq!ia0y~yV2}f04mJh`25W{(JaZG%Q-e|yQz{EjrrIztFso#SM3hAM`dB6B=jtVb)aX^@7BGN-jeSKyVsdtB zi9%9pdS;%j()-=}l@u~lY?Z=IeGPmIoKrJ0J*tXQgRA^PlB=?lEmM^2?G$V(tSWK~ za#KqZ6)JLb@`|l0Y?Z*~TICg6frRyy6u?SKvTcwn`GuBNuFf>#! zGt)CPF*P$Y)KM@pFf`IPFw!?L(={})GBvX@GFN~CB|8P1qLehNAQv~NT}3Hrwn`Z# zB?VUc`sL;2dgaD?`9+T7#d8;`MLTPi3R$GdIlgbLHwFq;OmQDX>KlDb#X~h zD#E>34K5C;EJ)Q4N-fSWElN%eN=;J+xv9X)xhOTUB)=#mKR*W+iUAq*lEl2^R8JRMrHb4Fz0AxMD>G*o7gqyU6C(>Z14Bbs zV<#6^M^_7TCpQyEH%n7TN0?rh{N&Qy)Vvay-V}shQ=EE1i2)QKRxYVUnPsUdZbkXI z3SduLW#V>=5l-`mL96kDYt zC40NYC!}^WFfc9iba4!+xV2|mY=>{4$no=g?PkwZIvL>g`N)){3Wa4KMSbryE7}Mo z-!oZkqwuhC*}@ZtO(tD2xnlF-!RNju6F&-0V&{LgXkradrpJ{2PX#~MMs4?7zW2N3 z^SHaA`)A&&zW>)g`|Z~2w^sV7eZKyA&-@R}b_cyH82u9&_EqzpPTL%3XcqK8TA6E8DDzj9nAz!2js^0;SFkDMg|^jZqQ2Zwti#sr+bIJE^9_zh|n!o#g9(DkAuA zCnlcZpCGki&Tre0Q!TmFREeBv3EROZpD;hI z_QsN(G7WbHAH{ZDSFwHUSs=oeIC-h{+>Q@1=XP$s@njay^M^V;rf1}PEQ;rRGhRC7 zOm2bjvDQ7)Hf(oEskVN!GAOIG*`$5L^A7JrZ+kLydL0upOS=6dARa) z=J;FHPco;hUQx<~!pu+c&k=ipRBkzjbx@UYq>4rRjsnT8HBa zy=^LQDz~R9zkIIk^l;j`ZzlqmNk8$Qd+qh(4eqlKur^n;PxG8SQ?Bm2OyC^lL(8{3 zWY1+@!`r*}>KpUOy@_u+SLb$ps5$+F>F|w))ZDcX=djBjx_tT8BcHTWPv)e)&B)bo ztbQx7PVAxH>B-Bl8~i)EG4h9FVdQ&MBb@ E05{J|asU7T diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/clone@2x.png b/share/qtcreator/welcomescreen/widgets/images/icons/clone@2x.png deleted file mode 100644 index bdb5cc142e6420abaf9e8f3a7518a592a0682358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8x&b~RuK)l4H=J|Mc;*?C z+2@UBoi&_w&T!T_qgm&SW}Y>MFks~W|Ns92yEPc=*G?0pMPn1 z{qAI7U|8o_f$J!*#XJD87Hr8N=9)swHUEHkQiZ#zR z8#G$8B`~hsU9dqwhr#5bY{&zv8(q6O8h0ynTTEb;YGB%Rf@yjK)5h}qjSMaiv;q{w zBOgcwBQUUYV|9c&)`pm$pL47881p?Y>_bGar?4xq2<~W sp$(O{liUvcG-aLIHBXL#;Ro~gD|*6=^WyF>FfcH9y85}Sb4q9e04*_LFaQ7m diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/delete@2x.png b/share/qtcreator/welcomescreen/widgets/images/icons/delete@2x.png deleted file mode 100644 index eb2705644c43b06ecc45c5f258efef9c9ccc6fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG`~rMJT>t<7|K3aTwY$`7 z51BU}l5gFm-noOwx9(DC=v{#7ha{U%rNN)uv%b!1{IDZqqcmI9+ z^8f$;M(q`TAS+9P{DK+ejT{0S_aC}(^Y!On8eYFU85kH2d%8G=Se#xv`6XYA0#D0c z2gcX6`~G+5J+g8LY`*#C&*Hz6%5F_k`5&UT#K_Ha;@xH4U29f7n&ju5q!m2xyeaD? z%hT6O0^bU*Tqd0ve)OvR_u7)$8~^_9@jr0-W&Zb)UAE7i{TXW2)m{WXVt8V#!0+&I z=fVSR9aap@&$$v@j}#;@ZYVe~Z3g3+JuSIKOa>p-)}CcNa3D7+;0p5#!IL*utYp6M za6?n-R)$*%krCz03plUI+Ru1#@@T(V-M5eZpC7&cyNch^LB-UsU+e(`0|SGntDnm{ Hr-UW|^vJDQ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/onlineCommunity.png b/share/qtcreator/welcomescreen/widgets/images/icons/onlineCommunity.png deleted file mode 100644 index 37101a045a626a625f21aa81cbfc003912357d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmeAS@N?(olHy`uVBq!ia0y~yV31>AU{K&-V_;xlbvRMaz`!6`;u=vBoS#-wo>-L1 z;Fyx1l&avFo0y&&l$w}QS$HzlhJk@uB{L+VB*NFnDmgz_FA=0huOhdA0R(L9D+&^m zvr|hHl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZBIxIyhIN=dU- z$|xx*u+rBrFE7_CH`dE9O4m2Ew6p}7VPvFRl#-@fT$xvrSfQI&tPC^3CAB!YD6^m> zGe1uOWMX1cerbuVk`mO|irfOYv3bSNU`o!<)vrh_&^OdG0C@@G*W3bMU;IjQbK$Cs zOM+4n?!{_waY$uBs(w&vaeir0a%xa&nli{u1y;^Qsfi`|MIrh5Ij~R+$jC3rFV4s> zP;d@5Q_%2DOwP;$321_K`1)FT<`tJD<|U_ky4WgJF!NnbvG{CVCX_Jdf*dFGE|3UQk%KR?@kL&WgXfuxiV zq8+;%cQC(bn14dZhi41x9fvy%N7`#^YnQ&rG~}7V^igra(??&nNw7?5tkAtslvWkZ z!*tDIj(7i&R_&{&FW)|{pultFAakN2#}D2qN7a~9H{NlGJYx|cX515Hll5`M(Zyo@ zQ8rnIeg~M2G+8_;ar6yh`W4Sq$SRPpaQqQ}N(H=O_Iu2{0ur3tPJgRsU|?M7>Eaj?aro_YTMwB) zk=Fg38!sN>=yu&8#O-*&Eh%^FgS$&MZQOVz%Ta*kV2~~oW3+a?l(b^TH|e_3h&f(wq1}}uiG}KX(o$wjT%S8OkSp1PKIB5%)fGdSuXMU zp8&&75r&-t3|mDQwhAz$Ycia3Vwl5pmF4W}d$ai*CNXPqGHBhCej;vO$TcJnP+8GhL& zA?@w~i4UwZdOs%bVz}0*{2<^`?CHiMXV@Av6AqdCNyW{#J&~W_e(9$@cd@sCHx<5wWNh6q=D<6rZALN(e`z4piLFEebmKAH4bqA!KP p;10)ynT!tCckht?$6mp>vVNB6<~2)G85kHCJYD@<);T3K0RX5=()9oU diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qt_cloud.png b/share/qtcreator/welcomescreen/widgets/images/icons/qt_cloud.png deleted file mode 100644 index ba3f283935c0aea1a817574ea53d5b00dc59e28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_Iu2{0umB;s;~7jFfh*Xba4!cIQ;gyZMI0D z$gz+2eN0v;IQlH^=$ORHnWfm&+N&UF!{x*gp%uloFSMywBO)RyQ<-DP{>HuiNIt7)NfueKqBYR3C3c&RS{ZB>Qy< zOpk9gz5mf6UNJ3b)@m6ArM5!(>l-Uu{lz~rd=K)n*JkYK$jx~CL~Gkt!dl4*fhPuqT$Kj7==SXaL|K^?gq1~n`?eg`EE=S_-tU6h_ zf6CkgPwOqBre58z$!rlE{59H8Ua(&&sl@U?Meo^s_H~bHU1XYclx9hFJ}a;|9^}kW zU0{5?o$dL=l``w4StL$>+~U}M1AiebjNX{Cp2D?-2g zw|XSo_doNv=F;;PVHrsm?tKt@9^}OxIluFTg5JZBhf@xVs>B}9S@v;>`I0p0|84(m b59A9jiFrTKynGV_0|SGntDnm{r-UW|wXWBZ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/rename.png b/share/qtcreator/welcomescreen/widgets/images/icons/rename.png deleted file mode 100644 index 80116d1fead67de7d7895f75b7c6efb27b482473..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUGPe%U+%B^@#f6W z_gDY?c=Pwi+kbz)|NHy%|Ns9{zS|BkFfeeG1o;IsaNCw`xcl@k^MM%ZkSe1r>`mI+S0|4_Ya>bxHquUWTZ5bqoduDV|=z zc@5K4ME5awEje}ZJoC2m0jjJUsuQn$=T+3SxOuGLuJ9zS?Sjc+{kow+FQvbwTHVT? lnQbj$d_$=A=biq0-7#$2Oe4Q;Vqjok@O1TaS?83{1OWdjg*gBK diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/rename@2x.png b/share/qtcreator/welcomescreen/widgets/images/icons/rename@2x.png deleted file mode 100644 index 381e6a9e40ed0dfb983e6371f356d6c744df543f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG8UuVnT>t<7e{ZS4gB2q8 zmy0}DE_{EP$b;ozHkk1MBnT1#GejS(5P!H*^5H7kC!36(Y&Lzm&F1Mg+ZTHSULFX4 zc_{kLsiL=MD&C&0dUvk+-T8(Om%BdQn)CVYlF#>+e}BIJ`^&?>KHmKO`QGo(_kVwR z^zYC2e}8`b|Npf*ItE90D8nAG&e#_2*w2UcWmT7#QArx;TbdoL)Qm z`J_VzJS~^!-0*art0 z=xD6P+7*kn-X8lrt7_F}zdfal2Xt;Vcr^c)b=X?Y`PbHA>goB97;Z-WP;Qw0?}Bne z$?+NY*w4)u-pkMz%xb_oMT}wJ8zyVkDO>{2_Ixz=JC;;;)F+RV)#O^CO0!kF?Y*bV z3lF?lN2kx9YD0{o5yazT04?n)RT8f4<6YcCq~xpHtIpxtHc%(75@^!1KO_ z-0n32u5Wf7-q_9OV^ES=@?_4fKQkA~%Kd)W{<(em_xQUE{=GW<3ypjG7#J8BJYD@< J);T3K0RWW+?REeF diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/userGuide.png b/share/qtcreator/welcomescreen/widgets/images/icons/userGuide.png deleted file mode 100644 index c00db7ad65c568e0536fbc8efb9d5b066edbc106..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1562 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3m8Da#=fE;F*!T6 zL?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRu#Dg zxv3?I3Kh9IdBs*0wn|`gt@4VkK*IV;3ScEA*|tg$M@9GsC^+XAr7D=}8S5q+7#b>= znduptn3|ax>L?f)7#ist80j0B=^C0?nVMM{nJYknlAVH0QA(Oskc%7CuA-DQTcwPW zk^(Dz{qpj1y>er{{GxPyLrY6bkQqisxCgqow*eWSOjjhNnfE$}v3=O8_{9OHt!~%UoJp+)JAb!m)@b$&7G&dKny0|1L z72#g21{a4^7NqJ2r55Lx7A2}VxP(M``10nm^@NFeToDOz zzES_MzOeGcvw79E7y0F5p6#tZSNZvz?eje$R&)7Uve+aIc&Z%5GahWsPhb~0sHM?h z+j-H-k>OUPm`}suLkX)BSkD-&h*&9gUFx7v1*@9u9QHlsld7j@oYriR+rYc-b-m_? zaM|3P%gZzx95*oTYJPIXcXsnOhLS1g9fK$AnU%3yU9Z6{ZT*p->;=Me7>_$hPcHEl za5;E})40L%;r)L-ec}hKKd`=OI{rXuhjxW*@kNF&fwRRd>iPAW-!EXj^H^B7DL6s? z4x7JD*|L|$9v|D+7~FpD$a5q(!OKZ)vr-ge?{CSe=I%iwbyO$={b~hzW_1w74yTm2oOYV~L8zyTGrFb~( z;(WSOjzOKZx=M8SEyu3{Js(YFO_?^X^p@1U8ov2~)(^(MX7LAe3i6$`7@tS3JKwZ? zqRSSq!Wkbfs?RH58@S=+tC-(mb5d$1zZ1V+c|LsS;v8Xb-kI*34qtW){OI{_dYI^J z&#TFwML)Fho^rpH?pRnA`_W)Qe~fi?L;sfZdpF3Q-!OGo#>}VRSSnubD4%cl{~WVx z`zz5`c0YLSn%VoRKPP^gEqqZopv<7?UPOGsjqqjb56E~h@kvSgt)H~h;5gHjM*;`J zf2}y;dsNlnkaVuqk%fnj{^Y2=@<;E+qXU6{ANEYoEcX7D8j|FGx^hlm#Z|zLdH)3y82Aj^XYck1?F5z9p00i_>zopr E0FRnbzyJUM diff --git a/share/qtcreator/welcomescreen/widgets/images/info.png b/share/qtcreator/welcomescreen/widgets/images/info.png deleted file mode 100644 index e595b5fe72bde0265ca2d237bcbd99684bc64d02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmu-d_r9R|Nrk6yVE;mhiCE* zuaq5LDce0kB#6Cq)1CkS|G(ea7tFxGz)=$97tFwITejiu)4$9c(zY=$FobxzIEHXU zCnq>CByJaR7C0+%@#4i*3@Izh85{+fnUh`IuXpu@F|s}56Igt>p>ZiQkBr0(E2}U@ zS0RTUJ%eV}Lj?{RY+3WS3N4Y%Q#i!6V`%^bgMglTlgk$N8w?B#44$rjF6*2UngC>z BM)Cjv diff --git a/share/qtcreator/welcomescreen/widgets/images/info@2x.png b/share/qtcreator/welcomescreen/widgets/images/info@2x.png deleted file mode 100644 index 2d2b95204a70b9327b694d81dc75bf304e6f6d9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8x&b~RuK)l4_e$RCo3_Iz zWxG%6cF)uuo+&%LkdQZw{r~^}<3+(UK_-?2`2{n`8#x3v?mu+n=IhVDG`xOyGB7YK z^>lFz(U_Q=pulI)diLJTRSgd|f4RrnB+X}Fm;5%?V22)q=!RX~tlf$=&o&!0TC*iE zuH0R)K|qJW?BQMO4Vnqs@03{HHR(KZ5X)fTdZEM}!^Cyuo-0#$Bh$_kOxGKjiWRLC zqVkwnzbSFwY2&=(Dm0^8r$9JQBjkb9ov0NDLUZ^I7g*gW{(f(7HTP$k8@~e@U*BNn oQ06dXk~EewP~tMy`pCo(aEsMXYI>po0|Nttr>mdKI;Vst01@?Z>i_@% diff --git a/share/qtcreator/welcomescreen/widgets/images/more.png b/share/qtcreator/welcomescreen/widgets/images/more.png deleted file mode 100644 index 28ce4d5f6af6239f168e94427f7d1a8e0e94d9a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 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 diff --git a/share/qtcreator/welcomescreen/widgets/images/open.png b/share/qtcreator/welcomescreen/widgets/images/open.png deleted file mode 100644 index bfa1089ccd0e0660476d8495e8931506a6d0ce54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3202 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 diff --git a/share/qtcreator/welcomescreen/widgets/images/project.png b/share/qtcreator/welcomescreen/widgets/images/project.png deleted file mode 100644 index 7a0f8b3089be8cc4ff1f47f06d6562e53f941918..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUbqAd{Y}inD z*s1Q2OC1Tmw%?t$_rd)A4;LMIyz=PLqsNaQKmKIxi4!MIJY9F{)T#65&tJH3 z;lj&ZSFc{Z_WIEE>(_7Iym{-^tvh$_+R;wy@nMD%v?7_cFq>JbYl6z z>X^2q`nGt~vuH_U18?aK%`7#WA0O&TejNH^OYl{NcO0iojIW6V`+9p!Y_ZZg?CyO> zLsLy_7PnGDPL|$6d0|@l@?`G0|^_PKxfx*+&&t;ucLK6T~&1|Xw diff --git a/share/qtcreator/welcomescreen/widgets/images/project@2x.png b/share/qtcreator/welcomescreen/widgets/images/project@2x.png deleted file mode 100644 index 1cb309c8965a2f6d9af38384a72e40e946db211f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1420 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2ux_67Kaxc&!&RjXDtG&Ibd zIkTamq41bx!+wW`hKBOpE`5D{4M*K3OqkGc#C7`g=?(iGst>wNojSE`UPHrChbc4r z8;&^4nKP&MkmICDlj;sR)*WzOy?S-sA;)FQmTlX%ZN`ilGiT0Ruz2R?&6^i3TC{H6 zI*{Unjyrbjs5|VmVZ(;HgU+>woazoa)gE@-v}sfAA*U@{wt&nz=v;fyY5Vr=D^{$i zJLFt{$Z6@)rFDm#R<2yRb?er;Lr(RFoazoc9y@ky)22;_4UZ=W4 z&UJ@DE~z`@)OytC?%lih?%k_9xzkc)P&AWH+K6>=1?vPW%Vb{jPZcRr#nvZz49`$KE=GT7AzvFm7=kcJf z6Tv+v!g^0e^qq|CI~CP`DthASxJhRcCZ9=|ayEJTxwIMQGG?C7oO2;>?!|(67Yi3$ zDp`2BY|-WNC0DAJUaeVnwRZW{x-~ai*WPGbf3tJL&F)RN`!?V1-*S86mOB%--<`JO z-t=AfX6=12Z|{To2M!!Kc<|ui!-o$)UUB5ek)ubC9y@mI*poHKpR7IpbnVHLCr>`z zaO%{l)2C0Lezy6{nKNh4o;`Q&-1(O~FJ8QO>C&Z3ul8Mjwg1YMD_5^xz54p#wQJX| zy*_mP`t=((Zrpft^ybZ*w{G3K_4dT=+qZAOJ9X#I9Y}E9zkmP!hYJrLJb3u<;lq!Y zA3b{X`0?Y%pRPT5^5p5$r%ylMeE$6T^Dnobf4TGG#fukT?!J8a^5vI%uU@@+{q514 zH*em(d-v}9vkyOBe*E$3^Ut@Rf4=+j>;3oNpTGb9^5f6fpMSpp{`>3Czu$lV{rUUv z@4x^5{{R2KicO%5fq@~vB*-tAfsvVom5q~!k6%bkTuNF-R#wZv$imv*-r3d7-NVz% z+dCvQG$JZ4F)=wMGb^{Cps={4zNM|Zd(!mjvu4kkvuNe2EjxDZ-hbfO@#Cj2T)cGS z#;v>e9zK5h?8U1$@7}%t@ZrP9&tJZM`|;=R-+%x9{kt-YVI~6u6Q8GxV~B-+?fK{7 zmkK3VKjc@x-~0U@n6QpE*Sftl_4cW6VL@72ohuxg3>-OH6r{JEJ~d^>e^-46=ASof zzt8z?`Fx%`hvKO%@9*t$%M46eb&j>6LsI$ImbIaNTs-ap&wAcn-{{vGU?86uDZq57 z+JWhft@QS%^$)a8#!qL+*{d;`Y2%aa&+X!63T8|UQfTctxc zRSr6SQWo%yt9bNyclN^v7C)IfRMy}BU}$YAGe=RL`NY%QCtiMYl;xRzoZQ{&(0r<{ zV3rB9(I+pB44aKJFd`2)rc&TBJfE%UvUb!C<5Ri=cWKMvlN z3geXVEoGZ*7`He~Q}l0Z$Sb=`(vPodEp@V6xkg1}r`Plf|CJNedvq0VavMg@Troj? r&5LLkU6=JUH!thU3ElJHA9r?L#P)Led3zZc7#KWV{an^LB{Ts5aalE_ diff --git a/share/qtcreator/welcomescreen/widgets/images/qtcreator.png b/share/qtcreator/welcomescreen/widgets/images/qtcreator.png deleted file mode 100644 index 775e1bd83b226d99092e35839bb934ca55b4b5a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1953 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 diff --git a/share/qtcreator/welcomescreen/widgets/images/tab.png b/share/qtcreator/welcomescreen/widgets/images/tab.png deleted file mode 100644 index a3acdd851fedb73186a72e634ba9546a043b5443..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0y~yV31>AV36lvVqjpX=X({vz`)S&>EamTas2HxL%s$B z4%fZ^dvo{$V;_i_sPRd$t2(SL+*;c7PiVo}=7|q=+)m$exm~AGkik)F`l9pQ!BERv z7yHV#ES7!y;{Sz09@`z4P0Hg6D?YSsUT$K1R?K*tz#_9BdTtxFqy!lS0$7eRdmRko zUi0loOiRE%#;}rQS&@9Hdn1`NyQjaYQ{sMiC9ZR(IOBSa4gX@QLm3zt7(8A5T-G@y GGywoFlT0rF diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 080390aad53..c1a2c71350b 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -183,27 +183,13 @@ public: /* Welcome Plugin */ - Welcome_TextColorNormal, - Welcome_TextColorHeading, // #535353 // Sessions, Recent Projects - Welcome_BackgroundColorNormal, // #ffffff - Welcome_DividerColor, // #737373 - Welcome_Button_BorderColorNormal, - Welcome_Button_BorderColorPressed, - Welcome_Button_TextColorNormal, - Welcome_Button_TextColorPressed, - Welcome_Link_TextColorNormal, - Welcome_Link_TextColorActive, - Welcome_Link_BackgroundColor, - Welcome_Caption_TextColorNormal, - Welcome_SideBar_BackgroundColor, - - Welcome_ProjectItem_TextColorFilepath, - Welcome_ProjectItem_BackgroundColorHover, - - Welcome_SessionItem_BackgroundColorNormal, - Welcome_SessionItem_BackgroundColorHover, - Welcome_SessionItemExpanded_BackgroundColorNormal, - Welcome_SessionItemExpanded_BackgroundColorHover, + Welcome_TextColor, + Welcome_ForegroundPrimaryColor, + Welcome_ForegroundSecondaryColor, + Welcome_BackgroundColor, + Welcome_DividerColor, + Welcome_LinkColor, + Welcome_HoverColor, /* VcsBase Plugin */ VcsBase_FileStatusUnknown_TextColor, diff --git a/src/plugins/welcome/images/blogs.png b/src/plugins/welcome/images/blogs.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0bf112f3266f02007fb5a9450a50264a78e3f5 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq9QJf^43UszJ-F9Pl!2k) zBJ;mV-7cxldRw2)nAYjh{NRz+J_lB>&5Kuuw-{sNR{gR%*)8>;+rHg> zYy14U54NiI{W3pyd)C95nfI;>-@9V-y=GS2zv%3oYgWSMMyIR$CzR)=fV}1D>gTe~ HDWM4fR^f4r literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/blogs@2x.png b/src/plugins/welcome/images/blogs@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..48c93a9253f4b1e96cd1f083a4f522d223889c00 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3riJmTwAr_~T6U2jz`f{Rv zzq02$z`)wG>uCB%Ee6K7_s;(iH89{X-FJLF!-|wc@qf4^By!#h1spiAoyqm!s-2U& zYn}#9o$|*yh+(0e?w3U8Ai>Yvv5W$Ha;Lkj`0%rJ<%9qK+xO&^%|6Ji8^O>}Ljz+2E8%a)^*Q|Myd9&LCy)26vc@3*9&M|Xutj}P4S|PkB zN#8moL9xo?lTO=;85~c$_a5hXRn+1AcflREGdnU^R#zP4@4e;kz&cqy?6`+wh(pfH zwog?H8Na^wkx)J(n=t)fL)Jy7mM596E4b1Pw#%Nf?&o-QJuF~j?}Hi1&8!wmdU4tg zN6s9yk>@zhV7bZ9>24w8kw}h2rkj3YAgXk1Tmh#3M ze+9NF9ZnNCxnQvmdCWHF6sRCx!4AQRe>Wp8%o&|~| MPgg&ebxsLQ07QPicmMzZ literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/community.png b/src/plugins/welcome/images/community.png new file mode 100644 index 0000000000000000000000000000000000000000..865a21a7ce4307ea8d47a3759c0cd90dc7029139 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqSbMrShDd}br#LXA?cCv2 z=Ef%SU^Az0L!#=g2K`+PQo9&-E#%=T5&FR|{C%Egua3fviEWFNN>)jPa5GH3&Z#G= RAM6b>&ePS;Wt~$(699-mAkF{) literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/community@2x.png b/src/plugins/welcome/images/community@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f632f3b9cbac9c45780f9c2a3d631c6700efb188 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=JWm(L5R22v2?zKpwj`DR z{msw9Q_=7`nTbnciM&9-fd&6(H!!tvwupHARb0@JsIJI*v_-^1AV|U6gHd0RwTEYM zf<@zh4+gCx_Mhb^Ni1VJe_SK!1s6-&zyJOIjo&B#{~^M$DAPS$;FFN^KYIrCUEBAW S-dxuMa)GC-pUXO@geCx-f;a2{ literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/expandarrow.png b/src/plugins/welcome/images/expandarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1c80e4eaac41ff43b09a465571e5f4ecdcfff1cb GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq7<#%mhDc0J{?X4Sk)bx> z7z5kOg2wo53j3b&w@iC}iHAqXf5KUdbLXl!u3ngFocS_{pDV_3WBX$C_qkkaeD}elF{r5}E*R?l4LK literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/new.png b/src/plugins/welcome/images/new.png new file mode 100644 index 0000000000000000000000000000000000000000..80ccee5d7b05f815c2264b9542d52e1729e7c522 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_HR|W=#|Ns9ly*d9b u0|SGgr;B3Pj{ literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/new@2x.png b/src/plugins/welcome/images/new@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3fca87e14c7eb8ddaea65cf2232ac0018e740a24 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f v85kHuJY5_^IA$jQ_<#JLJ@Zi(GY8ShjP_Acwjs>bu?!%cu6{1-oD!Mm3IsiMAvz8TU)cj6xkwLJ?d?&fgHIIXRza#RA5&QQMwpFd4qkv*i@| d(a&bU!oasbuVnhXcWxk)Jzf1=);T3K0RY?DB@zGt literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/open@2x.png b/src/plugins/welcome/images/open@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d0cfd2555917a8c817b89b8945316ef6e9d6a3a1 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=T2B|p5R21$FCXM>P~d5O zIB$ldSt3)r!J0&yQ+h3tJl!XF=6nef=6~?s_5RlQS<5n?HgGgmi!tdcsgTe~DWM4f_`*b8 literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/project.png b/src/plugins/welcome/images/project.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd5370e7e5e27f2b6a45c715916d19efb8c0e08 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYzI0Jk_Tp1V`%FE0D|NpP? zAS{r9fkDR8#W92lr7|Nqx` z5EjV5z@X&m;us<^H93Nnm1l{egv6!<9!-g6-eU^$tyJDGrQ7<^tt@{RjI!^!q literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/qtaccount@2x.png b/src/plugins/welcome/images/qtaccount@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..96693c819536e1df50dde5fd337bdc3adb98b079 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=&z>%hAr_~TfAq8LE1Av3 zG2?5Eqgb*-()=mu49u;;H$>+=Om1M>xA}%hO=xNZ^Vj?c5uXGHrr-@47o5TtG_QQX zxygq4aWD^Sb)bmBo8ti+#6k~R@vyQ7ipm@dDBur0$jrm~|H#Crs{azJj71_HS*8_4 zw5&jxq=h6 z{pOz4blUQY{%;3z{*p>7%C#bz#_`Pz-z_0eUWdCB`6p?UHx3vIVCg!0Gb(Q A-T(jq literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/session.png b/src/plugins/welcome/images/session.png new file mode 100644 index 0000000000000000000000000000000000000000..7a1e2c51d2562d699d8b91c2c3c3e335de74360e GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq*m}A+hDc0J{?X4Sv4O)t zf$uau>b%7 literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/session@2x.png b/src/plugins/welcome/images/session@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d146a1a3e9ca2385ca59350ee7b01632bc22063e GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=3{Mxw5R22vKl~XCE_gCB z^BD+mi4_S1eE8oZ!^rwS-V($tw`64f|6l)+$^wRyiWVXYGELr$cN8r||9Bi-|6rwR zopztsqw*&{W_#}anb~E(;K8-W0Sz1Eb~CBGKIvm%5@K+mQkcQ$3130*(U5GA-JY&~ JF6*2UngC>IHX8r{ literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/userguide.png b/src/plugins/welcome/images/userguide.png new file mode 100644 index 0000000000000000000000000000000000000000..e23a4c891898c39151f6e28932315683f9d2fd69 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqZ1Qw*43UszJ-F7(nUR6* z!r{Ffvv-@%U_H3&?(`4O4SU#9las53`ln6CC>kG;5D{q7mBn0MvJ zvr3s>*!kPKF^V_lnaGu22VQeun8Cnc+%2>%FP}>z+^A*l{P(#M?zfb0+;4vDtMYaQ m%c+lQ6ID)U28W)_nX2-?yvgs@+;&Z{FFalST-G@yGywo5cw7Pi literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/images/userguide@2x.png b/src/plugins/welcome/images/userguide@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..709e79d5a1f6df2bda8e4fb4a5cead39e3b6b257 GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3r37#&FArg|c2Mx1@6B&*_ zw7(SdW-dpTe(&DrUHW6tScm)gIfWuxuuQ$^3CB$PI8H(A8E z^Qj)^#mloUC|)(QRr+@By1-F2Lq^?rXHjN{4d#lEpUj>9Rz8|v|HKM6g@{Roh0~Ax z>*@&=xUKw3yH33{wpN|#$eJGa1GlA(c^7Cd?z39=>yBQI?DQ`@7HjSFugvPXw3(<;l8*!sGAYSUv8Epv0HHTA5qmJM&sui1j) N$kWx&Wt~$(699&;$R+>) literal 0 HcmV?d00001 diff --git a/src/plugins/welcome/welcome.qrc b/src/plugins/welcome/welcome.qrc index 3d8bff335f2..5321c6ebd46 100644 --- a/src/plugins/welcome/welcome.qrc +++ b/src/plugins/welcome/welcome.qrc @@ -4,5 +4,24 @@ images/mode_welcome@2x.png images/mode_welcome_mask.png images/mode_welcome_mask@2x.png + images/blogs.png + images/blogs@2x.png + images/community.png + images/community@2x.png + images/mode_edit_mask.png + images/open.png + images/open@2x.png + images/project.png + images/project@2x.png + images/qtaccount.png + images/qtaccount@2x.png + images/session.png + images/session@2x.png + images/userguide.png + images/userguide@2x.png + images/new.png + images/new@2x.png + images/expandarrow.png + images/expandarrow@2x.png diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 3fd58e08cd7..43f3df93527 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -48,6 +48,7 @@ #include #include +#include #ifdef USE_QUICK_WIDGET #include @@ -82,6 +83,44 @@ static QString resourcePath() return FileUtils::normalizePathName(ICore::resourcePath()); } +class WelcomeImageIconProvider : public QQuickImageProvider +{ +public: + WelcomeImageIconProvider() + : QQuickImageProvider(Pixmap) + { + } + + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override + { + Q_UNUSED(requestedSize) + + QString maskFile; + Theme::Color themeColor = Theme::Welcome_ForegroundPrimaryColor; + + const QStringList elements = id.split(QLatin1Char('/')); + + if (!elements.empty()) + maskFile = elements.first(); + + if (elements.count() >= 2) { + const static QMetaObject &m = Theme::staticMetaObject; + const static QMetaEnum e = m.enumerator(m.indexOfEnumerator("Color")); + bool success = false; + int value = e.keyToValue(elements.at(1).toLatin1(), &success); + if (success) + themeColor = Theme::Color(value); + } + + const QString fileName = QString::fromLatin1(":/welcome/images/%1.png").arg(maskFile); + const Icon icon({{fileName, themeColor}}, Icon::Tint); + const QPixmap result = icon.pixmap(); + if (size) + *size = result.size(); + return result; + } +}; + class WelcomeMode : public IMode { Q_OBJECT @@ -202,6 +241,7 @@ void WelcomeMode::facilitateQml(QQmlEngine *engine) QStringList importPathList = engine->importPathList(); importPathList << resourcePath() + QLatin1String("/welcomescreen"); engine->setImportPathList(importPathList); + engine->addImageProvider(QLatin1String("icons"), new WelcomeImageIconProvider); if (!debug) engine->setOutputWarningsToStandardError(false); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index b76bade9283..3d8f28d721f 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -855,7 +855,8 @@ id="layer1" style="display:inline"> + id="src/plugins/coreplugin/images/dir" + transform="translate(102,0)"> + id="src/plugins/coreplugin/images/progressbar" + transform="translate(96,0)"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +