From 9d48a90f8f8b03f94130684ec47eae7b232575e6 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 29 Apr 2019 13:45:55 +0200 Subject: [PATCH 01/14] Add two labels instead of one Change the link to adhere to the color scheme Contributes to CURA-6434. --- .../WelcomePages/DataCollectionsContent.qml | 30 +++++++++++-------- resources/qml/WelcomePages/WelcomeContent.qml | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index a2e54c1849..f2bfe10133 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -48,6 +48,19 @@ Item spacing: UM.Theme.getSize("wide_margin").height + Label + { + id: topLabel + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience. For instance:") + wrapMode: Text.WordWrap + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + } + Image { id: curaImage @@ -57,31 +70,24 @@ Item Label { - id: textLabel + id: bottomLabel width: parent.width anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter text: { - var t = catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience.") + var t = catalog.i18nc("@text", "Ultimaker Cura will not collect any information on the model.") var t2 = catalog.i18nc("@text", "More information") - t += " " + t2 + "" + t += " " + t2 + "" return t } textFormat: Text.RichText wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") + linkColor: UM.Theme.getColor("text_link") + onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection() renderType: Text.NativeRendering - - MouseArea - { - anchors.fill: parent - onClicked: - { - CuraApplication.showMoreInformationDialogForAnonymousDataCollection() - } - } } } } diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 0099c3db3d..1464e363a8 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -19,7 +19,7 @@ Item { anchors.centerIn: parent width: parent.width - spacing: UM.Theme.getSize("wide_margin").height + spacing: 2 * UM.Theme.getSize("wide_margin").height Label { From 534a0358411293663f82f4f1c7ccf4f7594aac10 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 29 Apr 2019 14:50:14 +0200 Subject: [PATCH 02/14] Add a grid with images Those images indicate the type of data we are collecting anonymously. Contributes to CURA-6434. --- .../WelcomePages/DataCollectionsContent.qml | 31 +++++++-- resources/qml/WelcomePages/ImageTile.qml | 39 +++++++++++ .../images/first_run_share_data.svg | 67 ------------------- 3 files changed, 66 insertions(+), 71 deletions(-) create mode 100644 resources/qml/WelcomePages/ImageTile.qml delete mode 100644 resources/themes/cura-light/images/first_run_share_data.svg diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index f2bfe10133..295dc3f8a1 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -61,11 +61,34 @@ Item renderType: Text.NativeRendering } - Image - { - id: curaImage + Grid { + columns: 2 + spacing: UM.Theme.getSize("wide_margin").height anchors.horizontalCenter: parent.horizontalCenter - source: UM.Theme.getImage("first_run_share_data") + + ImageTile + { + text: catalog.i18nc("@text", "Machine types") + imageSource: UM.Theme.getImage("first_run_machine_types") + } + + ImageTile + { + text: catalog.i18nc("@text", "Material usage") + imageSource: UM.Theme.getImage("first_run_material_usage") + } + + ImageTile + { + text: catalog.i18nc("@text", "Number of slices") + imageSource: UM.Theme.getImage("first_run_number_slices") + } + + ImageTile + { + text: catalog.i18nc("@text", "Print settings") + imageSource: UM.Theme.getImage("first_run_print_settings") + } } Label diff --git a/resources/qml/WelcomePages/ImageTile.qml b/resources/qml/WelcomePages/ImageTile.qml new file mode 100644 index 0000000000..7ed07304e6 --- /dev/null +++ b/resources/qml/WelcomePages/ImageTile.qml @@ -0,0 +1,39 @@ +// Copyright (c) 2019 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 + +import UM 1.3 as UM + + +// +// This component places a text on top of an image. +// +Column +{ + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").height + property alias text: label.text + property alias imageSource: image.source + + Label + { + id: label + width: image.width + anchors.horizontalCenter: image.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: "" + wrapMode: Text.WordWrap + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + } + + Image + { + id: image + source: "" + } +} \ No newline at end of file diff --git a/resources/themes/cura-light/images/first_run_share_data.svg b/resources/themes/cura-light/images/first_run_share_data.svg deleted file mode 100644 index cd87431067..0000000000 --- a/resources/themes/cura-light/images/first_run_share_data.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 46f1f00cb9569044bcb0bbf7f4bcf47aada7ba40 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 29 Apr 2019 17:24:51 +0200 Subject: [PATCH 03/14] Change example data to contain HTML instead of JSON format Then it's easier for us to show a more readable information about the data we collect Contributes to CURA-6434. --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 1 + plugins/SliceInfoPlugin/SliceInfo.py | 2 +- plugins/SliceInfoPlugin/example_data.html | 40 ++++++++ plugins/SliceInfoPlugin/example_data.json | 114 --------------------- 4 files changed, 42 insertions(+), 115 deletions(-) create mode 100644 plugins/SliceInfoPlugin/example_data.html delete mode 100644 plugins/SliceInfoPlugin/example_data.json diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 82d5044bed..0e83503ed7 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -89,6 +89,7 @@ Window } textArea.text: manager.getExampleData() + textArea.textFormat: Text.RichText textArea.readOnly: true } } diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index fecf3d16bb..7501429796 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -77,7 +77,7 @@ class SliceInfo(QObject, Extension): if not plugin_path: Logger.log("e", "Could not get plugin path!", self.getPluginId()) return None - file_path = os.path.join(plugin_path, "example_data.json") + file_path = os.path.join(plugin_path, "example_data.html") if file_path: with open(file_path, "r", encoding = "utf-8") as f: self._example_data_content = f.read() diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html new file mode 100644 index 0000000000..b03ffe1b81 --- /dev/null +++ b/plugins/SliceInfoPlugin/example_data.html @@ -0,0 +1,40 @@ +Cura Version: 4.0
+System type: Windows
+Machine type: Ultimaker S5
+Quality profile: Fast
+Extruder 1: +
    +
  • Material type: PLA
    • +
  • Print core: AA 0.4
    • +
  • Material used: 1240 mm.
    • +
