Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode

resources/i18n/de_DE/cura.po

@@ -36,6 +36,31 @@ msgctxt "@label:status"
 msgid "Can't start print"
 msgstr "Druck startet nicht"
 
+#: Manually added for plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
+msgctxt "@label"
+msgid "This printer is not set up to host a group of Ultimaker 3 printers."
+msgstr "Dieser Drucker ist nicht eingerichtet um eine Gruppe von Ultimaker 3 Druckern anzusteuern."
+
+#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
+msgctxt "@label"
+msgid "Finishes at: "
+msgstr "Endet um: "
+
+#: Manually added for plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
+msgctxt "@label"
+msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
+msgstr "Dieser Drucker steuert eine Gruppe von %1 Ultimaker 3 Druckern an."
+
+#: Manually added for plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
+msgctxt "@info:status"
+msgid "Printer '{printer_name}' has finished printing '{job_name}'."
+msgstr "Drucker '{printer_name}' hat '{job_name}' vollständig gedrückt."
+
+#: Manually added for plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
+msgctxt "@info:status"
+msgid "Print finished"
+msgstr "Druck vollendet"
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
 msgctxt "@action"
 msgid "Machine Settings"

resources/qml/Cura.qml

@@ -16,7 +16,7 @@ UM.MainWindow
 {
     id: base
     //: Cura application window title
-    title: catalog.i18nc("@title:window","Cura");
+    title: catalog.i18nc("@title:window","Ultimaker Cura");
     viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
     property bool showPrintMonitor: false
 

resources/qml/JobSpecs.qml

@@ -18,6 +18,7 @@ Item {
     UM.I18nCatalog { id: catalog; name:"cura"}
 
     height: childrenRect.height
+    width: childrenRect.width
 
     Connections
     {

resources/qml/PrintMonitor.qml

@@ -442,6 +442,7 @@ Column
                 anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
+                renderType: Text.NativeRendering
 
                 Component.onCompleted:
                 {

resources/qml/Settings/SettingTextField.qml

@@ -102,6 +102,7 @@ SettingItem
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
+            renderType: Text.NativeRendering
 
             Keys.onTabPressed:
             {

resources/qml/Sidebar.qml

@@ -152,7 +152,7 @@ Rectangle
             Button {
                 height: settingsModeSelection.height
                 anchors.left: parent.left
-                anchors.leftMargin: model.index * (settingsModeSelection.width / 2)
+                anchors.leftMargin: model.index * Math.floor(settingsModeSelection.width / 2)
                 anchors.verticalCenter: parent.verticalCenter
                 width: Math.floor(0.5 * parent.width)
                 text: model.text

resources/qml/SidebarSimple.qml

@@ -687,11 +687,14 @@ Item
                 anchors.topMargin: parseInt(UM.Theme.getSize("sidebar_margin").height * 1.5)
                 anchors.left: parent.left
                 anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
+                anchors.right: infillCellLeft.right
+                anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
                 anchors.verticalCenter: enableSupportCheckBox.verticalCenter
 
                 text: catalog.i18nc("@label", "Generate Support");
                 font: UM.Theme.getFont("default");
                 color: UM.Theme.getColor("text");
+                elide: Text.ElideRight
             }
 
             CheckBox
@@ -737,10 +740,13 @@ Item
                 visible: supportExtruderCombobox.visible
                 anchors.left: parent.left
                 anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
+                anchors.right: infillCellLeft.right
+                anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
                 anchors.verticalCenter: supportExtruderCombobox.verticalCenter
                 text: catalog.i18nc("@label", "Support Extruder");
                 font: UM.Theme.getFont("default");
                 color: UM.Theme.getColor("text");
+                elide: Text.ElideRight
             }
 
             ComboBox

resources/qml/Toolbar.qml

@@ -30,7 +30,8 @@ Item
             id: repeat
 
             model: UM.ToolModel { }
-
+            width: childrenRect.width
+            height: childrenRect.height
             Button
             {
                 text: model.name
@@ -72,6 +73,8 @@ Item
         Repeater
         {
             id: extruders
+            width: childrenRect.width
+            height: childrenRect.height
             property var _model: Cura.ExtrudersModel { id: extrudersModel }
             model: _model.items.length > 1 ? _model : 0
             ExtruderButton { extruder: model }

resources/qml/Topbar.qml

@@ -279,7 +279,8 @@ Rectangle
 
         property var buttonTarget: Qt.point(viewModeButton.x + viewModeButton.width / 2, viewModeButton.y + viewModeButton.height / 2)
 
-        height: childrenRect.height;
+        height: childrenRect.height
+        width: childrenRect.width
 
         source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : "";
     }