From 2f37bd4b7318930a5bd0b5a8791c02bcb41cbbdf Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 15 Feb 2018 12:53:14 +0100 Subject: [PATCH 1/3] Add native rendering to Print Setup Label CURA-4941 --- resources/qml/Sidebar.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index f1cbfbcc60..57a8e8beaa 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -126,6 +126,7 @@ Rectangle { id: settingsModeLabel text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox", "Print Setup disabled\nG-code files cannot be modified") + renderType: Text.NativeRendering anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width anchors.top: hideSettings ? machineSelection.bottom : headerSeparator.bottom From f11a1341ee52069f47d9fbca5d2e043b7ff3b17d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 15 Feb 2018 13:27:13 +0100 Subject: [PATCH 2/3] Fix rounded values in qml files --- plugins/ChangeLogPlugin/ChangeLog.qml | 4 ++-- resources/qml/AboutDialog.qml | 4 ++-- resources/qml/Preferences/MachinesPage.qml | 4 ++-- resources/qml/Preferences/ProfileTab.qml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.qml b/plugins/ChangeLogPlugin/ChangeLog.qml index 512687f15a..f7715efb98 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.qml +++ b/plugins/ChangeLogPlugin/ChangeLog.qml @@ -11,8 +11,8 @@ import UM 1.1 as UM UM.Dialog { id: base - minimumWidth: (UM.Theme.getSize("modal_window_minimum").width * 0.75) | 0 - minimumHeight: (UM.Theme.getSize("modal_window_minimum").height * 0.75) | 0 + minimumWidth: Math.round(UM.Theme.getSize("modal_window_minimum").width * 0.75) | 0 + minimumHeight: Math.round(UM.Theme.getSize("modal_window_minimum").height * 0.75) | 0 width: minimumWidth height: minimumHeight title: catalog.i18nc("@label", "Changelog") diff --git a/resources/qml/AboutDialog.qml b/resources/qml/AboutDialog.qml index 30e540e80a..2c40aa4500 100644 --- a/resources/qml/AboutDialog.qml +++ b/resources/qml/AboutDialog.qml @@ -22,8 +22,8 @@ UM.Dialog Image { id: logo - width: (base.minimumWidth * 0.85) | 0 - height: (width * (1/4.25)) | 0 + width: Math.round(base.minimumWidth * 0.85) | 0 + height: Math.round(width * (1/4.25)) | 0 source: UM.Theme.getImage("logo") diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 889dfa8d5b..597820f67b 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -160,7 +160,7 @@ UM.ManagementPage } Label { - width: (parent.width * 0.7) | 0 + width: Math.round(parent.width * 0.7) | 0 text: machineInfo.printerConnected ? machineInfo.connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.") visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId wrapMode: Text.WordWrap @@ -171,7 +171,7 @@ UM.ManagementPage visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands } Label { - width: (parent.width * 0.7) | 0 + width: Math.round(parent.width * 0.7) | 0 text: { if(!machineInfo.printerConnected || !machineInfo.printerAcceptsCommands) { diff --git a/resources/qml/Preferences/ProfileTab.qml b/resources/qml/Preferences/ProfileTab.qml index acebea3500..ee61feac34 100644 --- a/resources/qml/Preferences/ProfileTab.qml +++ b/resources/qml/Preferences/ProfileTab.qml @@ -51,14 +51,14 @@ Tab { role: "label" title: catalog.i18nc("@title:column", "Setting") - width: (parent.width * 0.4) | 0 + width: Math.round(parent.width * 0.4) | 0 delegate: itemDelegate } TableViewColumn { role: "profile_value" title: catalog.i18nc("@title:column", "Profile") - width: (parent.width * 0.18) | 0 + width: Math.round(parent.width * 0.18) | 0 delegate: itemDelegate } TableViewColumn @@ -66,14 +66,14 @@ Tab role: "user_value" title: catalog.i18nc("@title:column", "Current"); visible: quality == Cura.MachineManager.globalQualityId - width: (parent.width * 0.18) | 0 + width: Math.round(parent.width * 0.18) | 0 delegate: itemDelegate } TableViewColumn { role: "unit" title: catalog.i18nc("@title:column", "Unit") - width: (parent.width * 0.14) | 0 + width: Math.round(parent.width * 0.14) | 0 delegate: itemDelegate } From e7df8efe4daf2ea0783d45471358ed20a156e72c Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 15 Feb 2018 13:34:37 +0100 Subject: [PATCH 3/3] CURA-4698 Change value of setting as indicated by materials team --- .../quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index 58e7fdc688..ccc558530e 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -33,7 +33,7 @@ multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 prime_tower_wipe_enabled = True -retraction_count_max = 6 +retraction_count_max = 45 retraction_extra_prime_amount = 0.2 retraction_extrusion_window = 6.5 retraction_hop = 2