3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Update usb printing menu to qt controls 2

Browse source 
CURA-8688
This commit is contained in:
casper 2022-03-01 11:36:47 +01:00
parent e131c596df
commit bd1b0fb34c
5 changed files with 65 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

41
resources/qml/PrinterOutput/HeatedBedBox.qml
View file

@ -1,9 +1,8 @@
// Copyright (c) 2017 Ultimaker B.V.
// Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.4
import UM 1.2 as UM
import Cura 1.0 as Cura
@ -20,17 +19,17 @@ Item
color: UM.Theme.getColor("main_background")
anchors.fill: parent
Label //Build plate label.
// Build plate label.
UM.Label
{
text: catalog.i18nc("@label", "Build plate")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
}
Label //Target temperature.
// Target temperature.
UM.Label
{
id: bedTargetTemperature
text: printerModel != null ? printerModel.targetBedTemperature + "°C" : ""
@ -40,7 +39,8 @@ Item
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottom: bedCurrentTemperature.bottom
MouseArea //For tooltip.
// For tooltip.
MouseArea
{
id: bedTargetTemperatureTooltipArea
hoverEnabled: true
@ -62,17 +62,18 @@ Item
}
}
}
Label //Current temperature.
// Current temperature.
UM.Label
{
id: bedCurrentTemperature
text: printerModel != null ? printerModel.bedTemperature + "°C" : ""
font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text")
anchors.right: bedTargetTemperature.left
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
MouseArea //For tooltip.
//For tooltip.
MouseArea
{
id: bedTemperatureTooltipArea
hoverEnabled: true
@ -94,7 +95,8 @@ Item
}
}
}
Rectangle //Input field for pre-heat temperature.
//Input field for pre-heat temperature.
Rectangle
{
id: preheatTemperatureControl
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_ok")
@ -166,7 +168,7 @@ Item
}
}
}
Label
UM.Label
{
id: unit
anchors.right: parent.right
@ -175,7 +177,6 @@ Item
text: "°C";
color: UM.Theme.getColor("setting_unit")
font: UM.Theme.getFont("default")
}
TextInput
{
@ -213,7 +214,8 @@ Item
}
}
Cura.SecondaryButton // The pre-heat button.
// The pre-heat button.
Cura.SecondaryButton
{
id: preheatButton
height: UM.Theme.getSize("setting_control").height
@ -248,14 +250,15 @@ Item
text:
{
if(printerModel == null)
if (printerModel == null)
{
return ""
}
if(printerModel.isPreheating )
if (printerModel.isPreheating )
{
return catalog.i18nc("@button Cancel pre-heating", "Cancel")
} else
}
else
{
return catalog.i18nc("@button", "Pre-heat")
}
@ -279,7 +282,7 @@ Item
{
base.showTooltip(
base,
{x: 0, y: preheatButton.mapToItem(base, 0, 0).y},
{ x: 0, y: preheatButton.mapToItem(base, 0, 0).y },
catalog.i18nc("@tooltip of pre-heat", "Heat the bed in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the bed to heat up when you're ready to print.")
);
}