3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into feature_extruder_warning_icon

Browse source
This commit is contained in:
fieldOfView 2021-08-24 17:39:28 +02:00
commit 96a1019f1e
523 changed files with 18237 additions and 8901 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -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,30 +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
UM.RecolorImage
UM.StatusIcon
{
id: icon
anchors.left: parent.left
anchors.verticalCenter: label.verticalCenter
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
width: UM.Theme.getSize("section_icon").width
width: visible ? UM.Theme.getSize("section_icon").width : 0
height: width
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...") :