Resolve merge conflicts

CURA-6483
2025-08-07 05:53:59 -06:00 · 2019-05-02 07:45:40 +02:00 · 2019-05-02 07:45:40 +02:00 · 71e32d94f7
commit 71e32d94f7
parent 0575fd283e 9500d2d6b8
30 changed files with 348 additions and 211 deletions
--- 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
            }
@ -89,6 +89,8 @@ Window
                }

                textArea.text: manager.getExampleData()
+                textArea.textFormat: Text.RichText
+                textArea.wrapMode: Text.Wrap
                textArea.readOnly: true
            }
        }
--- 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()
--- a/plugins/SliceInfoPlugin/example_data.html
+++ b/plugins/SliceInfoPlugin/example_data.html
@ -0,0 +1,64 @@
+<html>
+<body>
+    <b>Cura Version:</b> 4.0<br/>
+    <b>Operating System:</b> Windows 10<br/>
+    <b>Language:</b> en_US<br/>
+    <b>Machine Type:</b> Ultimaker S5<br/>
+    <b>Quality Profile:</b> Fast<br/>
+    <b>Using Custom Settings:</b> No
+
+    <h3>Extruder 1:</h3>
+    <ul>
+        <li><b>Material Type:</b> PLA</li>
+        <li><b>Print Core:</b> AA 0.4</li>
+        <li><b>Material Used:</b> 1240 mm</li>
+    </ul>
+
+    <h3>Extruder 2:</h3>
+    <ul>
+        <li><b>Material Type:</b> PVA</li>
+        <li><b>Print Core:</b> BB 0.4</li>
+        <li><b>Material Used:</b> 432 mm</li>
+    </ul>
+
+    <h3>Print Settings:</h3>
+    <ul>
+        <li><b>Layer Height:</b> 0.15</li>
+        <li><b>Wall Line Count:</b> 3</li>
+        <li><b>Enable Retraction:</b> no</li>
+        <li><b>Infill Density:</b> 20%</li>
+        <li><b>Infill Pattern:</b> triangles</li>
+        <li><b>Gradual Infill Steps:</b> 0</li>
+        <li><b>Printing Temperature:</b> 220 °C</li>
+        <li><b>Generate Support:</b> yes</li>
+        <li><b>Support Extruder:</b> 1</li>
+        <li><b>Build Plate Adhesion Type:</b> brim</li>
+        <li><b>Enable Prime Tower:</b> yes</li>
+        <li><b>Print Sequence:</b> All at once</li>
+        <li>...</li>
+    </ul>
+
+    <h3>Model Information:</h3>
+    <ul>
+        <li>
+            <b>Model 1</b>
+            <ul>
+                <li><b>Hash:</b> b72789b9b...</li>
+                <li><b>Transformation:</b> [transformation matrix]</li>
+                <li><b>Bounding Box:</b> [minimum x, y, z; maximum x, y, z]</li>
+                <li><b>Is Helper Mesh:</b> no</li>
+                <li><b>Helper Mesh Type:</b> support mesh</li>
+            </ul>
+        </li>
+    </ul>
+
+    <h3>Print Times:</h3>
+    <ul>
+        <li>Infill: 61200 sec.</li>
+        <li>Support: 25480 sec.</li>
+        <li>Travel: 6224 sec.</li>
+        <li>Walls: 10225 sec.</li>
+        <li>Total: 103129 sec.</li>
+    </ul>
+</body>
+</html>
--- a/plugins/SliceInfoPlugin/example_data.json
+++ b/plugins/SliceInfoPlugin/example_data.json
@ -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"
-}
--- 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
        }
    }
 }
--- 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)
--- 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
--- 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
        }
    }
 }
--- 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
    }
 }
--- 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
            }
        }
    }
--- 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
            }
        }
    }
--- 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
    }
 }
--- 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
                    }
                }

@ -315,6 +316,7 @@ Item
                    return ""
                }
                visible: text !== ""
+                renderType: Text.NativeRendering
            }

            Item
@ -356,6 +358,7 @@ Item
                    // FIXED-LINE-HEIGHT:
                    height: 18 * screenScaleFactor // TODO: Theme!
                    verticalAlignment: Text.AlignVCenter
+                    renderType: Text.NativeRendering
                }

                Label
@ -376,6 +379,7 @@ Item
                    // FIXED-LINE-HEIGHT:
                    height: 18 * screenScaleFactor // TODO: Theme!
                    verticalAlignment: Text.AlignVCenter
+                    renderType: Text.NativeRendering
                }
            }

@ -403,6 +407,7 @@ Item
                // FIXED-LINE-HEIGHT:
                height: 18 * screenScaleFactor // TODO: Theme!
                verticalAlignment: Text.AlignVCenter
+                renderType: Text.NativeRendering
            }
        }

@ -437,6 +442,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!
--- 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
    }
 }
--- 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
--- 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;
--- 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 {