Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-12-11 15:53:05 +0300
committerDiego Prado Gesto <d.pradogesto@ultimaker.com>2018-12-11 15:53:05 +0300
commitfaa3f42acc6f88a63b26443b6edd500061689e93 (patch)
tree8ec927f6a649c9fccca1d84fb91dd2416b57d100 /plugins/SimulationView
parent3593b7f152470b79f64351a84370ece98ff58677 (diff)
Modify the header in the simulation view menu component
This is needed to align with the designs.
Diffstat (limited to 'plugins/SimulationView')
-rw-r--r--plugins/SimulationView/SimulationViewMenuComponent.qml40
1 files changed, 31 insertions, 9 deletions
diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index 58b2bfe520..ed615bf4f6 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -35,14 +35,36 @@ Cura.ExpandableComponent
}
}
- headerItem: Label
+ headerItem: Item
{
- id: layerViewTypesLabel
- text: catalog.i18nc("@label", "Color scheme")
- font: UM.Theme.getFont("default")
- color: UM.Theme.getColor("setting_control_text")
- height: base.height
- verticalAlignment: Text.AlignVCenter
+ Label
+ {
+ id: colorSchemeLabel
+ text: catalog.i18nc("@label", "Color scheme")
+ verticalAlignment: Text.AlignVCenter
+ height: parent.height
+ elide: Text.ElideRight
+ font: UM.Theme.getFont("default")
+ color: UM.Theme.getColor("text_medium")
+ renderType: Text.NativeRendering
+ }
+
+ Label
+ {
+ text: layerTypeCombobox.currentText
+ verticalAlignment: Text.AlignVCenter
+ anchors
+ {
+ left: colorSchemeLabel.right
+ leftMargin: UM.Theme.getSize("default_margin").width
+ right: parent.right
+ }
+ height: parent.height
+ elide: Text.ElideRight
+ font: UM.Theme.getFont("default")
+ color: UM.Theme.getColor("text")
+ renderType: Text.NativeRendering
+ }
}
contentItem: Column
@@ -125,7 +147,7 @@ Cura.ExpandableComponent
Label
{
id: compatibilityModeLabel
- text: catalog.i18nc("@label","Compatibility Mode")
+ text: catalog.i18nc("@label", "Compatibility Mode")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
visible: UM.SimulationView.compatibilityMode
@@ -136,7 +158,7 @@ Cura.ExpandableComponent
Item // Spacer
{
- height: Math.round(UM.Theme.getSize("default_margin").width / 2)
+ height: UM.Theme.getSize("narrow_margin").width
width: width
}