GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 13:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update styling of Material management page

Browse Source 
Contributes to CURA-342
This commit is contained in:
Arjen Hiemstra 2016-06-28 17:44:19 +02:00
parent 47079dc2dd
commit f7e4b91569
1 changed files with 72 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
resources/qml/Preferences/MaterialView.qml
View File

@ -14,19 +14,26 @@ TabView
property QtObject properties; property QtObject properties;
property bool editingEnabled; property bool editingEnabled: false;
property string currency: UM.Preferences.getValue("general/currency") ? UM.Preferences.getValue("general/currency") : "€" property string currency: UM.Preferences.getValue("general/currency") ? UM.Preferences.getValue("general/currency") : "€"
property real firstColumnWidth: width * 0.45
property real secondColumnWidth: width * 0.45
property string containerId: ""
Tab Tab
{ {
title: "Information" title: "Information"
anchors
{
leftMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("default_margin").height
bottomMargin: UM.Theme.getSize("default_margin").height
rightMargin: 0
}
ScrollView ScrollView
{ {
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
Flow Flow
@ -35,22 +42,19 @@ TabView
width: base.width; width: base.width;
property real firstColumnWidth: width * 0.45
property real secondColumnWidth: width * 0.4
property real rowHeight: textField.height; property real rowHeight: textField.height;
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
TextField { id: textField; width: parent.secondColumnWidth; text: properties.supplier; readOnly: !base.editingEnabled; } TextField { id: textField; width: base.secondColumnWidth; text: properties.supplier; readOnly: !base.editingEnabled; }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
TextField { width: parent.secondColumnWidth; text: properties.material_type; readOnly: !base.editingEnabled; } TextField { width: base.secondColumnWidth; text: properties.material_type; readOnly: !base.editingEnabled; }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
Row Row
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
height: parent.rowHeight; height: parent.rowHeight;
spacing: UM.Theme.getSize("default_margin").width/2 spacing: UM.Theme.getSize("default_margin").width/2
@ -75,10 +79,10 @@ TabView
Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: "<b>" + catalog.i18nc("@label", "Properties") + "</b>" } Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: "<b>" + catalog.i18nc("@label", "Properties") + "</b>" }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: properties.density; value: properties.density;
decimals: 2 decimals: 2
suffix: "g/cm" suffix: "g/cm"
@ -86,10 +90,10 @@ TabView
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
} }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: properties.diameter; value: properties.diameter;
decimals: 2 decimals: 2
suffix: "mm³" suffix: "mm³"
@ -97,38 +101,38 @@ TabView
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
} }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: properties.spool_cost; value: properties.spool_cost;
prefix: base.currency prefix: base.currency
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
} }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: properties.spool_weight; value: properties.spool_weight;
suffix: "g"; suffix: "g";
stepSize: 10 stepSize: 10
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
} }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: parseFloat(properties.spool_length); value: parseFloat(properties.spool_length);
suffix: "m"; suffix: "m";
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
} }
Label { width: parent.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter (Approx.)") } Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter (Approx.)") }
ReadOnlySpinBox ReadOnlySpinBox
{ {
width: parent.secondColumnWidth; width: base.secondColumnWidth;
value: parseFloat(properties.cost_per_meter); value: parseFloat(properties.cost_per_meter);
suffix: catalog.i18nc("@label", "%1/m".arg(base.currency)); suffix: catalog.i18nc("@label", "%1/m".arg(base.currency));
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
@ -141,7 +145,7 @@ TabView
TextArea TextArea
{ {
text: properties.description; text: properties.description;
width: parent.firstColumnWidth + parent.secondColumnWidth width: base.firstColumnWidth + base.secondColumnWidth
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
@ -152,7 +156,7 @@ TabView
TextArea TextArea
{ {
text: properties.adhesion_info; text: properties.adhesion_info;
width: parent.firstColumnWidth + parent.secondColumnWidth width: base.firstColumnWidth + base.secondColumnWidth
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
readOnly: !base.editingEnabled; readOnly: !base.editingEnabled;
@ -164,7 +168,13 @@ TabView
Tab Tab
{ {
title: catalog.i18nc("@label", "Print settings") title: catalog.i18nc("@label", "Print settings")
anchors.margins: UM.Theme.getSize("default_margin").height anchors
{
leftMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("default_margin").height
bottomMargin: UM.Theme.getSize("default_margin").height
rightMargin: 0
}
ScrollView ScrollView
{ {
@ -175,11 +185,43 @@ TabView
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
containerId: Cura.MachineManager.activeDefinitionId containerId: Cura.MachineManager.activeDefinitionId
visibilityHandler: UM.SettingPreferenceVisibilityHandler { } visibilityHandler: Cura.MaterialSettingsVisibilityHandler { }
expanded: ["*"] expanded: ["*"]
} }
delegate: Label { text: model.label } delegate: UM.TooltipArea
{
width: childrenRect.width
height: childrenRect.height
text: model.description
Label
{
id: label
width: base.firstColumnWidth;
height: spinBox.height
text: model.label
}
ReadOnlySpinBox
{
id: spinBox
anchors.left: label.right
value: parseFloat(provider.properties.value);
width: base.secondColumnWidth;
readOnly: !base.editingEnabled
suffix: model.unit
maximumValue: 99999
decimals: model.unit == "mm" ? 2 : 0
}
UM.SettingPropertyProvider
{
id: provider
containerStackId: Cura.MachineManager.activeMachineId
key: model.key
watchedProperties: [ "value" ]
}
}
} }
} }
} }