+Extruder 2: +
    +
  • Material type: PVA
    • +
  • Print core: BB 0.4
    • +
  • Material used: 432 mm.
    • +
+Print settings: +
    +
  • Layer height = 0.15
    • +
  • Wall line count = 3
    • +
  • Enable retraction = no
    • +
  • Infill density = 20%
    • +
  • Infill pattern = triangles
    • +
  • Gradual infill steps = 0
    • +
  • Printing temperature = 220 °C
    • +
  • Generate support = yes
    • +
  • Support extruder = 1
    • +
  • Build Plate Adhesion Type = brim
    • +
  • Enable prime tower = yes
    • +
  • Print sequence = All at once
    • +
  • ...
    • +
+Print times: +
    +
  • Infill = 61200 sec.
    • +
  • Support = 25480 sec.
    • +
  • Travel = 6224 sec.
    • +
  • Walls = 10225 sec.
    • +
  • Total = 103129 sec.
    • +
diff --git a/plugins/SliceInfoPlugin/example_data.json b/plugins/SliceInfoPlugin/example_data.json deleted file mode 100644 index 5fc4175e60..0000000000 --- a/plugins/SliceInfoPlugin/example_data.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "time_stamp": 1523973715.486928, - "schema_version": 0, - "cura_version": "3.3", - "active_mode": "custom", - "machine_settings_changed_by_user": true, - "language": "en_US", - "os": { - "type": "Linux", - "version": "#43~16.04.1-Ubuntu SMP Wed Mar 14 17:48:43 UTC 2018" - }, - "active_machine": { - "definition_id": "ultimaker3", - "manufacturer": "Ultimaker B.V." - }, - "extruders": [ - { - "active": true, - "material": { - "GUID": "506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9", - "type": "PLA", - "brand": "Generic" - }, - "material_used": 0.84, - "variant": "AA 0.4", - "nozzle_size": 0.4, - "extruder_settings": { - "wall_line_count": 3, - "retraction_enable": true, - "infill_sparse_density": 30, - "infill_pattern": "triangles", - "gradual_infill_steps": 0, - "default_material_print_temperature": 200, - "material_print_temperature": 200 - } - }, - { - "active": false, - "material": { - "GUID": "86a89ceb-4159-47f6-ab97-e9953803d70f", - "type": "PVA", - "brand": "Generic" - }, - "material_used": 0.5, - "variant": "BB 0.4", - "nozzle_size": 0.4, - "extruder_settings": { - "wall_line_count": 3, - "retraction_enable": true, - "infill_sparse_density": 20, - "infill_pattern": "triangles", - "gradual_infill_steps": 0, - "default_material_print_temperature": 215, - "material_print_temperature": 220 - } - } - ], - "quality_profile": "fast", - "user_modified_setting_keys": ["layer_height", "wall_line_width", "infill_sparse_density"], - "models": [ - { - "hash": "b72789b9beb5366dff20b1cf501020c3d4d4df7dc2295ecd0fddd0a6436df070", - "bounding_box": { - "minimum": { - "x": -10.0, - "y": 0.0, - "z": -5.0 - }, - "maximum": { - "x": 9.999999046325684, - "y": 40.0, - "z": 5.0 - } - }, - "transformation": { - "data": "[[ 1. 0. 0. 0.] [ 0. 1. 0. 20.] [ 0. 0. 1. 0.] [ 0. 0. 0. 1.]]" - }, - "extruder": 0, - "model_settings": { - "support_enabled": true, - "support_extruder_nr": 1, - "infill_mesh": false, - "cutting_mesh": false, - "support_mesh": false, - "anti_overhang_mesh": false, - "wall_line_count": 3, - "retraction_enable": true, - "infill_sparse_density": 30, - "infill_pattern": "triangles", - "gradual_infill_steps": 0 - } - } - ], - "print_times": { - "travel": 187, - "support": 825, - "infill": 351, - "total": 7234 - }, - "print_settings": { - "layer_height": 0.15, - "support_enabled": true, - "support_extruder_nr": 1, - "adhesion_type": "brim", - "wall_line_count": 3, - "retraction_enable": true, - "prime_tower_enable": true, - "infill_sparse_density": 20, - "infill_pattern": "triangles", - "gradual_infill_steps": 0, - "print_sequence": "all_at_once" - }, - "output_to": "LocalFileOutputDevice" -} From 9bf77e9302c94287c5f8b001de9d15759520c824 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 29 Apr 2019 17:29:38 +0200 Subject: [PATCH 04/14] Add icons for the send anonymous data welcome page Contributes to CURA-6434. --- .../images/first_run_machine_types.svg | 33 +++++++++ .../images/first_run_material_usage.svg | 67 +++++++++++++++++++ .../images/first_run_number_slices.svg | 31 +++++++++ .../images/first_run_print_settings.svg | 29 ++++++++ 4 files changed, 160 insertions(+) create mode 100644 resources/themes/cura-light/images/first_run_machine_types.svg create mode 100644 resources/themes/cura-light/images/first_run_material_usage.svg create mode 100644 resources/themes/cura-light/images/first_run_number_slices.svg create mode 100644 resources/themes/cura-light/images/first_run_print_settings.svg diff --git a/resources/themes/cura-light/images/first_run_machine_types.svg b/resources/themes/cura-light/images/first_run_machine_types.svg new file mode 100644 index 0000000000..630fc426b6 --- /dev/null +++ b/resources/themes/cura-light/images/first_run_machine_types.svg @@ -0,0 +1,33 @@ + + + + Machine types + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/images/first_run_material_usage.svg b/resources/themes/cura-light/images/first_run_material_usage.svg new file mode 100644 index 0000000000..19be250c88 --- /dev/null +++ b/resources/themes/cura-light/images/first_run_material_usage.svg @@ -0,0 +1,67 @@ + + + + material usage + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/images/first_run_number_slices.svg b/resources/themes/cura-light/images/first_run_number_slices.svg new file mode 100644 index 0000000000..e8a7124ebc --- /dev/null +++ b/resources/themes/cura-light/images/first_run_number_slices.svg @@ -0,0 +1,31 @@ + + + + number of slices + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/images/first_run_print_settings.svg b/resources/themes/cura-light/images/first_run_print_settings.svg new file mode 100644 index 0000000000..21ed4030e2 --- /dev/null +++ b/resources/themes/cura-light/images/first_run_print_settings.svg @@ -0,0 +1,29 @@ + + + + Print settings + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 24d57f6168224f51368d36967b04fa8cbea124f7 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Apr 2019 09:51:21 +0200 Subject: [PATCH 05/14] Change text according to experts Also make the bottom text a bit longer so the link goes completely in the second line. Contributes to CURA-6434. --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 2 +- resources/qml/WelcomePages/DataCollectionsContent.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 0e83503ed7..51cad2394d 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -71,7 +71,7 @@ Window left: parent.left right: parent.right } - text: catalog.i18nc("@text:window", "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent.") + text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is sent:") wrapMode: Text.WordWrap renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index 295dc3f8a1..3f9819fee8 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -54,7 +54,7 @@ Item width: parent.width anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience. For instance:") + text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:") wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") @@ -99,7 +99,7 @@ Item horizontalAlignment: Text.AlignHCenter text: { - var t = catalog.i18nc("@text", "Ultimaker Cura will not collect any information on the model.") + var t = catalog.i18nc("@text", "The data that Ultimaker Cura collects will not contain any information about your model.") var t2 = catalog.i18nc("@text", "More information") t += " " + t2 + "" return t From f62d19aa6046bbee02ba01a7cf5902eab5b012cc Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 30 Apr 2019 11:24:01 +0200 Subject: [PATCH 06/14] 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 07/14] 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 c26dbfd934e32e2af9966f3666c7bdb800fb82fe Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 1 May 2019 10:27:13 +0200 Subject: [PATCH 08/14] Improve example data HTML CURA-6434 --- plugins/SliceInfoPlugin/example_data.html | 103 +++++++++++++--------- 1 file changed, 63 insertions(+), 40 deletions(-) diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index b03ffe1b81..9c91aa3f9b 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -1,40 +1,63 @@ -Cura Version: 4.0
-System type: Windows
-Machine type: Ultimaker S5
-Quality profile: Fast
-Extruder 1: -
    -
  • Material type: PLA
    • -
  • Print core: AA 0.4
    • -
  • Material used: 1240 mm.
    • -
