From 528a6b651d89a57e3ab45ea4f1c13e34f789a25f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:06:47 +0100 Subject: [PATCH 1/6] Fix code style --- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 575ec9c126..8233425c30 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -76,7 +76,6 @@ Item // select the first one that's not "unknown" by default. for (var i = 0; i < count; i++) { - if (!model[i].is_unknown_machine_type) { currentIndex = i From c4d2cb26a0cc66bd85ae2703aea06cbc87d163d6 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:07:26 +0100 Subject: [PATCH 2/6] Fix comments --- resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 8233425c30..0d37b2092b 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -73,7 +73,7 @@ Item Component.onCompleted: { - // select the first one that's not "unknown" by default. + // Select the first one that's not "unknown" by default. for (var i = 0; i < count; i++) { if (!model[i].is_unknown_machine_type) From 0c8afbfa45001d6380bde3dfaa3858a49ab72ef4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:14:34 +0100 Subject: [PATCH 3/6] Use Item instead of Rectangle --- resources/qml/WelcomePages/AddPrinterByIpContent.qml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index f3ed58200b..e843416b8b 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -116,7 +116,7 @@ Item } } - Rectangle + Item { width: parent.width anchors.top: userInputFields.bottom @@ -133,7 +133,7 @@ Item text: catalog.i18nc("@label", "The printer at this address has not responded yet.") } - Rectangle + Item { id: printerInfoLabels anchors.top: parent.top @@ -203,8 +203,6 @@ Item width: UM.Theme.getSize("action_button").width fixedWidthMode: true onClicked: base.gotoPage("add_printer_by_selection") - - enabled: true } Cura.PrimaryButton From a8e2fcf5f5efe19632ba1b841cc185b518bf701e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:19:38 +0100 Subject: [PATCH 4/6] Add comments for properties in AddPrinterByIpContent --- resources/qml/WelcomePages/AddPrinterByIpContent.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index e843416b8b..01d12a654b 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -18,7 +18,9 @@ Item id: addPrinterByIpScreen + // Whether an IP address is currently being resolved. property bool hasSentRequest: false + // Whether the IP address user entered can be resolved as a recognizable printer. property bool haveConnection: false Label From 2b0e2d84bbc45b2a46bbb45a8d4d069926483ba2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:21:17 +0100 Subject: [PATCH 5/6] Rename gotoPage to goToPage --- resources/qml/WelcomePages/AddPrinterByIpContent.qml | 2 +- resources/qml/WelcomePages/AddPrinterBySelectionContent.qml | 4 ++-- resources/qml/WelcomePages/StepPanel.qml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 01d12a654b..e71efb09aa 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -204,7 +204,7 @@ Item text: catalog.i18nc("@button", "Cancel") width: UM.Theme.getSize("action_button").width fixedWidthMode: true - onClicked: base.gotoPage("add_printer_by_selection") + onClicked: base.goToPage("add_printer_by_selection") } Cura.PrimaryButton diff --git a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml index 3282b219c9..4f09b055eb 100644 --- a/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml +++ b/resources/qml/WelcomePages/AddPrinterBySelectionContent.qml @@ -67,7 +67,7 @@ Item onAddByIpButtonClicked: { - base.gotoPage("add_printer_by_ip") + base.goToPage("add_printer_by_ip") } } } @@ -148,7 +148,7 @@ Item // TODO: implement machine actions // If we have created a machine, go to the last page, which is the "cloud" page. - base.gotoPage("cloud") + base.goToPage("cloud") } } } diff --git a/resources/qml/WelcomePages/StepPanel.qml b/resources/qml/WelcomePages/StepPanel.qml index bc99320e02..157fc8e568 100644 --- a/resources/qml/WelcomePages/StepPanel.qml +++ b/resources/qml/WelcomePages/StepPanel.qml @@ -33,7 +33,7 @@ Item signal showNextPage() signal showPreviousPage() signal passLastPage() // Emitted when there is no more page to show - signal gotoPage(string page_id) // Go to a specific page by the given page_id. + signal goToPage(string page_id) // Go to a specific page by the given page_id. onShowNextPage: { @@ -54,7 +54,7 @@ Item } } - onGotoPage: + onGoToPage: { // find the page index var page_index = -1 From 4573733bb70a2da0d4cc1546ad7d21b7b32a92b9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 22 Mar 2019 10:22:19 +0100 Subject: [PATCH 6/6] Remove unnecessary "visible: true" --- resources/qml/WelcomePages/StepPanel.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/WelcomePages/StepPanel.qml b/resources/qml/WelcomePages/StepPanel.qml index 157fc8e568..7e0c00a987 100644 --- a/resources/qml/WelcomePages/StepPanel.qml +++ b/resources/qml/WelcomePages/StepPanel.qml @@ -110,7 +110,6 @@ Item source: parent horizontalOffset: base.shadowOffset verticalOffset: base.shadowOffset - visible: true color: UM.Theme.getColor("monitor_shadow") transparentBorder: true // Should always be drawn behind the background.