From 76d8bb3f45fed06678dde909f788191c30d897f4 Mon Sep 17 00:00:00 2001 From: Samuel Ghinet Date: Tue, 23 Nov 2021 21:05:02 +0200 Subject: [PATCH] Improve the visual of the New Project dialog * Reworked dialog header -- added DS logo, reworded title & subtitle, aligned them to the left * Added radius for rectangles: Presets pane, Styles pane, the Orientation button * Added extra padding for style items -- so it's easier to figure that the label is for the image above it. Task-number: QDS-5500 Change-Id: Icebe8abb886401e5d075e4a372c0036468301490 Reviewed-by: Thomas Hartmann --- .../newprojectdialog/NewProjectDialog.qml | 60 +++++++++++++----- .../newprojectdialog/image/logo.png | Bin 0 -> 4810 bytes .../newprojectdialog/image/logo@2x.png | Bin 0 -> 11252 bytes .../imports/NewProjectDialog/Details.qml | 4 +- .../imports/NewProjectDialog/DialogValues.qml | 11 +++- .../imports/NewProjectDialog/Styles.qml | 9 ++- 6 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 share/qtcreator/qmldesigner/newprojectdialog/image/logo.png create mode 100644 share/qtcreator/qmldesigner/newprojectdialog/image/logo@2x.png diff --git a/share/qtcreator/qmldesigner/newprojectdialog/NewProjectDialog.qml b/share/qtcreator/qmldesigner/newprojectdialog/NewProjectDialog.qml index 3e91ab70f11..1f883602668 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/NewProjectDialog.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/NewProjectDialog.qml @@ -58,41 +58,66 @@ Item { anchors.fill: parent Item { width: parent.width; implicitHeight: 20 } // spacer + Row { width: parent.width height: DialogValues.dialogTitleTextHeight - Layout.alignment: Qt.AlignHCenter + + 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} + Text { - text: qsTr("Welcome to ") + text: qsTr("Let's create something wonderful with ") font.pixelSize: DialogValues.dialogTitlePixelSize font.family: "Titillium Web" height: DialogValues.dialogTitleTextHeight lineHeight: DialogValues.dialogTitleLineHeight lineHeightMode: Text.FixedHeight color: DialogValues.textColor + verticalAlignment: Text.AlignVCenter } Text { - text: qsTr("Qt Design Studio") + text: qsTr("Qt Design Studio!") font.pixelSize: DialogValues.dialogTitlePixelSize font.family: "Titillium Web" height: DialogValues.dialogTitleTextHeight lineHeight: DialogValues.dialogTitleLineHeight lineHeightMode: Text.FixedHeight - color: DialogValues.textColorInteraction + color: DialogValues.brandTextColor + verticalAlignment: Text.AlignVCenter + } + } // Row + + Item { width: parent.width; height: 11 } // spacer + + Item { + width: parent.width + height: DialogValues.paneTitleLineHeight + Row { + width: parent.width + height: DialogValues.paneTitleLineHeight + + 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 + } } } - - Text { - width: parent.width - 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 - Layout.alignment: Qt.AlignHCenter - } - Item { width: parent.width; Layout.fillHeight: true} // spacer } // ColumnLayout } // Header Item @@ -102,7 +127,7 @@ Item { Layout.fillHeight: true RowLayout { - x: 35 + x: DialogValues.dialogLeftPadding width: parent.width - 70 height: parent.height spacing: 0 @@ -113,6 +138,7 @@ Item { Layout.fillHeight: true Layout.minimumWidth: 379 // figured out this number visually Layout.minimumHeight: 261 // figured out this number visually + radius: 6 Column { x: DialogValues.defaultPadding // left padding @@ -294,7 +320,7 @@ Item { } // RowLayout } // Dialog Button Box - Item { implicitWidth: 35 - DialogValues.defaultPadding } + Item { implicitWidth: DialogValues.dialogLeftPadding - DialogValues.defaultPadding } } // RowLayout } // Footer } // ColumnLayout diff --git a/share/qtcreator/qmldesigner/newprojectdialog/image/logo.png b/share/qtcreator/qmldesigner/newprojectdialog/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..555e0cac58d4db86be56ee2f1a8ce44b48101600 GIT binary patch literal 4810 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 literal 0 HcmV?d00001 diff --git a/share/qtcreator/qmldesigner/newprojectdialog/image/logo@2x.png b/share/qtcreator/qmldesigner/newprojectdialog/image/logo@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5c443d177a09df1fd9af6b86283e99f4c7db9493 GIT binary patch literal 11252 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 literal 0 HcmV?d00001 diff --git a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml index d622253a688..ab4c081db4c 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Details.qml @@ -58,7 +58,7 @@ Item { Text { id: detailsHeading text: qsTr("Details") - height: DialogValues.dialogTitleTextHeight + height: DialogValues.paneTitleTextHeight width: parent.width; font.weight: Font.DemiBold font.pixelSize: DialogValues.paneTitlePixelSize @@ -388,6 +388,7 @@ Item { width: parent.width height: orientationButton.height / 2 anchors.verticalCenter: parent.verticalCenter + radius: 3 } } @@ -401,6 +402,7 @@ Item { width: orientationButton.width / 4 height: orientationButton.height color: "white" + radius: 3 } } } diff --git a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/DialogValues.qml b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/DialogValues.qml index b99b99dc952..ae26727e07b 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/DialogValues.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/DialogValues.qml @@ -36,7 +36,11 @@ QtObject { readonly property int dialogContentHeight: projectViewHeight + 300 // i.e. dialog without header and footer readonly property int loadedPanesWidth: detailsPaneWidth + stylesPaneWidth readonly property int detailsPaneWidth: 330 + detailsPanePadding * 2 - readonly property int dialogTitleTextHeight: 47 + readonly property int dialogTitleTextHeight: 85 + readonly property int paneTitleTextHeight: 47 + readonly property int logoWidth: 85 + readonly property int logoHeight: 85 + /* detailsScrollableContentHeight - the full height that may need to be scrolled to be fully visible, if the dialog box is too small. */ readonly property int detailsScrollableContentHeight: 428 @@ -44,6 +48,7 @@ QtObject { readonly property int detailsPanePadding: 18 readonly property int stylesPanePadding: 18 readonly property int defaultPadding: 18 + readonly property int dialogLeftPadding: 35 readonly property int styleImageWidth: 200 readonly property int styleImageBorderWidth: 2 @@ -73,9 +78,11 @@ QtObject { readonly property real viewHeaderLineHeight: 24 readonly property real paneTitlePixelSize: 18 readonly property real paneTitleLineHeight: 27 - readonly property int dialogTitlePixelSize: 32 + readonly property int dialogTitlePixelSize: 38 readonly property int dialogTitleLineHeight: 49 + readonly property string brandTextColor: "#2e769e" + // for a spacer item function narrowSpacing(value, layoutSpacing = DialogValues.defaultPadding) { /* e.g. if we want narrow spacing value = 11, then for the spacer item residing inside a diff --git a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml index 09350f56010..1464449ee75 100644 --- a/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml +++ b/share/qtcreator/qmldesigner/newprojectdialog/imports/NewProjectDialog/Styles.qml @@ -52,6 +52,7 @@ Item { Rectangle { color: DialogValues.lightPaneColor anchors.fill: parent + radius: 6 Item { x: DialogValues.stylesPanePadding // left padding @@ -65,7 +66,7 @@ Item { Text { id: styleTitleText text: qsTr("Style") - Layout.minimumHeight: DialogValues.dialogTitleTextHeight + Layout.minimumHeight: DialogValues.paneTitleTextHeight font.weight: Font.DemiBold font.pixelSize: DialogValues.paneTitlePixelSize lineHeight: DialogValues.paneTitleLineHeight @@ -118,7 +119,7 @@ Item { delegate: ItemDelegate { id: delegateId - height: styleImage.height + DialogValues.styleImageBorderWidth + styleText.height + 1 + height: styleImage.height + DialogValues.styleImageBorderWidth + styleText.height + extraPadding.height + 1 width: stylesList.width Rectangle { @@ -134,7 +135,7 @@ Item { border.width: index == stylesList.currentIndex ? DialogValues.styleImageBorderWidth : 0 color: "transparent" width: parent.width - height: parent.height - styleText.height + height: parent.height - styleText.height - extraPadding.height Image { id: styleImage @@ -158,6 +159,8 @@ Item { width: parent.width color: DialogValues.textColor } + + Item { id: extraPadding; width: 1; height: 10 } } // Column } // Rectangle