-Extruder 2: -
    -
  • Material type: PVA
    • -
  • Print core: BB 0.4
    • -
  • Material used: 432 mm.
    • -
-Print settings: -
    -
  • Layer height = 0.15
    • -
  • Wall line count = 3
    • -
  • Enable retraction = no
    • -
  • Infill density = 20%
    • -
  • Infill pattern = triangles
    • -
  • Gradual infill steps = 0
    • -
  • Printing temperature = 220 °C
    • -
  • Generate support = yes
    • -
  • Support extruder = 1
    • -
  • Build Plate Adhesion Type = brim
    • -
  • Enable prime tower = yes
    • -
  • Print sequence = All at once
    • -
  • ...
    • -
-Print times: -
    -
  • Infill = 61200 sec.
    • -
  • Support = 25480 sec.
    • -
  • Travel = 6224 sec.
    • -
  • Walls = 10225 sec.
    • -
  • Total = 103129 sec.
    • -
+ + + Cura Version: 4.0
+ Operating System: Windows 10
+ Language: en_US
+ Machine Type: Ultimaker S5
+ Quality Profile: Fast
+ Using Custom Settings: No + +

Extruder 1:

+
    +
  • Material Type: PLA
    • +
  • Print Core: AA 0.4
    • +
  • Material Used: 1240 mm
    • +
