3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"

Browse source 
This reverts commit 6120d8a054, reversing
changes made to 95652556fe.
This commit is contained in:
Jaime van Kessel 2021-05-27 16:06:20 +02:00
parent 38ce22ba7c
commit 70e4e9640e
No known key found for this signature in database
GPG key ID: 3710727397403C91
283 changed files with 1518 additions and 945 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -51,7 +51,7 @@ Item
anchors.centerIn: parent
color: UM.Theme.getColor("monitor_icon_primary")
height: parent.height
source: "../svg/icons/Buildplate.svg"
source: "../svg/icons/buildplate.svg"
width: height
visible: buildplate
}

4
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View file

@ -98,7 +98,7 @@ Item
sourceSize.width: width // TODO: Theme!
sourceSize.height: width // TODO: Theme!
color: UM.Theme.getColor("text")
source: UM.Theme.getIcon("ChevronSingleLeft")
source: UM.Theme.getIcon("arrow_left")
}
}
}
@ -177,7 +177,7 @@ Item
sourceSize.width: width // TODO: Theme!
sourceSize.height: width // TODO: Theme!
color: UM.Theme.getColor("text")
source: UM.Theme.getIcon("ChevronSingleRight")
source: UM.Theme.getIcon("arrow_right")
}
}
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -22,7 +22,7 @@ Item
property int size: 32 * screenScaleFactor // TODO: Theme!
// THe extruder icon source; NOTE: This shouldn't need to be changed
property string iconSource: "../svg/icons/Extruder.svg"
property string iconSource: "../svg/icons/extruder.svg"
height: size
width: size

12
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
View file

@ -71,20 +71,20 @@ Item
}
if (printJob.configurationChanges.length > 0)
{
return "../svg/Warning.svg"
return "../svg/warning-icon.svg"
}
switch(printJob.state)
{
case "error":
return "../svg/CancelCircle.svg"
return "../svg/aborted-icon.svg"
case "wait_cleanup":
return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : ""
return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : ""
case "pausing":
return "../svg/PauseCircle.svg"
return "../svg/paused-icon.svg"
case "paused":
return "../svg/PauseCircle.svg"
return "../svg/paused-icon.svg"
case "resuming":
return "../svg/PauseCircle.svg"
return "../svg/paused-icon.svg"
default:
return ""
}

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -164,7 +164,7 @@ Item
verticalCenter: managePrinterText.verticalCenter
}
color: UM.Theme.getColor("text_link")
source: UM.Theme.getIcon("LinkExternal")
source: UM.Theme.getIcon("external_link")
width: 12 * screenScaleFactor
height: 12 * screenScaleFactor
}
@ -265,7 +265,7 @@ Item
bottom: parent.bottom
bottomMargin: 20 * screenScaleFactor // TODO: Theme!
}
iconSource: "../svg/icons/CameraPhoto.svg"
iconSource: "../svg/icons/camera.svg"
enabled: !cloudConnection
visible: printer
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -48,7 +48,7 @@ Item
id: externalLinkIcon
anchors.verticalCenter: manageQueueLabel.verticalCenter
color: UM.Theme.getColor("text_link")
source: UM.Theme.getIcon("LinkExternal")
source: UM.Theme.getIcon("external_link")
width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!)
}

2
plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml
View file

@ -30,7 +30,7 @@ Item {
top: cameraImage.top
topMargin: UM.Theme.getSize("default_margin").height
}
iconSource: UM.Theme.getIcon("Cancel");
iconSource: UM.Theme.getIcon("cross1");
z: 999;
}