GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of long names in sync configuration menu

Browse Source
This commit is contained in:
Jaime van Kessel 2019-02-05 13:31:50 +01:00
parent d59889a4ab
commit b6f5dd8f94
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View File

@ -52,7 +52,7 @@ Button
anchors anchors
{ {
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("wide_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("wide_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
} }
@ -63,10 +63,10 @@ Button
{ {
id: repeater id: repeater
model: configuration.extruderConfigurations model: configuration.extruderConfigurations
width: parent.width
delegate: PrintCoreConfiguration delegate: PrintCoreConfiguration
{ {
width: Math.round(parent.width / 2) width: Math.round(parent.width / configuration.extruderConfigurations.length)
printCoreConfiguration: modelData printCoreConfiguration: modelData
visible: configurationItem.isValidMaterial visible: configurationItem.isValidMaterial
} }

14
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml
View File

@ -7,17 +7,17 @@ import QtQuick.Controls 2.0
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Row Item
{ {
id: extruderInfo id: extruderInfo
property var printCoreConfiguration property var printCoreConfiguration
height: information.height height: information.height
spacing: UM.Theme.getSize("default_margin").width
//Extruder icon. //Extruder icon.
Cura.ExtruderIcon Cura.ExtruderIcon
{ {
id: icon
materialColor: printCoreConfiguration.material.color materialColor: printCoreConfiguration.material.color
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
extruderEnabled: printCoreConfiguration.material.brand !== "" && printCoreConfiguration.hotendID !== "" extruderEnabled: printCoreConfiguration.material.brand !== "" && printCoreConfiguration.hotendID !== ""
@ -26,6 +26,13 @@ Row
Column Column
{ {
id: information id: information
anchors
{
left: icon.right
right: parent.right
margins: UM.Theme.getSize("default_margin").width
}
Label Label
{ {
text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.brand : " " //Use space so that the height is still correct. text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.brand : " " //Use space so that the height is still correct.
@ -33,6 +40,7 @@ Row
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
width: parent.width
} }
Label Label
{ {
@ -41,6 +49,7 @@ Row
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
width: parent.width
} }
Label Label
{ {
@ -49,6 +58,7 @@ Row
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
width: parent.width
} }
} }
} }