+ +

Extruder 2:

+
    +
  • Material Type: PVA
    • +
  • Print Core: BB 0.4
    • +
  • Material Used: 432 mm
    • +
+ +

Print Settings:

+
    +
  • Layer Height: 0.15
    • +
  • Wall Line Count: 3
    • +
  • Enable Retraction: no
    • +
  • Infill Density: 20%
    • +
  • Infill Pattern: triangles
    • +
  • Gradual Infill Steps: 0
    • +
  • Printing Temperature: 220 °C
    • +
  • Generate Support: yes
    • +
  • Support Extruder: 1
    • +
  • Build Plate Adhesion Type: brim
    • +
  • Enable Prime Tower: yes
    • +
  • Print Sequence: All at once
    • +
  • ...
    • +
+ +

Model Information:

+
    +
  • Model 1
    • +
      +
    • Hash: b72789b9b...
      • +
    • Transformation: [transformation matrix]
      • +
    • Bounding Box: [minimum x, y, z; maximum x, y, z]
      • +
    • Is Helper Mesh: no
      • +
    • Helper Mesh Type: support mesh
      • +
    • ...
      • +
    +
+ +

Print Times:

+
    +
  • Infill: 61200 sec.
    • +
  • Support: 25480 sec.
    • +
  • Travel: 6224 sec.
    • +
  • Walls: 10225 sec.
    • +
  • Total: 103129 sec.
    • +
