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

Translated text overlaps GUI

Browse source 
CURA-3799
This commit is contained in:
alekseisasin 2017-08-01 15:50:55 +02:00
parent b714f0ff3e
commit d6c1a231ac
2 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
plugins/LayerView/LayerView.qml
View file

@ -63,6 +63,8 @@ Item
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("layerview_row_spacing").height spacing: UM.Theme.getSize("layerview_row_spacing").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
Label Label
{ {
@ -71,6 +73,8 @@ Item
text: catalog.i18nc("@label","View Mode: Layers") text: catalog.i18nc("@label","View Mode: Layers")
font.bold: true font.bold: true
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
Layout.fillWidth: true
elide: Text.ElideMiddle;
} }
Label Label
@ -117,6 +121,8 @@ Item
model: layerViewTypes model: layerViewTypes
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
style: UM.Theme.styles.combobox style: UM.Theme.styles.combobox
anchors.right: parent.right
anchors.rightMargin: 10
onActivated: onActivated:
{ {
@ -176,17 +182,18 @@ Item
Repeater { Repeater {
model: Cura.ExtrudersModel{} model: Cura.ExtrudersModel{}
CheckBox { CheckBox {
id: extrudersModelCheckBox
checked: view_settings.extruder_opacities[index] > 0.5 || view_settings.extruder_opacities[index] == undefined || view_settings.extruder_opacities[index] == "" checked: view_settings.extruder_opacities[index] > 0.5 || view_settings.extruder_opacities[index] == undefined || view_settings.extruder_opacities[index] == ""
onClicked: { onClicked: {
view_settings.extruder_opacities[index] = checked ? 1.0 : 0.0 view_settings.extruder_opacities[index] = checked ? 1.0 : 0.0
UM.Preferences.setValue("layerview/extruder_opacities", view_settings.extruder_opacities.join("|")); UM.Preferences.setValue("layerview/extruder_opacities", view_settings.extruder_opacities.join("|"));
} }
text: model.name
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
enabled: index + 1 <= 4 enabled: index + 1 <= 4
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: extrudersModelCheckBox.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: model.color color: model.color
@ -198,6 +205,17 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox style: UM.Theme.styles.checkbox
Text
{
text: model.name
elide: Text.ElideRight
color: UM.Theme.getColor("text")
anchors.verticalCenter: parent.verticalCenter
anchors.left: extrudersModelCheckBox.left;
anchors.right: extrudersModelCheckBox.right;
anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
}
} }
} }
@ -234,14 +252,15 @@ Item
} }
CheckBox { CheckBox {
id: legendModelCheckBox
checked: model.initialValue checked: model.initialValue
onClicked: { onClicked: {
UM.Preferences.setValue(model.preference, checked); UM.Preferences.setValue(model.preference, checked);
} }
text: label
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: legendModelCheckBox.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: UM.Theme.getColor(model.colorId) color: UM.Theme.getColor(model.colorId)
@ -253,6 +272,17 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox style: UM.Theme.styles.checkbox
Text
{
text: label
elide: Text.ElideRight
color: UM.Theme.getColor("text")
anchors.verticalCenter: parent.verticalCenter
anchors.left: legendModelCheckBox.left;
anchors.right: legendModelCheckBox.right;
anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
}
} }
} }
@ -294,9 +324,11 @@ Item
Label { Label {
text: label text: label
visible: view_settings.show_legend visible: view_settings.show_legend
id: typesLegenModelLabel
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: typesLegenModelLabel.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: UM.Theme.getColor(model.colorId) color: UM.Theme.getColor(model.colorId)

1
resources/qml/SidebarSimple.qml
View file

@ -416,6 +416,7 @@ Item
text: catalog.i18nc("@label", "Build Plate Adhesion"); text: catalog.i18nc("@label", "Build Plate Adhesion");
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
elide: Text.ElideRight
} }
CheckBox CheckBox