2021-11-09 18:58:15 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** Copyright (C) 2021 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.Window
|
|
|
|
|
|
|
|
|
|
import QtQuick
|
|
|
|
|
import QtQuick.Layouts
|
|
|
|
|
import QtQuick.Controls
|
|
|
|
|
import StudioTheme as StudioTheme
|
|
|
|
|
import StudioControls as SC
|
|
|
|
|
|
|
|
|
|
import NewProjectDialog
|
|
|
|
|
|
|
|
|
|
Item {
|
2021-11-23 21:05:02 +02:00
|
|
|
id: rootDialog
|
2021-11-09 18:58:15 +02:00
|
|
|
width: DialogValues.dialogWidth
|
|
|
|
|
height: DialogValues.dialogHeight
|
|
|
|
|
|
|
|
|
|
Rectangle { // the main dialog panel
|
|
|
|
|
anchors.fill: parent
|
|
|
|
|
color: DialogValues.darkPaneColor
|
|
|
|
|
|
|
|
|
|
ColumnLayout {
|
|
|
|
|
anchors.fill: parent
|
|
|
|
|
|
|
|
|
|
Layout.alignment: Qt.AlignHCenter
|
|
|
|
|
spacing: 0
|
|
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { width: parent.width; height: 20 } // spacer
|
|
|
|
|
|
2021-11-09 18:58:15 +02:00
|
|
|
Item { // Header Item
|
|
|
|
|
Layout.fillWidth: true
|
2021-11-23 21:05:02 +02:00
|
|
|
implicitHeight: 164
|
2021-11-09 18:58:15 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
ColumnLayout {
|
2021-11-09 18:58:15 +02:00
|
|
|
anchors.fill: parent
|
|
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { width: parent.width; implicitHeight: 20 } // spacer
|
2021-11-23 21:05:02 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Row {
|
2021-11-09 18:58:15 +02:00
|
|
|
width: parent.width
|
2021-11-23 21:05:02 +02:00
|
|
|
height: DialogValues.dialogTitleTextHeight
|
2021-11-23 21:05:02 +02:00
|
|
|
|
|
|
|
|
Item { width: DialogValues.dialogLeftPadding; height: 1 } // horizontal spacer
|
|
|
|
|
|
|
|
|
|
Image {
|
|
|
|
|
asynchronous: false
|
|
|
|
|
source: "image://newprojectdialog_library/logo"
|
|
|
|
|
width: DialogValues.logoWidth
|
|
|
|
|
height: DialogValues.logoHeight
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Item { width: 10; height: 1 }
|
|
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Text {
|
2021-11-23 21:05:02 +02:00
|
|
|
text: qsTr("Let's create something wonderful with ")
|
2021-11-23 21:05:02 +02:00
|
|
|
font.pixelSize: DialogValues.dialogTitlePixelSize
|
|
|
|
|
font.family: "Titillium Web"
|
|
|
|
|
height: DialogValues.dialogTitleTextHeight
|
|
|
|
|
lineHeight: DialogValues.dialogTitleLineHeight
|
|
|
|
|
lineHeightMode: Text.FixedHeight
|
|
|
|
|
color: DialogValues.textColor
|
2021-11-23 21:05:02 +02:00
|
|
|
verticalAlignment: Text.AlignVCenter
|
2021-11-23 21:05:02 +02:00
|
|
|
}
|
2021-11-09 18:58:15 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Text {
|
2021-11-23 21:05:02 +02:00
|
|
|
text: qsTr("Qt Design Studio!")
|
2021-11-23 21:05:02 +02:00
|
|
|
font.pixelSize: DialogValues.dialogTitlePixelSize
|
|
|
|
|
font.family: "Titillium Web"
|
|
|
|
|
height: DialogValues.dialogTitleTextHeight
|
|
|
|
|
lineHeight: DialogValues.dialogTitleLineHeight
|
|
|
|
|
lineHeightMode: Text.FixedHeight
|
2021-11-23 21:05:02 +02:00
|
|
|
color: DialogValues.brandTextColor
|
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
2021-11-23 21:05:02 +02:00
|
|
|
}
|
2021-11-23 21:05:02 +02:00
|
|
|
} // Row
|
2021-11-09 18:58:15 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { width: 1; height: 11 } // spacer
|
|
|
|
|
|
|
|
|
|
Item {
|
2021-11-09 18:58:15 +02:00
|
|
|
width: parent.width
|
2021-11-23 21:05:02 +02:00
|
|
|
height: DialogValues.paneTitleLineHeight
|
|
|
|
|
Row {
|
|
|
|
|
width: parent.width
|
|
|
|
|
height: DialogValues.paneTitleLineHeight
|
2021-11-23 21:05:02 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { width: DialogValues.dialogLeftPadding; height: 1} // spacer
|
|
|
|
|
|
|
|
|
|
Text {
|
|
|
|
|
width: parent.width - DialogValues.dialogLeftPadding
|
|
|
|
|
text: qsTr("Create new project by selecting a suitable Preset and then adjust details.")
|
|
|
|
|
color: DialogValues.textColor
|
|
|
|
|
font.pixelSize: DialogValues.paneTitlePixelSize
|
|
|
|
|
lineHeight: DialogValues.paneTitleLineHeight
|
|
|
|
|
lineHeightMode: Text.FixedHeight
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { width: parent.width; Layout.fillHeight: true} // spacer
|
|
|
|
|
} // ColumnLayout
|
2021-11-09 18:58:15 +02:00
|
|
|
} // Header Item
|
|
|
|
|
|
|
|
|
|
Item { // Content Item
|
|
|
|
|
Layout.fillWidth: true
|
|
|
|
|
Layout.fillHeight: true
|
|
|
|
|
|
|
|
|
|
RowLayout {
|
2021-11-23 21:05:02 +02:00
|
|
|
x: DialogValues.dialogLeftPadding
|
2021-11-09 18:58:15 +02:00
|
|
|
width: parent.width - 70
|
|
|
|
|
height: parent.height
|
|
|
|
|
spacing: 0
|
|
|
|
|
|
|
|
|
|
Rectangle { // Left pane
|
|
|
|
|
color: DialogValues.lightPaneColor
|
|
|
|
|
Layout.fillWidth: true
|
|
|
|
|
Layout.fillHeight: true
|
|
|
|
|
Layout.minimumWidth: 379 // figured out this number visually
|
2021-11-23 21:05:02 +02:00
|
|
|
Layout.minimumHeight: 261 // figured out this number visually
|
2021-11-23 21:05:02 +02:00
|
|
|
radius: 6
|
2021-11-09 18:58:15 +02:00
|
|
|
|
|
|
|
|
Column {
|
|
|
|
|
x: DialogValues.defaultPadding // left padding
|
|
|
|
|
width: parent.width - DialogValues.defaultPadding * 2 // right padding
|
|
|
|
|
height: parent.height
|
|
|
|
|
|
|
|
|
|
Text {
|
|
|
|
|
text: qsTr("Presets")
|
|
|
|
|
width: parent.width
|
2021-11-23 21:05:02 +02:00
|
|
|
height: 47
|
2021-11-09 18:58:15 +02:00
|
|
|
font.weight: Font.DemiBold
|
|
|
|
|
font.pixelSize: DialogValues.paneTitlePixelSize
|
|
|
|
|
lineHeight: DialogValues.paneTitleLineHeight
|
|
|
|
|
lineHeightMode: Text.FixedHeight
|
|
|
|
|
color: DialogValues.textColor
|
2021-11-23 21:05:02 +02:00
|
|
|
verticalAlignment: Qt.AlignVCenter
|
2021-11-09 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Rectangle { // TabBar
|
|
|
|
|
readonly property int animDur: 500
|
2021-12-01 19:30:34 +02:00
|
|
|
id: tabBar
|
2021-11-23 21:05:02 +02:00
|
|
|
x: 10 // left padding
|
|
|
|
|
width: parent.width - 64 // right padding
|
|
|
|
|
height: DialogValues.projectViewHeaderHeight
|
|
|
|
|
color: DialogValues.lightPaneColor
|
|
|
|
|
|
|
|
|
|
Row {
|
|
|
|
|
id: tabBarRow
|
|
|
|
|
spacing: 20
|
|
|
|
|
property int currIndex: 0
|
|
|
|
|
|
|
|
|
|
Repeater {
|
|
|
|
|
model: categoryModel
|
|
|
|
|
Text {
|
|
|
|
|
text: name
|
|
|
|
|
font.weight: Font.DemiBold
|
|
|
|
|
font.pixelSize: DialogValues.viewHeaderPixelSize
|
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
|
color: tabBarRow.currIndex === index ? DialogValues.textColorInteraction
|
|
|
|
|
: DialogValues.textColor
|
2021-12-01 19:30:34 +02:00
|
|
|
Behavior on color { ColorAnimation { duration: tabBar.animDur } }
|
2021-11-23 21:05:02 +02:00
|
|
|
|
|
|
|
|
MouseArea {
|
|
|
|
|
anchors.fill: parent
|
|
|
|
|
onClicked: {
|
|
|
|
|
tabBarRow.currIndex = index
|
QDS-5691 Create a tab for Recent choices
The Recents should store presets, rather than normal project items,
while the rest of tabs are to store normal project (i.e. wizard) items
but with the default screen size written under the wizard name.
In this patch I also did a few renames: e.g. the Presets view now uses a
PresetModel rather than ProjectModel, because we now store presets. A
Preset is a higher level concept than Project / Wizard item: it can be a
project/wizard item with pre-defined configurations; and now we can have
multiple presets using the same Wizard factory. Renamed struct
ProjectCategory to WizardCategory, because the items are grouped by the
category of the wizard (i.e. the "category" property of IWizardFactory)
I extracted a class, PresetData, to hold the data that is being shared
by the PresetModel (items in the view) and the PresetCategoryModel
(header/tab items). It stored both information on normal presets and on
recent presets.
Made changes to JsonWizardFactory so that I could extract the list of
screen sizes without requiring to build a wizard object first. This is
important, because multiple JsonWizard objects cannot be created at the
same time and I need to show the screen sizes of multiple presets /
wizards as the Presets view is opened. This also required class
WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory
-- since "screen sizes" are a particularity of the json wizards, not of
all kinds of wizards.
Also, fixed a TODO in WizardHandler::reset() method.
Also, added a few utilities I had need of, in algorithm.h.
Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
|
|
|
presetModel.setPage(index)
|
2021-12-01 19:30:34 +02:00
|
|
|
projectView.currentIndex = 0
|
|
|
|
|
projectView.currentIndexChanged()
|
2021-11-23 21:05:02 +02:00
|
|
|
|
|
|
|
|
strip.x = parent.x
|
|
|
|
|
strip.width = parent.width
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // Text
|
|
|
|
|
} // Repeater
|
|
|
|
|
} // tabBarRow
|
|
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
|
id: strip
|
|
|
|
|
width: tabBarRow.children[0].width
|
|
|
|
|
height: 5
|
|
|
|
|
radius: 2
|
|
|
|
|
color: DialogValues.textColorInteraction
|
|
|
|
|
anchors.bottom: parent.bottom
|
|
|
|
|
|
2021-12-01 19:30:34 +02:00
|
|
|
Behavior on x { SmoothedAnimation { duration: tabBar.animDur } }
|
|
|
|
|
Behavior on width { SmoothedAnimation { duration: strip.width === 0 ? 0 : tabBar.animDur } } // do not animate initial width
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Connections {
|
|
|
|
|
target: rootDialog
|
|
|
|
|
function onWidthChanged() {
|
|
|
|
|
if (rootDialog.width < 1200) { // 1200 = the width threshold
|
|
|
|
|
tabBar.width = tabBar.parent.width - 20
|
|
|
|
|
projectView.width = projectView.parent.width - 20
|
|
|
|
|
} else {
|
|
|
|
|
tabBar.width = tabBar.parent.width - 64
|
|
|
|
|
projectView.width = projectView.parent.width - 64
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-11-23 21:05:02 +02:00
|
|
|
}
|
|
|
|
|
} // Rectangle
|
|
|
|
|
|
2021-11-09 18:58:15 +02:00
|
|
|
NewProjectView {
|
2021-12-01 19:30:34 +02:00
|
|
|
id: projectView
|
2021-11-09 18:58:15 +02:00
|
|
|
x: 10 // left padding
|
|
|
|
|
width: parent.width - 64 // right padding
|
|
|
|
|
height: DialogValues.projectViewHeight
|
|
|
|
|
loader: projectDetailsLoader
|
2021-11-23 21:05:02 +02:00
|
|
|
|
|
|
|
|
Connections {
|
|
|
|
|
target: rootDialog
|
|
|
|
|
function onHeightChanged() {
|
|
|
|
|
if (rootDialog.height < 700) { // 700 = minimum height big dialog
|
2021-12-01 19:30:34 +02:00
|
|
|
projectView.height = DialogValues.projectViewHeight / 2
|
2021-11-23 21:05:02 +02:00
|
|
|
} else {
|
2021-12-01 19:30:34 +02:00
|
|
|
projectView.height = DialogValues.projectViewHeight
|
2021-11-23 21:05:02 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-11-09 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Item { height: 5; width: parent.width }
|
|
|
|
|
|
|
|
|
|
Text {
|
|
|
|
|
id: descriptionText
|
|
|
|
|
text: dialogBox.projectDescription
|
|
|
|
|
font.pixelSize: DialogValues.defaultPixelSize
|
|
|
|
|
lineHeight: DialogValues.defaultLineHeight
|
|
|
|
|
lineHeightMode: Text.FixedHeight
|
|
|
|
|
leftPadding: 14
|
2021-12-01 19:30:34 +02:00
|
|
|
width: projectView.width
|
2021-11-09 18:58:15 +02:00
|
|
|
color: DialogValues.textColor
|
|
|
|
|
wrapMode: Text.WordWrap
|
|
|
|
|
maximumLineCount: 4
|
|
|
|
|
elide: Text.ElideRight
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} // Left pane
|
|
|
|
|
|
|
|
|
|
Loader {
|
|
|
|
|
id: projectDetailsLoader
|
|
|
|
|
// we need to specify width because the loaded item needs to use parent sizes
|
|
|
|
|
width: DialogValues.loadedPanesWidth
|
|
|
|
|
Layout.fillHeight: true
|
|
|
|
|
source: ""
|
|
|
|
|
}
|
|
|
|
|
} // RowLayout
|
|
|
|
|
} //Content Item
|
|
|
|
|
|
|
|
|
|
Item { // Footer
|
|
|
|
|
implicitHeight: DialogValues.footerHeight
|
|
|
|
|
implicitWidth: parent.width
|
|
|
|
|
RowLayout {
|
|
|
|
|
anchors.fill: parent
|
|
|
|
|
spacing: DialogValues.defaultPadding
|
|
|
|
|
|
|
|
|
|
Item { Layout.fillWidth: true }
|
|
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { // Dialog Button Box
|
|
|
|
|
width: DialogValues.stylesPaneWidth
|
|
|
|
|
height: parent.height
|
2021-11-09 18:58:15 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
RowLayout {
|
|
|
|
|
width: DialogValues.stylesPaneWidth
|
|
|
|
|
implicitWidth: DialogValues.stylesPaneWidth
|
|
|
|
|
implicitHeight: parent.height
|
|
|
|
|
|
|
|
|
|
SC.AbstractButton {
|
|
|
|
|
implicitWidth: DialogValues.dialogButtonWidth
|
|
|
|
|
width: DialogValues.dialogButtonWidth
|
|
|
|
|
visible: true
|
|
|
|
|
buttonIcon: qsTr("Cancel")
|
|
|
|
|
iconSize: DialogValues.defaultPixelSize
|
|
|
|
|
iconFont: StudioTheme.Constants.font
|
|
|
|
|
|
|
|
|
|
onClicked: {
|
|
|
|
|
dialogBox.reject();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Item { Layout.fillWidth: true }
|
|
|
|
|
|
|
|
|
|
SC.AbstractButton {
|
|
|
|
|
implicitWidth: DialogValues.dialogButtonWidth
|
|
|
|
|
width: DialogValues.dialogButtonWidth
|
|
|
|
|
visible: true
|
|
|
|
|
buttonIcon: qsTr("Create")
|
|
|
|
|
iconSize: DialogValues.defaultPixelSize
|
|
|
|
|
enabled: dialogBox.fieldsValid
|
|
|
|
|
iconFont: StudioTheme.Constants.font
|
|
|
|
|
|
|
|
|
|
onClicked: {
|
|
|
|
|
dialogBox.accept();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} // RowLayout
|
|
|
|
|
} // Dialog Button Box
|
2021-11-09 18:58:15 +02:00
|
|
|
|
2021-11-23 21:05:02 +02:00
|
|
|
Item { implicitWidth: DialogValues.dialogLeftPadding - DialogValues.defaultPadding }
|
2021-11-09 18:58:15 +02:00
|
|
|
} // RowLayout
|
|
|
|
|
} // Footer
|
|
|
|
|
} // ColumnLayout
|
|
|
|
|
} // Rectangle
|
|
|
|
|
}
|