+ + From 8d6136bcf3f7a282d03e83b887196e28644bf055 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 1 May 2019 13:14:40 +0200 Subject: [PATCH 09/14] Don't crash when materials are not registered It can't update the nodes structure with the links between materials then. Contributes to issue CURA-6444. --- cura/Machines/MaterialManager.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 634f1ba2bd..2163cde623 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -103,6 +103,8 @@ class MaterialManager(QObject): continue root_material_id = material_metadata.get("base_file", "") + if root_material_id not in material_metadatas: #Not a registered material profile. Don't store this in the look-up tables. + continue if root_material_id not in self._material_group_map: self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id])) self._material_group_map[root_material_id].is_read_only = self._container_registry.isReadOnly(root_material_id) From 7258ad8dc2425c761eb6ce039dbbced83e0413fb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 1 May 2019 14:08:53 +0200 Subject: [PATCH 10/14] Fix nesting of ULs A
    tag is only allowed to have
  • tags inside it, so the nested
      tag needs to be inside the
    • tag. Contributes to issue CURA-6434. --- plugins/SliceInfoPlugin/example_data.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index 9c91aa3f9b..61090b06fe 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -40,15 +40,17 @@

      Model Information:

        -
      • Model 1
        • -
          -
        • Hash: b72789b9b...
          • -
        • Transformation: [transformation matrix]
          • -
        • Bounding Box: [minimum x, y, z; maximum x, y, z]
          • -
        • Is Helper Mesh: no
          • -
        • Helper Mesh Type: support mesh
          • -
        • ...
          • -
        +
      • + Model 1 +
          +
        • Hash: b72789b9b...
          • +
        • Transformation: [transformation matrix]
          • +
        • Bounding Box: [minimum x, y, z; maximum x, y, z]
          • +
        • Is Helper Mesh: no
          • +
        • Helper Mesh Type: support mesh
          • +
        • ...
          • +
        +

      Print Times:

      From 15fae58d9bc15a3aed3fe81793a94db189a778ca Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 1 May 2019 14:13:10 +0200 Subject: [PATCH 11/14] Use text wrapping so it's scrollable in Qt 5.12 I don't know if it's really in Qt 5.12 or maybe it's the Ubuntu implementation or whatever. But this works for me now. Contributes to issue CURA-6434. --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 51cad2394d..f19e2cce19 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -90,6 +90,7 @@ Window textArea.text: manager.getExampleData() textArea.textFormat: Text.RichText + textArea.wrapMode: Text.Wrap textArea.readOnly: true } } From ab0cef95e8645f1c237c1b7194f57e5d52c1b181 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 1 May 2019 14:38:55 +0200 Subject: [PATCH 12/14] Sort secondarily by printer name Makes it a bit easier to find printers. Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/ --- cura/Machines/Models/GlobalStacksModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/GlobalStacksModel.py b/cura/Machines/Models/GlobalStacksModel.py index f15fe1878b..707d71be97 100644 --- a/cura/Machines/Models/GlobalStacksModel.py +++ b/cura/Machines/Models/GlobalStacksModel.py @@ -73,5 +73,5 @@ class GlobalStacksModel(ListModel): "hasRemoteConnection": has_remote_connection, "metadata": container_stack.getMetaData().copy(), "discoverySource": section_name}) - items.sort(key = lambda i: not i["hasRemoteConnection"]) + items.sort(key = lambda i: (not i["hasRemoteConnection"], i["name"])) self.setItems(items) From 32c8bbfb3c781288e393ca4c489e88b256391752 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 1 May 2019 15:50:43 +0200 Subject: [PATCH 13/14] 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 14/14] 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