From f62d19aa6046bbee02ba01a7cf5902eab5b012cc Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Apr 2019 11:24:01 +0200 Subject: [PATCH 1/5] Fix rendering issues in macOS when connecting to secondary screen It used to happen before, but just adding native rendering fixes the issue. --- .../resources/qml/MonitorBuildplateConfiguration.qml | 1 + .../resources/qml/MonitorConfigOverrideDialog.qml | 1 + .../resources/qml/MonitorContextMenuButton.qml | 1 + .../resources/qml/MonitorExtruderConfiguration.qml | 2 ++ .../resources/qml/MonitorIconExtruder.qml | 1 + .../UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml | 1 + .../resources/qml/MonitorPrintJobCard.qml | 4 ++++ .../resources/qml/MonitorPrintJobProgressBar.qml | 2 ++ .../resources/qml/MonitorPrinterCard.qml | 8 ++++++++ .../resources/qml/MonitorPrinterPill.qml | 1 + plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml | 5 +++++ .../resources/qml/PrintJobContextMenuItem.qml | 1 + plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml | 1 + 13 files changed, 29 insertions(+) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index d1a0c207c5..619658a7eb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -69,6 +69,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml index 1718994d83..cba36412b6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml @@ -52,6 +52,7 @@ UM.Dialog bottomMargin: 56 * screenScaleFactor // TODO: Theme! } wrapMode: Text.WordWrap + renderType: Text.NativeRendering text: { if (!printer || !printer.activePrintJob) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml index ba85802809..e91e8b04d2 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml @@ -23,6 +23,7 @@ Button horizontalAlignment: Text.AlignHCenter text: base.text verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering; } height: width hoverEnabled: enabled diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index 4079f23b0a..deed3ac5e6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -66,6 +66,7 @@ Item // FIXED-LINE-HEIGHT: height: parent.height verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -95,6 +96,7 @@ Item // FIXED-LINE-HEIGHT: height: parent.height verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index c3e78317c5..f6b84d69b2 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml @@ -48,5 +48,6 @@ Item x: Math.round(size * 0.25) y: Math.round(size * 0.15625) visible: position >= 0 + renderType: Text.NativeRendering } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml index 21000b8bff..0d2c7f8beb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml @@ -40,6 +40,7 @@ Item width: 240 * screenScaleFactor // TODO: Theme! color: UM.Theme.getColor("monitor_tooltip_text") font: UM.Theme.getFont("default") + renderType: Text.NativeRendering } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index b9156c02aa..d80f2e5b9f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -71,6 +71,7 @@ Item // FIXED-LINE-HEIGHT: height: parent.height verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -98,6 +99,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -143,6 +145,7 @@ Item // FIXED-LINE-HEIGHT: height: parent.height verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Row @@ -197,6 +200,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index d3e49393c9..bcc7f9a358 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -47,6 +47,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Label { @@ -99,5 +100,6 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index aa4893b3b9..00f7e9f534 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -112,6 +112,7 @@ Item // FIXED-LINE-HEIGHT: height: parent.height verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -283,7 +284,9 @@ Item topMargin: 12 * screenScaleFactor + borderSize // TODO: Theme! bottomMargin: 12 * screenScaleFactor // TODO: Theme! leftMargin: 36 * screenScaleFactor // TODO: Theme! + rightMargin: 36 * screenScaleFactor // TODO: Theme! } + width: parent.width height: childrenRect.height spacing: 18 * screenScaleFactor // TODO: Theme! @@ -315,6 +318,7 @@ Item return "" } visible: text !== "" + renderType: Text.NativeRendering } Item @@ -356,6 +360,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Label @@ -376,6 +381,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -403,6 +409,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -437,6 +444,7 @@ Item verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter height: 18 * screenScaleFactor // TODO: Theme! + renderType: Text.NativeRendering } implicitHeight: 32 * screenScaleFactor // TODO: Theme! implicitWidth: 96 * screenScaleFactor // TODO: Theme! diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml index 2aeecd5a92..584e336a80 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml @@ -43,5 +43,6 @@ Item text: tagText font.pointSize: 10 // TODO: Theme! visible: text !== "" + renderType: Text.NativeRendering } } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 9bee89c9bc..6025d7acfe 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -29,6 +29,7 @@ Item color: UM.Theme.getColor("monitor_text_primary") font: UM.Theme.getFont("large") text: catalog.i18nc("@label", "Queued") + renderType: Text.NativeRendering } Item @@ -109,6 +110,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Label @@ -123,6 +125,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } Label @@ -137,6 +140,7 @@ Item // FIXED-LINE-HEIGHT: height: 18 * screenScaleFactor // TODO: Theme! verticalAlignment: Text.AlignVCenter + renderType: Text.NativeRendering } } @@ -213,6 +217,7 @@ Item text: i18n.i18nc("@info", "All jobs are printed.") color: UM.Theme.getColor("monitor_text_primary") font: UM.Theme.getFont("medium") // 14pt, regular + renderType: Text.NativeRendering } Item diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml index 67c82db320..ff5635e45d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml @@ -16,6 +16,7 @@ Button { text: parent.text horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter; + renderType: Text.NativeRendering; } height: visible ? 39 * screenScaleFactor : 0; // TODO: Theme! hoverEnabled: true; diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index c2590e99a8..548e5ce1ea 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -78,6 +78,7 @@ UM.Dialog { height: 20 * screenScaleFactor; text: catalog.i18nc("@label", "Printer selection"); wrapMode: Text.Wrap; + renderType: Text.NativeRendering; } ComboBox { From 7249bd3c50bced00d27a25e1f2e361326a30a45e Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Apr 2019 11:33:19 +0200 Subject: [PATCH 2/5] Remove two lines entered by mistake Keep it the same as in the base branch. --- plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 00f7e9f534..f4295ee18d 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -284,9 +284,7 @@ Item topMargin: 12 * screenScaleFactor + borderSize // TODO: Theme! bottomMargin: 12 * screenScaleFactor // TODO: Theme! leftMargin: 36 * screenScaleFactor // TODO: Theme! - rightMargin: 36 * screenScaleFactor // TODO: Theme! } - width: parent.width height: childrenRect.height spacing: 18 * screenScaleFactor // TODO: Theme! From 32c8bbfb3c781288e393ca4c489e88b256391752 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 1 May 2019 15:50:43 +0200 Subject: [PATCH 3/5] Modify small UI things in the Add Printer dialog --- .../WelcomePages/AddNetworkOrLocalPrinterContent.qml | 12 +++--------- .../qml/WelcomePages/AddNetworkPrinterScrollView.qml | 2 +- resources/qml/WelcomePages/DropDownWidget.qml | 3 ++- resources/qml/WelcomePages/WizardDialog.qml | 1 + 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 6037868aaa..73ba179fef 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -41,10 +41,7 @@ Item onClicked: { - if (contentShown) - { - addLocalPrinterDropDown.contentShown = false - } + addLocalPrinterDropDown.contentShown = !contentShown } contentComponent: networkPrinterListComponent @@ -79,16 +76,13 @@ Item anchors.top: addNetworkPrinterDropDown.bottom anchors.left: parent.left anchors.right: parent.right - anchors.topMargin: UM.Theme.getSize("wide_margin").height + anchors.topMargin: UM.Theme.getSize("default_margin").height title: catalog.i18nc("@label", "Add a non-networked printer") onClicked: { - if (contentShown) - { - addNetworkPrinterDropDown.contentShown = false - } + addNetworkPrinterDropDown.contentShown = !contentShown } contentComponent: localPrinterListComponent diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 117f8a59d7..5f3ceac116 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -56,7 +56,7 @@ Item ScrollBar.vertical.policy: ScrollBar.AsNeeded property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll. - height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height + height: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height) visible: networkPrinterListView.count > 0 diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml index a54424b7cf..526027ea53 100644 --- a/resources/qml/WelcomePages/DropDownWidget.qml +++ b/resources/qml/WelcomePages/DropDownWidget.qml @@ -56,7 +56,8 @@ Item Cura.RoundedRectangle { id: contentRectangle - anchors.top: header.bottom + // Move up a bit (exaclty the width of the border) to avoid double line + y: header.height - UM.Theme.getSize("default_lining").width anchors.left: header.left anchors.right: header.right // Add 2x lining, because it needs a bit of space on the top and the bottom. diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml index 31240b1ef5..ce16ff1f65 100644 --- a/resources/qml/WelcomePages/WizardDialog.qml +++ b/resources/qml/WelcomePages/WizardDialog.qml @@ -66,6 +66,7 @@ Window anchors.left: parent.left anchors.bottom: parent.bottom anchors.margins: UM.Theme.getSize("default_margin").width + anchors.leftMargin: UM.Theme.getSize("wide_margin").width enabled: true onClicked: dialog.visible = false From 9500d2d6b8ea776cb34afa969230d9ef6c3beab5 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 1 May 2019 15:53:54 +0200 Subject: [PATCH 4/5] Modify text in the Send Slice data dialog, according to the experts. Contributes to CURA-6434. --- plugins/SliceInfoPlugin/example_data.html | 1 - resources/qml/WelcomePages/DataCollectionsContent.qml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index 61090b06fe..4294b0af6d 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -48,7 +48,6 @@
  • Bounding Box: [minimum x, y, z; maximum x, y, z]
  • Is Helper Mesh: no
  • Helper Mesh Type: support mesh
    • -
  • ...
    • diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index 3f9819fee8..be4d09e876 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -99,7 +99,7 @@ Item horizontalAlignment: Text.AlignHCenter text: { - var t = catalog.i18nc("@text", "The data that Ultimaker Cura collects will not contain any information about your model.") + var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.") var t2 = catalog.i18nc("@text", "More information") t += " " + t2 + "" return t From 038a5b5942d2858c004f223ace3ce4840846dd0d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 2 May 2019 08:46:46 +0200 Subject: [PATCH 5/5] Fix background of g-code text boxes having zero size --- resources/qml/MachineSettings/GcodeTextArea.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml index d1f8f51f01..3914687fc8 100644 --- a/resources/qml/MachineSettings/GcodeTextArea.qml +++ b/resources/qml/MachineSettings/GcodeTextArea.qml @@ -69,6 +69,7 @@ UM.TooltipArea background: Rectangle { color: UM.Theme.getColor("main_background") + anchors.fill: parent border.color: {