From ab062649503e695b92b6c3f01ccdb0d956a3f4cf Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:28:17 +0100 Subject: [PATCH 1/4] Rename to AddNetworkOrLocalPrinterContent --- cura/UI/WelcomePagesModel.py | 4 ++-- ...lectionContent.qml => AddNetworkOrLocalPrinterContent.qml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/qml/WelcomePages/{AddPrinterBySelectionContent.qml => AddNetworkOrLocalPrinterContent.qml} (100%) diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py index d72071fd7f..2b58218cd6 100644 --- a/cura/UI/WelcomePagesModel.py +++ b/cura/UI/WelcomePagesModel.py @@ -49,8 +49,8 @@ class WelcomePagesModel(ListModel): self._pages.append({"id": "data_collections", "page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"), }) - self._pages.append({"id": "add_printer_by_selection", - "page_url": self._getBuiltinWelcomePagePath("AddPrinterBySelectionContent.qml"), + self._pages.append({"id": "add_network_or_local_printer", + "page_url": self._getBuiltinWelcomePagePath("AddNetworkOrLocalPrinterContent.qml"), }) self._pages.append({"id": "add_printer_by_ip", "page_url": self._getBuiltinWelcomePagePath("AddPrinterByIpContent.qml"), diff --git a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml similarity index 100% rename from resources/qml/WelcomePages/AddPrinterBySelectionContent.qml rename to resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml From 639c4ba9f6953b402c3720578143a7079711c5d4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:35:41 +0100 Subject: [PATCH 2/4] Remove unneeded property assignment --- resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 4f09b055eb..0eebb61b91 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -101,8 +101,6 @@ Item AddLocalPrinterScrollView { id: localPrinterView - - maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll. } } } From 1e3945810f21c44397adf454503a937614afe7d7 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:49:59 +0100 Subject: [PATCH 3/4] Remove text_light_blue and use primary --- resources/qml/WelcomePages/CloudContent.qml | 4 ++-- resources/themes/cura-light/theme.json | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 09e52c17dd..7bdacb8d7d 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -56,7 +56,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@text", "The next generation 3D printing workflow") textFormat: Text.RichText - color: UM.Theme.getColor("text_light_blue") + color: UM.Theme.getColor("primary") font: UM.Theme.getFont("medium") renderType: Text.NativeRendering } @@ -112,7 +112,7 @@ Item shadowEnabled: false color: "transparent" hoverColor: "transparent" - textHoverColor: UM.Theme.getColor("text_light_blue") + textHoverColor: UM.Theme.getColor("primary") fixedWidthMode: true onClicked: Cura.API.account.login() } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83edda6486..b14c432b17 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -193,8 +193,6 @@ "window_disabled_background": [0, 0, 0, 255], - "text_light_blue": [50, 130, 255, 255], - "text": [25, 25, 25, 255], "text_detail": [174, 174, 174, 128], "text_link": [50, 130, 255, 255], From 090e176969ff3e9b3e5d37feed17e32ec67c4aa5 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 11:15:43 +0100 Subject: [PATCH 4/4] Arrange CloudContent.qml differently --- resources/qml/WelcomePages/CloudContent.qml | 60 +++++++++++++-------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 7bdacb8d7d..d5c4d2c03a 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -28,28 +28,34 @@ Item renderType: Text.NativeRendering } - Column + // Area where the cloud contents can be put. Pictures, texts and such. + Item { + id: cloudContentsArea anchors.top: titleLabel.bottom - anchors.topMargin: 80 - anchors.horizontalCenter: parent.horizontalCenter - - spacing: 60 - - Image - { - id: cloudImage - anchors.horizontalCenter: parent.horizontalCenter - source: UM.Theme.getImage("first_run_ultimaker_cloud") - } + anchors.bottom: finishButton.top + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: UM.Theme.getSize("default_margin").width + // Pictures and texts are arranged using Columns with spacing. The whole picture and text area is centered in + // the cloud contents area. Column { - anchors.horizontalCenter: parent.horizontalCenter + anchors.centerIn: parent + width: childrenRect.width + height: childrenRect.height - spacing: 30 + spacing: 20 * screenScaleFactor - Label + Image // Cloud image + { + id: cloudImage + anchors.horizontalCenter: parent.horizontalCenter + source: UM.Theme.getImage("first_run_ultimaker_cloud") + } + + Label // A title-ish text { id: highlightTextLabel anchors.horizontalCenter: parent.horizontalCenter @@ -61,15 +67,26 @@ Item renderType: Text.NativeRendering } - Label + Label // A number of text items { id: textLabel anchors.horizontalCenter: parent.horizontalCenter - text: { - var t = "

- Send print jobs to Ultimaker printers outside your local network

" - t += "

- Store your Ultimaker Cura settings in the cloud for use anywhere

" - t += "

- Get exclusive access to material profiles from leading brands

" - catalog.i18nc("@text", t) + text: + { + // There are 3 text items, each of which is translated separately as a single piece of text. + var full_text = "" + var t = "" + + t = catalog.i18nc("@text", "- Send print jobs to Ultimaker printers outside your local network") + full_text += "

" + t + "

" + + t = catalog.i18nc("@text", "- Store your Ultimaker Cura settings in the cloud for use anywhere") + full_text += "

" + t + "

" + + t = catalog.i18nc("@text", "- Get exclusive access to material profiles from leading brands") + full_text += "

" + t + "

" + + return full_text } textFormat: Text.RichText font: UM.Theme.getFont("medium") @@ -78,6 +95,7 @@ Item } } + // Bottom buttons go here Cura.PrimaryButton { id: finishButton