diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index 42df08560a..99d78537c3 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.3 import QtQuick.Controls 1.4 as Controls1 -import UM 1.3 as UM +import UM 1.4 as UM import Cura 1.0 as Cura @@ -57,16 +57,34 @@ Column font: UM.Theme.getFont("default") renderType: Text.NativeRendering } - - Cura.IconWithText + Item { id: unableToSliceMessage width: parent.width visible: widget.backendState == UM.Backend.Error - text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") - source: UM.Theme.getIcon("Warning") - iconColor: UM.Theme.getColor("warning") + height: warningIcon.height + UM.StatusIcon + { + id: warningIcon + anchors.verticalCenter: parent.verticalCenter + width: visible ? UM.Theme.getSize("section_icon").width : 0 + height: width + status: UM.StatusIcon.Status.WARNING + } + Label + { + id: label + anchors.left: warningIcon.right + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: UM.Theme.getSize("default_margin").width + text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering + wrapMode: Text.WordWrap + } } // Progress bar, only visible when the backend is in the process of slice the printjob diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index afedafa9c2..75ae18a593 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.3 -import UM 1.2 as UM +import UM 1.4 as UM import Cura 1.0 as Cura Item @@ -28,31 +28,25 @@ Item { width: parent.width visible: configurationList.model.length == 0 - height: label.height + UM.Theme.getSize("wide_margin").height + height: icon.height anchors.top: parent.top anchors.topMargin: UM.Theme.getSize("default_margin").height - - Rectangle + UM.StatusIcon { id: icon - color: UM.Theme.getColor("warning") - width: UM.Theme.getSize("section_icon").width + width: visible ? UM.Theme.getSize("section_icon").width : 0 height: width - radius: width / 2 - UM.RecolorImage - { - anchors.fill:parent - source: UM.Theme.getIcon("Warning", "low") - color: UM.Theme.getColor("message_warning_icon") - } + anchors.verticalCenter: parent.verticalCenter + status: UM.StatusIcon.Status.WARNING } Label { id: label anchors.left: icon.right anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: UM.Theme.getSize("default_margin").width - // There are two cases that we want to diferenciate, one is when Cura is loading the configurations and the + // There are two cases that we want to differenciate, one is when Cura is loading the configurations and the // other when the connection was lost text: Cura.MachineManager.printerConnected ? catalog.i18nc("@label", "Loading available configurations from the printer...") :