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 02618066cb8..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/arrowBig.png and /dev/null differ 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 722f70fb563..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/arrow_down.png and /dev/null differ 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 34421b66bf5..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/arrow_down@2x.png and /dev/null differ 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 c589c349e95..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/arrow_up.png and /dev/null differ 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 7d48c05be7b..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/arrow_up@2x.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/background.png b/share/qtcreator/welcomescreen/widgets/images/background.png deleted file mode 100644 index 33ddf9ed55c..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/background.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/bullet.png b/share/qtcreator/welcomescreen/widgets/images/bullet.png deleted file mode 100644 index c05341e4829..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/bullet.png and /dev/null differ 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 c10b4a6f404..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/blogs.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/clone.png b/share/qtcreator/welcomescreen/widgets/images/icons/clone.png deleted file mode 100644 index 462c8c0e041..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/clone.png and /dev/null differ 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 bdb5cc142e6..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/clone@2x.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/delete.png b/share/qtcreator/welcomescreen/widgets/images/icons/delete.png deleted file mode 100644 index 8b64fec5cbb..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/delete.png and /dev/null differ 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 eb2705644c4..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/delete@2x.png and /dev/null differ 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 37101a045a6..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/onlineCommunity.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qt_account.png b/share/qtcreator/welcomescreen/widgets/images/icons/qt_account.png deleted file mode 100644 index cbf592fcd69..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/qt_account.png and /dev/null differ 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 ba3f283935c..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/qt_cloud.png and /dev/null differ 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 80116d1fead..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/rename.png and /dev/null differ 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 381e6a9e40e..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/rename@2x.png and /dev/null differ 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 c00db7ad65c..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/icons/userGuide.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/info.png b/share/qtcreator/welcomescreen/widgets/images/info.png deleted file mode 100644 index e595b5fe72b..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/info.png and /dev/null differ 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 2d2b95204a7..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/info@2x.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/more.png b/share/qtcreator/welcomescreen/widgets/images/more.png deleted file mode 100644 index 28ce4d5f6af..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/more.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/new.png b/share/qtcreator/welcomescreen/widgets/images/new.png deleted file mode 100644 index c4dbb15d649..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/new.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/open.png b/share/qtcreator/welcomescreen/widgets/images/open.png deleted file mode 100644 index bfa1089ccd0..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/open.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/project.png b/share/qtcreator/welcomescreen/widgets/images/project.png deleted file mode 100644 index 7a0f8b3089b..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/project.png and /dev/null differ 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 1cb309c8965..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/project@2x.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/qtcreator.png b/share/qtcreator/welcomescreen/widgets/images/qtcreator.png deleted file mode 100644 index 775e1bd83b2..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/qtcreator.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/sessions.png b/share/qtcreator/welcomescreen/widgets/images/sessions.png deleted file mode 100644 index 31c5de120a0..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/sessions.png and /dev/null differ diff --git a/share/qtcreator/welcomescreen/widgets/images/tab.png b/share/qtcreator/welcomescreen/widgets/images/tab.png deleted file mode 100644 index a3acdd851fe..00000000000 Binary files a/share/qtcreator/welcomescreen/widgets/images/tab.png and /dev/null differ 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 00000000000..4e0bf112f32 Binary files /dev/null and b/src/plugins/welcome/images/blogs.png differ diff --git a/src/plugins/welcome/images/blogs@2x.png b/src/plugins/welcome/images/blogs@2x.png new file mode 100644 index 00000000000..48c93a9253f Binary files /dev/null and b/src/plugins/welcome/images/blogs@2x.png differ diff --git a/src/plugins/welcome/images/community.png b/src/plugins/welcome/images/community.png new file mode 100644 index 00000000000..865a21a7ce4 Binary files /dev/null and b/src/plugins/welcome/images/community.png differ diff --git a/src/plugins/welcome/images/community@2x.png b/src/plugins/welcome/images/community@2x.png new file mode 100644 index 00000000000..f632f3b9cba Binary files /dev/null and b/src/plugins/welcome/images/community@2x.png differ diff --git a/src/plugins/welcome/images/expandarrow.png b/src/plugins/welcome/images/expandarrow.png new file mode 100644 index 00000000000..1c80e4eaac4 Binary files /dev/null and b/src/plugins/welcome/images/expandarrow.png differ diff --git a/src/plugins/welcome/images/expandarrow@2x.png b/src/plugins/welcome/images/expandarrow@2x.png new file mode 100644 index 00000000000..30b7d23aed7 Binary files /dev/null and b/src/plugins/welcome/images/expandarrow@2x.png differ diff --git a/src/plugins/welcome/images/new.png b/src/plugins/welcome/images/new.png new file mode 100644 index 00000000000..80ccee5d7b0 Binary files /dev/null and b/src/plugins/welcome/images/new.png differ diff --git a/src/plugins/welcome/images/new@2x.png b/src/plugins/welcome/images/new@2x.png new file mode 100644 index 00000000000..3fca87e14c7 Binary files /dev/null and b/src/plugins/welcome/images/new@2x.png differ diff --git a/src/plugins/welcome/images/open.png b/src/plugins/welcome/images/open.png new file mode 100644 index 00000000000..938f1a33321 Binary files /dev/null and b/src/plugins/welcome/images/open.png differ diff --git a/src/plugins/welcome/images/open@2x.png b/src/plugins/welcome/images/open@2x.png new file mode 100644 index 00000000000..d0cfd255591 Binary files /dev/null and b/src/plugins/welcome/images/open@2x.png differ diff --git a/src/plugins/welcome/images/project.png b/src/plugins/welcome/images/project.png new file mode 100644 index 00000000000..1fd5370e7e5 Binary files /dev/null and b/src/plugins/welcome/images/project.png differ diff --git a/src/plugins/welcome/images/project@2x.png b/src/plugins/welcome/images/project@2x.png new file mode 100644 index 00000000000..df357dfa95f Binary files /dev/null and b/src/plugins/welcome/images/project@2x.png differ diff --git a/src/plugins/welcome/images/qtaccount.png b/src/plugins/welcome/images/qtaccount.png new file mode 100644 index 00000000000..40eb4a5f104 Binary files /dev/null and b/src/plugins/welcome/images/qtaccount.png differ diff --git a/src/plugins/welcome/images/qtaccount@2x.png b/src/plugins/welcome/images/qtaccount@2x.png new file mode 100644 index 00000000000..96693c81953 Binary files /dev/null and b/src/plugins/welcome/images/qtaccount@2x.png differ diff --git a/src/plugins/welcome/images/session.png b/src/plugins/welcome/images/session.png new file mode 100644 index 00000000000..7a1e2c51d25 Binary files /dev/null and b/src/plugins/welcome/images/session.png differ diff --git a/src/plugins/welcome/images/session@2x.png b/src/plugins/welcome/images/session@2x.png new file mode 100644 index 00000000000..d146a1a3e9c Binary files /dev/null and b/src/plugins/welcome/images/session@2x.png differ diff --git a/src/plugins/welcome/images/userguide.png b/src/plugins/welcome/images/userguide.png new file mode 100644 index 00000000000..e23a4c89189 Binary files /dev/null and b/src/plugins/welcome/images/userguide.png differ diff --git a/src/plugins/welcome/images/userguide@2x.png b/src/plugins/welcome/images/userguide@2x.png new file mode 100644 index 00000000000..709e79d5a1f Binary files /dev/null and b/src/plugins/welcome/images/userguide@2x.png differ 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)"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +