diff --git a/src/plugins/studiowelcome/qml/welcomepage/AccountImage.qml b/src/plugins/studiowelcome/qml/welcomepage/AccountImage.qml deleted file mode 100644 index b5d5b480937..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/AccountImage.qml +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.9 -import welcome 1.0 -import StudioFonts 1.0 - -Image { - id: account_icon - - source: "images/" + (mouseArea.containsMouse ? "icon_hover.png" : "icon_default.png") - - Text { - id: account - color: mouseArea.containsMouse ? Constants.textHoverColor - : Constants.textDefaultColor - text: qsTr("Account") - anchors.top: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - font.family: StudioFonts.titilliumWeb_regular - font.pixelSize: 16 - renderType: Text.NativeRendering - } - - MouseArea { - id: mouseArea - anchors.fill: parent - anchors.margins: -25 - hoverEnabled: true - - onClicked: Qt.openUrlExternally("https://login.qt.io/login/") - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml deleted file mode 100644 index 2c0852dcb28..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.15 -import QtQuick.Templates 2.15 as Controls -import welcome 1.0 - -Controls.ScrollBar { - id: scrollBar - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - padding: active ? 1 : 2 - visible: orientation === Qt.Horizontal ? contentWidth > width : contentHeight > height - minimumSize: orientation === Qt.Horizontal ? height / width : width / height - - contentItem: Rectangle { - implicitWidth: 13 - implicitHeight: 13 - color: active ? Constants.textHoverColor : Constants.textDefaultColor - } - - background: Rectangle { - implicitWidth: 16 - implicitHeight: 16 - color: "#3b3c3d" - visible: active - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml deleted file mode 100644 index 5c4665554c7..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick.Templates 2.15 as Controls - -Controls.ScrollView { - id: control - - Controls.ScrollBar.vertical: CustomScrollBar { - parent: control - x: control.mirrored ? 0 : control.width - width - y: control.topPadding - height: control.availableHeight - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/ExamplesModel.qml b/src/plugins/studiowelcome/qml/welcomepage/ExamplesModel.qml deleted file mode 100644 index 0258ae2bab5..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/ExamplesModel.qml +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.0 - -ListModel { - ListElement { - projectName: "ClusterTutorial" - qmlFileName: "ClusterTutorial.qml" - thumbnail: "images/tutorialclusterdemo_thumbnail.png" - displayName: "Cluster Tutorial" - } - - ListElement { - projectName: "CoffeeMachine" - qmlFileName: "CoffeeMachine.qml" - thumbnail: "images/coffeemachinedemo_thumbnail.png" - displayName: "Coffee Machine" - } - - ListElement { - projectName: "SideMenu" - qmlFileName: "SideMenu.qml" - thumbnail: "images/sidemenu_demo.png" - displayName: "Side Menu" - } - - ListElement { - projectName: "WebinarDemo" - qmlFileName: "DesignStudioWebinar.qml" - thumbnail: "images/webinardemo_thumbnail.png" - displayName: "Webinar Demo" - } - - ListElement { - projectName: "EBikeDesign" - qmlFileName: "EBikeDesign.qml" - thumbnail: "images/ebike_demo_thumbnail.png" - displayName: "E-Bike Design" - } - - ListElement { - projectName: "ProgressBar" - qmlFileName: "ProgressBar.ui.qml" - thumbnail: "images/progressbar_demo.png" - displayName: "Progress Bar" - } - - ListElement { - projectName: "washingMachineUI" - qmlFileName: "washingMachineUI.qml" - thumbnail: "images/washingmachinedemo_thumbnail.png" - displayName: "Washing Machine" - } - - ListElement { - projectName: "SimpleKeyboard" - qmlFileName: "SimpleKeyboard.qml" - thumbnail: "images/virtualkeyboard_thumbnail.png" - displayName: "Virtual Keyboard" - } - - ListElement { - projectName: "highendivisystem" - qmlFileName: "Screen01.ui.qml" - thumbnail: "images/highendivi_thumbnail.png" - displayName: "Highend IVI System" - url: "https://download.qt.io/learning/examples/qtdesignstudio/highendivisystem.zip" - showDownload: true - } - - ListElement { - projectName: "digitalcluster" - qmlFileName: "Screen01.ui.qml" - thumbnail: "images/digital_cluster_thumbnail.png" - displayName: "Digital Cluster" - url: "https://download.qt.io/learning/examples/qtdesignstudio/digitalcluster.zip" - showDownload: true - } - - ListElement { - projectName: "effectdemo" - qmlFileName: "Screen01.ui.qml" - thumbnail: "images/effectdemo_thumbnail.png" - displayName: "Effect Demo" - url: "https://download.qt.io/learning/examples/qtdesignstudio/effectdemo.zip" - showDownload: true - } - - - ListElement { - projectName: "cppdemoproject" - explicitQmlproject: "qml/qdsproject.qmlproject" - qmlFileName: "Screen01.ui.qml" - thumbnail: "images/cppdemo_thumbnail.png" - displayName: "C++ Demo Project" - url: "https://download.qt.io/learning/examples/qtdesignstudio/cppdemoproject.zip" - showDownload: true - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/HoverOverDesaturate.qml b/src/plugins/studiowelcome/qml/welcomepage/HoverOverDesaturate.qml deleted file mode 100644 index 2973b4caf11..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/HoverOverDesaturate.qml +++ /dev/null @@ -1,194 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.9 -import QtQuick.Timeline 1.0 -import welcome 1.0 -import StudioFonts 1.0 - -Item { - id: root - visible: true - width: 270 - height: 175 - property alias imageSource: image.source - property alias labelText: label.text - - property alias downloadIcon: downloadCloud.visible - - signal clicked() - - onVisibleChanged: { - animateOpacity.start() - animateScale.start() - } - - NumberAnimation { - id: animateOpacity - property: "opacity" - from: 0 - to: 1.0 - duration: 400 - } - NumberAnimation { - id: animateScale - property: "scale" - from: 0 - to: 1.0 - duration: 400 - } - - Rectangle { - id: rectangle - x: 0 - y: 0 - width: 270 - height: 146 - - MouseArea { - x: 17 - y: 12 - height: 125 - anchors.bottomMargin: -label.height - anchors.fill: parent - hoverEnabled: true - onHoveredChanged: { - if (saturationEffect.desaturation === 1) - saturationEffect.desaturation = 0 - if (saturationEffect.desaturation === 0) - saturationEffect.desaturation = 1 - if (saturationEffect.desaturation === 0) - rectangle.color = "#262728" - if (saturationEffect.desaturation === 1) - rectangle.color = "#404244" - if (saturationEffect.desaturation === 0) - label.color = "#686868" - if (saturationEffect.desaturation === 1) - label.color = Constants.textDefaultColor - } - - onExited: { - saturationEffect.desaturation = 1 - rectangle.color = "#262728" - label.color = "#686868" - } - - onClicked: root.clicked() - } - } - - SaturationEffect { - id: saturationEffect - x: 15 - y: 10 - width: 240 - height: 125 - desaturation: 0 - antialiasing: true - Behavior on desaturation { - PropertyAnimation { - } - } - - Image { - id: image - width: 240 - height: 125 - mipmap: true - fillMode: Image.PreserveAspectFit - } - } - - Timeline { - id: animation - startFrame: 0 - enabled: true - endFrame: 1000 - - KeyframeGroup { - target: saturationEffect - property: "desaturation" - - Keyframe { - frame: 0 - value: 1 - } - - Keyframe { - frame: 1000 - value: 0 - } - } - - KeyframeGroup { - target: label - property: "color" - - Keyframe { - value: "#686868" - frame: 0 - } - - Keyframe { - value: Constants.textDefaultColor - frame: 1000 - } - } - - KeyframeGroup { - target: rectangle - property: "color" - - Keyframe { - value: "#262728" - frame: 0 - } - - Keyframe { - value: "#404244" - frame: 1000 - } - } - } - - PropertyAnimation { - id: propertyAnimation - target: animation - property: "currentFrame" - running: false - duration: 1000 - to: animation.endFrame - from: animation.startFrame - loops: 1 - } - - Text { - id: label - x: 1 - y: 145 - color: "#686868" - - renderType: Text.NativeRendering - font.pixelSize: 14 - font.family: StudioFonts.titilliumWeb_regular - } - - Image { - id: downloadCloud - x: 210 - y: 118 - width: 60 - height: 60 - source: "images/downloadCloud.svg" - sourceSize.height: 60 - sourceSize.width: 60 - fillMode: Image.PreserveAspectFit - visible: false - } -} - -/*##^## -Designer { - D{i:0;formeditorZoom:1.3300000429153442}D{i:8} -} -##^##*/ diff --git a/src/plugins/studiowelcome/qml/welcomepage/MyButton.qml b/src/plugins/studiowelcome/qml/welcomepage/MyButton.qml deleted file mode 100644 index 8a4cec4ae59..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/MyButton.qml +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.9 -import QtQuick.Templates 2.3 -import welcome 1.0 -import StudioFonts 1.0 - -Button { - id: button - - property color hoverColor: Constants.textHoverColor - property color defaultColor: Constants.textDefaultColor - property color checkedColor: Constants.textDefaultColor - - text: "test" - - implicitWidth: background.width - implicitHeight: background.height - - contentItem: Text { - id: textButton - text: button.text - - color: checked ? button.checkedColor : - button.hovered ? button.hoverColor : - button.defaultColor - font.family: StudioFonts.titilliumWeb_regular - renderType: Text.NativeRendering - font.pixelSize: 18 - } - - background: Item { - width: textButton.implicitWidth - height: textButton.implicitHeight - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/MyTabButton.qml b/src/plugins/studiowelcome/qml/welcomepage/MyTabButton.qml deleted file mode 100644 index ca93ba47ee8..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/MyTabButton.qml +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.9 - -MyButton { - checkable: true - autoExclusive: true - defaultColor: "#686868" - hoverColor: "#79797C" -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/ProjectsGrid.qml b/src/plugins/studiowelcome/qml/welcomepage/ProjectsGrid.qml deleted file mode 100644 index f543d6bc640..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/ProjectsGrid.qml +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.9 -import welcome 1.0 - -GridView { - id: root - cellHeight: 180 - cellWidth: 285 - - clip: true - - signal itemSelected(int index, variant item) - - delegate: HoverOverDesaturate { - id: hoverOverDesaturate - imageSource: typeof(thumbnail) === "undefined" ? previewUrl : thumbnail - labelText: displayName - downloadIcon: typeof(showDownload) === "undefined" ? false : showDownload; - onClicked: root.itemSelected(index, root.model.get(index)) - - SequentialAnimation { - id: animation - running: hoverOverDesaturate.visible - - PropertyAction { - target: hoverOverDesaturate - property: "scale" - value: 0.0 - } - PauseAnimation { - duration: model.index > 0 ? 100 * model.index : 0 - } - NumberAnimation { - target: hoverOverDesaturate - property: "scale" - from: 0.0 - to: 1.0 - duration: 200 - easing.type: Easing.InOutExpo - } - } - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/SaturationEffect.qml b/src/plugins/studiowelcome/qml/welcomepage/SaturationEffect.qml deleted file mode 100644 index c21ad098e9d..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/SaturationEffect.qml +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.0 - -Item { - id: root - - property real desaturation: 1.0 - - Rectangle { - z: 10 - anchors.fill: parent - color: "#2d2e30" - anchors.margins: -16 - - opacity: root.desaturation * 0.6 - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml b/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml deleted file mode 100644 index afb4fe0d803..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/TutorialsModel.qml +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.0 - -ListModel { - ListElement { - displayName: "The Designer Tool Developers Love" - thumbnail: "images/webinar1.png" - url: "https://youtu.be/gU_tDbebAzM" - } - - ListElement { - displayName: "From Photoshop to Prototype" - thumbnail: "images/webinar2.png" - url: "https://youtu.be/ZzbucmQPU44" - } - - ListElement { - displayName: "Qt for Designers and Developers" - thumbnail: "images/designer_and_developers.png" - url: "https://www.youtube.com/watch?v=EgjCvZWEPWk" - } - - ListElement { - displayName: "QTWS - Designer and Developer Workflow" - thumbnail: "images/qtws_video_thumbnail.png" - url: "https://www.youtube.com/watch?v=4ug0EUdS2RM" - } - - ListElement { - displayName: "QTWS - Turn UI designs into working prototypes" - thumbnail: "images/bridging_the_gap.png" - url: "https://www.youtube.com/watch?v=qQM2oEWRBOw&feature=emb_logo" - } - - ListElement { - displayName: "What's New in Design Studio 1.5" - thumbnail: "images/what_is_new_15.png" - url: "https://www.youtube.com/watch?v=e-HAZrisi5o" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: UI Navigation" - thumbnail: "images/Qt_QT_nav.png" - url: "https://youtu.be/RfEYO-5Mw6s" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: Text Element" - thumbnail: "images/Qt_QT_textElement.png" - url: "https://youtu.be/yOUdg1o2KJM" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: Animated Image" - thumbnail: "images/Qt_QT_animatedImage.png" - url: "https://youtu.be/DVWd_xMMgvg" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: Slider Control" - thumbnail: "images/Qt_QT_sliderControl.png" - url: "https://youtu.be/Ed8WS03C-Vk" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: Bindings" - thumbnail: "images/Qt_QT_bindings.png" - url: "https://youtu.be/UfvA04CIXv0" - } - - ListElement { - displayName: "Qt Design Studio QuickTip: Interactive 3D" - thumbnail: "images/Qt_QT_interactive3d.png" - url: "https://youtu.be/w1yhDl93YI0" - } - - ListElement { - displayName: "Sketch Bridge Tutorial - Part 1" - thumbnail: "images/sketchTutorial_1.png" - url: "https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-1" - } - - ListElement { - displayName: "Sketch Bridge Tutorial - Part 2" - thumbnail: "images/sketchTutorial_2.png" - url: "https://www.qt.io/blog/qt-design-studio-sketch-bridge-tutorial-part-2" - } - - ListElement { - displayName: "Create New Project" - thumbnail: "images/gettingStarted_newProject.png" - url: "https://youtu.be/9ihYeC0YJ0M" - } - - ListElement { - displayName: "Using Qt Quick 3D Components" - thumbnail: "images/gettingStarted_3dComponents.png" - url: "https://youtu.be/u3kZJjlk3CY" - } - - ListElement { - displayName: "Using Custom Shaders, Materials, and Effects" - thumbnail: "images/gettingStarted_shaders.png" - url: "https://youtu.be/bMXeeQw6BYs" - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_animatedImage.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_animatedImage.png deleted file mode 100644 index b374319a3e9..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_animatedImage.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_bindings.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_bindings.png deleted file mode 100644 index a750dce19a3..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_bindings.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_interactive3d.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_interactive3d.png deleted file mode 100644 index 28c05655ceb..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_interactive3d.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_nav.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_nav.png deleted file mode 100644 index 50cc98b56b3..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_nav.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_sliderControl.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_sliderControl.png deleted file mode 100644 index 158dfa7dd73..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_sliderControl.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_textElement.png b/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_textElement.png deleted file mode 100644 index 784a3c57ba2..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/Qt_QT_textElement.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png b/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png deleted file mode 100644 index 2702abf417f..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/bridging_the_gap.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/coffeemachinedemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/coffeemachinedemo_thumbnail.png deleted file mode 100644 index ced7ae80d1f..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/coffeemachinedemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/cppdemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/cppdemo_thumbnail.png deleted file mode 100644 index f92be7f50fb..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/cppdemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/designer_and_developers.png b/src/plugins/studiowelcome/qml/welcomepage/images/designer_and_developers.png deleted file mode 100644 index 870a597282f..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/designer_and_developers.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/digital_cluster_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/digital_cluster_thumbnail.png deleted file mode 100644 index afad8c8c7b8..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/digital_cluster_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/downloadCloud.svg b/src/plugins/studiowelcome/qml/welcomepage/images/downloadCloud.svg deleted file mode 100644 index 3a527c3e54f..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/images/downloadCloud.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/ebike_demo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/ebike_demo_thumbnail.png deleted file mode 100644 index 67cf3b9bff0..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/ebike_demo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/effectdemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/effectdemo_thumbnail.png deleted file mode 100644 index 505c02e88e9..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/effectdemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_3dComponents.png b/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_3dComponents.png deleted file mode 100644 index 9708bff0832..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_3dComponents.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_newProject.png b/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_newProject.png deleted file mode 100644 index 812b412b0a5..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_newProject.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_shaders.png b/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_shaders.png deleted file mode 100644 index 70e17747049..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/gettingStarted_shaders.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/highendivi_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/highendivi_thumbnail.png deleted file mode 100644 index 5428c80776e..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/highendivi_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/icon_default.png b/src/plugins/studiowelcome/qml/welcomepage/images/icon_default.png deleted file mode 100644 index 82b852a408c..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/icon_default.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/icon_hover.png b/src/plugins/studiowelcome/qml/welcomepage/images/icon_hover.png deleted file mode 100644 index 693fdaf7b5a..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/icon_hover.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/progressbar_demo.png b/src/plugins/studiowelcome/qml/welcomepage/images/progressbar_demo.png deleted file mode 100644 index b1af2d8f410..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/progressbar_demo.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/qtws_video_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/qtws_video_thumbnail.png deleted file mode 100644 index e24783aee01..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/qtws_video_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/sidemenu_demo.png b/src/plugins/studiowelcome/qml/welcomepage/images/sidemenu_demo.png deleted file mode 100644 index b577ed4a0db..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/sidemenu_demo.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_1.png b/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_1.png deleted file mode 100644 index 2285b93d642..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_1.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_2.png b/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_2.png deleted file mode 100644 index fec8c65ea39..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/sketchTutorial_2.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/thumbnail_test.png b/src/plugins/studiowelcome/qml/welcomepage/images/thumbnail_test.png deleted file mode 100644 index 3c4834e6448..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/thumbnail_test.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/tutorialclusterdemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/tutorialclusterdemo_thumbnail.png deleted file mode 100644 index 925a1247ca6..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/tutorialclusterdemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/virtualkeyboard_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/virtualkeyboard_thumbnail.png deleted file mode 100644 index 20471299a9a..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/virtualkeyboard_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/washingmachinedemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/washingmachinedemo_thumbnail.png deleted file mode 100644 index b5246626c50..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/washingmachinedemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/webinar1.png b/src/plugins/studiowelcome/qml/welcomepage/images/webinar1.png deleted file mode 100644 index ba24ffc3bf2..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/webinar1.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/webinar2.png b/src/plugins/studiowelcome/qml/welcomepage/images/webinar2.png deleted file mode 100644 index 325c7cdc33e..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/webinar2.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/webinardemo_thumbnail.png b/src/plugins/studiowelcome/qml/welcomepage/images/webinardemo_thumbnail.png deleted file mode 100644 index 3cd777ab3fc..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/webinardemo_thumbnail.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png b/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png deleted file mode 100644 index 8fb3f072872..00000000000 Binary files a/src/plugins/studiowelcome/qml/welcomepage/images/what_is_new_15.png and /dev/null differ diff --git a/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/Constants.qml b/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/Constants.qml deleted file mode 100644 index a6d040aded8..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/Constants.qml +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -pragma Singleton - -import QtQuick 2.6 -import StudioFonts 1.0 - -QtObject { - readonly property color backgroundColor: "#443224" - - readonly property color textDefaultColor: "#b9b9ba" - - readonly property color textHoverColor: "#ffffff" -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/qmldir b/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/qmldir deleted file mode 100644 index 616ac203530..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/imports/welcome/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton Constants 1.0 Constants.qml diff --git a/src/plugins/studiowelcome/qml/welcomepage/main.qml b/src/plugins/studiowelcome/qml/welcomepage/main.qml deleted file mode 100644 index 6fb5763d7f4..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/main.qml +++ /dev/null @@ -1,182 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.10 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.3 -import welcome 1.0 -import projectmodel 1.0 -import StudioFonts 1.0 - -Item { - width: 1024 - height: 786 - - Rectangle { - id: rectangle - anchors.fill: parent - visible: true - color: "#2d2e30" - - StackLayout { - id: stackLayout - anchors.margins: 10 - anchors.top: topLine.bottom - anchors.bottom: bottomLine.top - anchors.right: parent.right - anchors.left: parent.left - - CustomScrollView { - ProjectsGrid { - model: ProjectModel { - id: projectModel - } - onItemSelected: function(index, item) { projectModel.openProjectAt(index) } - } - } - - CustomScrollView { - ProjectsGrid { - model: ExamplesModel {} - onItemSelected: function(index, item) { - projectModel.openExample(item.projectName, item.qmlFileName, item.url, item.explicitQmlproject) - } - } - } - - CustomScrollView{ - ProjectsGrid { - model: TutorialsModel {} - onItemSelected: function(index, item) { Qt.openUrlExternally(item.url) } - } - } - } - Rectangle { - id: topLine - height: 1 - color: "#bababa" - anchors.right: parent.right - anchors.rightMargin: 10 - anchors.left: parent.left - anchors.leftMargin: 10 - anchors.top: parent.top - anchors.topMargin: 200 - } - - Rectangle { - id: bottomLine - height: 1 - color: "#bababa" - anchors.left: topLine.left - anchors.right: topLine.right - anchors.bottom: parent.bottom - anchors.bottomMargin: 60 - } - - Row { - x: 8 - y: 160 - spacing: 26 - - MyTabButton { - text: qsTr("Recent Projects") - checked: true - onClicked: stackLayout.currentIndex = 0 - } - - MyTabButton { - text: qsTr("Examples") - onClicked: stackLayout.currentIndex = 1 - } - - MyTabButton { - text: qsTr("Tutorials") - onClicked: stackLayout.currentIndex = 2 - } - } - - AccountImage { - id: account - x: 946 - y: 29 - anchors.right: parent.right - anchors.rightMargin: 40 - } - - GridLayout { - y: 78 - anchors.horizontalCenter: parent.horizontalCenter - columnSpacing: 10 - rows: 2 - columns: 2 - - Text { - id: welcomeTo - color: Constants.textDefaultColor - text: qsTr("Welcome to") - renderType: Text.NativeRendering - font.pixelSize: 22 - font.family: StudioFonts.titilliumWeb_regular - } - - Text { - id: qtDesignStudio - color: "#4cd265" - text: qsTr("Qt Design Studio") - renderType: Text.NativeRendering - font.family: StudioFonts.titilliumWeb_regular - font.pixelSize: 22 - } - - MyButton { - text: qsTr("Create New") - onClicked: projectModel.createProject() - } - - MyButton { - text: qsTr("Open Project") - onClicked: projectModel.openProject() - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter - } - } - - RowLayout { - y: 732 - height: 28 - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - anchors.bottomMargin: 26 - spacing: 50 - - MyButton { - text: qsTr("Help") - onClicked: projectModel.showHelp() - } - - MyButton { - text: qsTr("Community") - onClicked: Qt.openUrlExternally("https://forum.qt.io/") - } - - MyButton { - text: qsTr("Blog") - onClicked: Qt.openUrlExternally("http://blog.qt.io/") - } - } - - Text { - id: qtDesignStudio1 - x: 891 - y: 171 - color: "#ffffff" - text: qsTr("Community Edition") - anchors.right: parent.right - anchors.rightMargin: 23 - font.weight: Font.Light - font.pixelSize: 14 - font.family: StudioFonts.titilliumWeb_regular - renderType: Text.NativeRendering - visible: projectModel.communityVersion - } - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/ProjectModel.qml b/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/ProjectModel.qml deleted file mode 100644 index 2ebd25183ea..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/ProjectModel.qml +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.0 - -ListModel { - - property bool communityVersion: true - ListElement { - displayName: "Project 01" - prettyFilePath: "my_file_1" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 02" - prettyFilePath: "my_file_2" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 03" - prettyFilePath: "my_file_3" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 04" - prettyFilePath: "my_file_4" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 05" - prettyFilePath: "my_file_5" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 06" - prettyFilePath: "my_file_6" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 07" - prettyFilePath: "my_file_7" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 08" - filename: "my_file_8" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 09" - filename: "my_file_9" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 10" - prettyFilePath: "my_file_10" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 11" - filename: "my_file_11" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 12" - prettyFilePath: "my_file_12" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 13" - filename: "my_file_13" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 14" - prettyFilePath: "my_file_14" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 15" - filename: "my_file_15" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 16" - filename: "my_file_16" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 17" - filename: "my_file_17" - thumbnail: "images/thumbnail_test.png" - } - - ListElement { - displayName: "Project 18" - prettyFilePath: "my_file_18" - thumbnail: "images/thumbnail_test.png" - } -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/qmldir b/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/qmldir deleted file mode 100644 index 0d7bc345c2b..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/mockData/projectmodel/qmldir +++ /dev/null @@ -1 +0,0 @@ -ProjectModel 1.0 ProjectModel.qml diff --git a/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/UsageStatisticModel.qml b/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/UsageStatisticModel.qml deleted file mode 100644 index 26795b93753..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/UsageStatisticModel.qml +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QtQuick 2.0 - -QtObject { - property bool usageStatisticEnabled: false - property string version: "3.3.0" -} diff --git a/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/qmldir b/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/qmldir deleted file mode 100644 index c83a43a8ae7..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/mockData/usagestatistics/qmldir +++ /dev/null @@ -1 +0,0 @@ -UsageStatisticModel 1.0 UsageStatisticModel.qml diff --git a/src/plugins/studiowelcome/qml/welcomepage/welcomepage.qmlproject b/src/plugins/studiowelcome/qml/welcomepage/welcomepage.qmlproject deleted file mode 100644 index c28a3e390d5..00000000000 --- a/src/plugins/studiowelcome/qml/welcomepage/welcomepage.qmlproject +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -import QmlProject 1.1 - -Project { - mainFile: "main.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } - /* List of plugin directories passed to QML runtime */ - importPaths: [ "imports", "mockData", "../../../../share/3rdparty/studiofonts" ] - - Environment { - QT_AUTO_SCREEN_SCALE_FACTOR: "1" - } -} diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 447f62dccba..fa15bc44e95 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -73,14 +73,6 @@ using namespace Utils; namespace StudioWelcome { namespace Internal { -static bool useNewWelcomePage() -{ - QtcSettings *settings = Core::ICore::settings(); - const Key newWelcomePageEntry = "QML/Designer/NewWelcomePage"; //entry from qml settings - - return settings->value(newWelcomePageEntry, false).toBool(); -} - static void openOpenProjectDialog() { const FilePath path = Core::DocumentManager::useProjectsDirectory() @@ -814,19 +806,6 @@ WelcomeMode::~WelcomeMode() void WelcomeMode::setupQuickWidget(const QString &welcomePagePath) { - if (!useNewWelcomePage()) { - -#ifdef QT_DEBUG - m_quickWidget->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH) - + "welcomepage/imports"); - m_quickWidget->setSource( - QUrl::fromLocalFile(QLatin1String(STUDIO_QML_PATH) + "welcomepage/main.qml")); -#else - m_quickWidget->rootContext()->setContextProperty("$dataModel", m_dataModelDownloader); - m_quickWidget->engine()->addImportPath("qrc:/qml/welcomepage/imports"); - m_quickWidget->setSource(QUrl("qrc:/qml/welcomepage/main.qml")); -#endif - } else { m_quickWidget->rootContext()->setContextProperty("$dataModel", m_dataModelDownloader); m_quickWidget->engine()->addImportPath(Core::ICore::resourcePath("qmldesigner/propertyEditorQmlSources/imports").toString()); @@ -843,7 +822,6 @@ void WelcomeMode::setupQuickWidget(const QString &welcomePagePath) connect(updateShortcut, &QShortcut::activated, this, [this, welcomePagePath](){ m_quickWidget->setSource(QUrl::fromLocalFile(welcomePagePath + "/main.qml")); }); - } } void WelcomeMode::createQuickWidget()