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

Fix styling of USB Printing control and firmware window

Browse source 
Contributes to Ultimaker/Uranium#8
This commit is contained in:
Arjen Hiemstra 2015-07-06 18:08:53 +02:00
parent 4a2c0b2411
commit 17e5d1f835
2 changed files with 54 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

98
plugins/USBPrinting/ControlWindow.qml
View file

@ -4,66 +4,64 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.1
import UM 1.0 as UM import UM 1.0 as UM
UM.Dialog { UM.Dialog {
width: 300; height: 100 width: 500 * Screen.devicePixelRatio;
height: 100 * Screen.devicePixelRatio;
Rectangle title: "Print with USB"
Column
{ {
anchors.fill: parent; anchors.fill: parent;
ColumnLayout Row
{ {
RowLayout spacing: UM.Theme.sizes.default_margin.width;
Text
{ {
Text //: USB Printing dialog label, %1 is head temperature
{ text: qsTr("Extruder Temperature %1").arg(manager.extruderTemperature)
//: USB Printing dialog label, %1 is head temperature }
text: qsTr("Extruder Temperature %1").arg(manager.extruderTemperature) Text
} {
Text //: USB Printing dialog label, %1 is bed temperature
{ text: qsTr("Bed Temperature %1").arg(manager.bedTemperature)
//: USB Printing dialog label, %1 is bed temperature }
text: qsTr("Bed Temperature %1").arg(manager.bedTemperature) Text
} {
Text text: "" + manager.error
{ }
text: "" + manager.error
}
} }
RowLayout
{ ProgressBar
Button {
{ id: prog;
//: USB Printing dialog start print button anchors.left: parent.left;
text: qsTr("Print"); anchors.right: parent.right;
onClicked: { manager.startPrint() }
enabled: manager.progress == 0 ? true : false minimumValue: 0;
} maximumValue: 100;
Button value: manager.progress
{
//: USB Printing dialog cancel print button
text: qsTr("Cancel");
onClicked: { manager.cancelPrint() }
enabled: manager.progress == 0 ? false: true
}
}
ProgressBar
{
id: prog;
value: manager.progress
minimumValue: 0;
maximumValue: 100;
Layout.maximumWidth:parent.width
Layout.preferredWidth:230
Layout.preferredHeight:25
Layout.minimumWidth:230
Layout.minimumHeight:25
width: 230
height: 25
}
} }
} }
rightButtons: [
Button {
//: USB Printing dialog start print button
text: qsTr("Print");
onClicked: { manager.startPrint() }
enabled: manager.progress == 0 ? true : false
},
Button
{
//: USB Printing dialog cancel print button
text: qsTr("Cancel");
onClicked: { manager.cancelPrint() }
enabled: manager.progress == 0 ? false: true
}
]
} }

10
plugins/USBPrinting/FirmwareUpdateWindow.qml
View file

@ -17,6 +17,8 @@ UM.Dialog
visible: true; visible: true;
modality: Qt.ApplicationModal; modality: Qt.ApplicationModal;
title: "Firmware Update";
Column Column
{ {
anchors.fill: parent; anchors.fill: parent;
@ -66,4 +68,12 @@ UM.Dialog
id: palette; id: palette;
} }
} }
rightButtons: [
Button {
text: "Close";
enabled: manager.progress >= 100;
onClicked: base.visible = false;
}
]
} }