Commit 0ae420d0 authored by Thomas Hartmann's avatar Thomas Hartmann

WelcomePage: redesign of welcome page

Change-Id: Iec777d4fcf86f1807e17a5be777698b64ce15555
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 647726fd
......@@ -32,33 +32,17 @@ import widgets 1.0
Rectangle {
id: rectangle1
width: 900
width: parent.width
height: 600
PageCaption {
id: pageCaption
x: 32
y: 8
anchors.rightMargin: 16
anchors.right: parent.right
anchors.leftMargin: 16
anchors.left: parent.left
caption: qsTr("Develop")
}
Item {
id: canvas
x: 12
y: 0
width: 1024
anchors.bottomMargin: 0
anchors.bottom: parent.bottom
anchors.top: parent.top
anchors.fill: parent
anchors.topMargin: 0
Rectangle {
......@@ -73,12 +57,12 @@ Rectangle {
}
RecentProjects {
x: 406
y: 144
width: 481
x: 428
height: 432
id: recentProjects
anchors.leftMargin: 12
anchors.left: recentProjectsTitle.left
anchors.top: recentProjectsTitle.bottom
......@@ -86,7 +70,7 @@ Rectangle {
anchors.bottom: parent.bottom
anchors.bottomMargin: 40
anchors.right: parent.right
anchors.rightMargin: 80
anchors.rightMargin: 60
model: projectList
}
......@@ -105,8 +89,8 @@ Rectangle {
NativeText {
id: sessionsTitle
x: pageCaption.x + pageCaption.textOffset
y: 105
x: 32
y: 128
color: "#535353"
text: qsTr("Sessions")
......@@ -119,7 +103,7 @@ Rectangle {
id: recentProjectsTitle
x: 406
y: 105
y: 128
color: "#535353"
text: qsTr("Recent Projects")
anchors.left: sessionsTitle.right
......@@ -139,42 +123,33 @@ Rectangle {
anchors.topMargin: 42
anchors.top: sessions.bottom
}
Button {
y: 51
text: qsTr("New Project")
anchors.left: sessionsTitle.left
onClicked: projectWelcomePage.newProject();
iconSource: "widgets/images/new.png"
LinkedText {
id: openProject
x: 51
y: 45
text: qsTr("Open Project")
onClicked: projectWelcomePage.openProject();
}
LinkedText {
id: createProject
x: 51
y: 13
text: qsTr("Create Project")
onClicked: projectWelcomePage.newProject();
}
Image {
id: icon02
y: 32
source: "widgets/images/icons/openIcon.png"
}
Image {
id: icon01
source: "widgets/images/icons/createIcon.png"
}
}
Button {
y: 51
text: qsTr("Open Project")
anchors.left: recentProjectsTitle.left
onClicked: projectWelcomePage.openProject();
iconSource: "widgets/images/open.png"
}
Sessions {
id: sessions
x: 87
x: 96
y: 144
width: 274
anchors.leftMargin: 12
anchors.left: sessionsTitle.left
anchors.right: recentProjectsTitle.left
anchors.rightMargin: 40
......
......@@ -31,11 +31,7 @@ import QtQuick 2.1
ListModel {
ListElement {
title: "Getting Started"
pageLocation: "../gettingstarted.qml"
}
ListElement {
title: "Develop"
title: "Projects"
pageLocation: "../develop.qml"
}
ListElement {
......
......@@ -35,25 +35,11 @@ Rectangle {
width: 1024
height: Math.min(3024, parent.height - y)
PageCaption {
id: pageCaption
x: 32
y: 8
anchors.rightMargin: 16
anchors.right: parent.right
anchors.leftMargin: 16
anchors.left: parent.left
caption: qsTr("Examples")
}
CustomizedGridView {
anchors.rightMargin: 38
anchors.bottomMargin: 60
anchors.leftMargin: 38
anchors.topMargin: 102
anchors.topMargin: 82
anchors.fill: parent
model: examplesModel
......@@ -62,7 +48,7 @@ Rectangle {
SearchBar {
id: searchBar
y: 60
y: 52
anchors.right: comboBox.left
anchors.rightMargin: 20
......
......@@ -35,25 +35,11 @@ Rectangle {
width: 1024
height: Math.min(3024, parent.height - y)
PageCaption {
id: pageCaption
x: 32
y: 8
anchors.rightMargin: 16
anchors.right: parent.right
anchors.leftMargin: 16
anchors.left: parent.left
caption: qsTr("Tutorials")
}
CustomizedGridView {
anchors.rightMargin: 38
anchors.bottomMargin: 60
anchors.leftMargin: 38
anchors.topMargin: 102
anchors.topMargin: 82
anchors.fill: parent
model: tutorialsModel
......@@ -62,7 +48,7 @@ Rectangle {
SearchBar {
id: searchBar
y: 60
y: 52
anchors.right: parent.right
anchors.rightMargin: 60
......
......@@ -39,52 +39,33 @@ Rectangle {
property var fonts: CustomFonts {}
property var colors: CustomColors { }
Rectangle {
id: canvas
width: Math.min(1024, parent.width)
SideBar {
id: sideBar
model: pagesModel
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
PageLoader {
anchors.fill: parent
anchors.topMargin: 76
model: pagesModel
}
CustomTab {
id: tab
x: 578
y: 96
anchors.right: parent.right
anchors.rightMargin: 36
model: pagesModel
}
}
Logo {
x: 25
y: 14
}
Rectangle {
color: "#737373"
width: 1
height: parent.height
Rectangle {
visible: root.width > 1042
width: 2
color: "#cdcdcd"
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
}
anchors.right: sideBar.right
}
Rectangle {
visible: root.width > 1042
width: 2
color: "#cdcdcd"
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
}
QtObject {
id: tab
property int currentIndex: sideBar.currentIndex
}
PageLoader {
anchors.top: parent.top
model: pagesModel
anchors.bottom: parent.bottom
anchors.left: sideBar.right
anchors.right: parent.right
}
}
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
Button {
id: button
style: touchStyle
iconSource: ""
Component {
id: touchStyle
ButtonStyle {
background: Item {
Image {
id: icon
z: 1
x: 4
y: -6
width: 32
height: 32
source: button.iconSource
visible: button.iconSource != ""
}
implicitHeight: 30
implicitWidth: 160
Rectangle {
anchors.fill: parent
antialiasing: true
radius: 3
visible: !(control.pressed || control.checked)
gradient: Gradient {
GradientStop {
position: 0
color: "#f9f9f9"
}
GradientStop {
position: 0.49
color: "#f9f9f9"
}
GradientStop {
position: 0.5
color: "#eeeeee"
}
GradientStop {
position: 1
color: "#eeeeee"
}
}
border.color: "#737373"
}
Rectangle {
anchors.fill: parent
antialiasing: true
radius: 3
visible: control.pressed || control.checked
gradient: Gradient {
GradientStop {
position: 0.00;
color: "#4c4c4c";
}
GradientStop {
position: 0.49;
color: "#4c4c4c";
}
GradientStop {
position: 0.50;
color: "#424242";
}
GradientStop {
position: 1.00;
color: "#424242";
}
}
border.color: "#333333"
}
}
label: Text {
x: button.iconSource != "" ? 38 : 14
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
text: control.text
color: control.pressed || control.checked ? "lightGray" : "black"
font.pixelSize: 15
font.bold: true
smooth: true
}
}
}
}
......@@ -30,8 +30,8 @@
import QtQuick 2.1
QtObject {
property color linkColor: "#445ba8"
property color linkColor: "#328930"
//property color linkColor: "#70b332"
//property color strongForegroundColor: "#58595b"
property color strongForegroundColor: "#445ba8"
property color strongForegroundColor: "#328930"
}
......@@ -43,7 +43,7 @@ QtObject {
id: smallPathText
visible: false
font.pixelSize: 12
font.pixelSize: 13
font.family: "Helvetica"
},
......
......@@ -34,18 +34,6 @@ Rectangle {
height: 240
width: 216
Rectangle {
id: highlight
radius: 6
visible: isHighlighted
color: colors.strongForegroundColor
anchors.fill: parent
anchors.topMargin: 2
anchors.leftMargin: 4
anchors.rightMargin: 4
anchors.bottomMargin: 73
}
property alias caption: captionItem.text
property alias imageSource: imageItem.source
property alias videoSource: videoIcon.source
......
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
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
}
}
}
}
......@@ -31,7 +31,7 @@ import QtQuick 2.1
Item {
id: projectItem
width: 480
width: projectList.width
height: 32
Rectangle {
......@@ -44,15 +44,17 @@ Item {
property alias projectPath: pathText.text
Image {
source: "images/bullet.png"
source: "images/project.png"
anchors.verticalCenter: projectNameText.verticalCenter
width: 12
height: 12
}
LinkedText {
id: projectNameText
y: 2
anchors.left: parent.left
anchors.leftMargin: 8
anchors.leftMargin: 7 + 12
anchors.right: parent.right
anchors.rightMargin: 4
onClicked: projectWelcomePage.requestProject(filePath)
......@@ -65,7 +67,7 @@ Item {
anchors.right: parent.right
anchors.rightMargin: 12
anchors.left: parent.left
anchors.leftMargin: 8
anchors.leftMargin: 7 + 12
font: fonts.smallPath
elide: Text.ElideRight
MouseArea {
......
......@@ -44,13 +44,13 @@ Item {
id: row1
height: text.height + 8
spacing: 4
spacing: 7
Image {
anchors.verticalCenter: text.verticalCenter
source: "images/bullet.png"
Rectangle {
width: 16
height: 16
color: "#7e7e7e"
}
LinkedText {
id: text
......
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to