GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 21:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add icons to the left of titles

Browse Source 
Align title text with values in table

CURA-9424
This commit is contained in:
Joey de l'Arago 2022-11-01 18:19:50 +01:00
parent b01ff2f57e
commit f72c980c20
1 changed files with 144 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -93,6 +93,7 @@ UM.Dialog
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
anchors.leftMargin: UM.Theme.getSize("default_margin")
UM.TooltipArea UM.TooltipArea
{ {
@ -109,6 +110,7 @@ UM.Dialog
id: open_with_label id: open_with_label
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
text: catalog.i18nc("@action:label", "Open With") text: catalog.i18nc("@action:label", "Open With")
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
} }
@ -162,18 +164,36 @@ UM.Dialog
} }
} }
Row
{
id: printerSettingsTitleRow
anchors.top: parent.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("default_margin").width
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getIcon("Printer")
height: UM.Theme.getSize("medium_button_icon").height
width: height
}
UM.Label
{
text: catalog.i18nc("@action:label", "Printer settings")
anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("default_bold")
}
}
Column Column
{ {
id: printerSettingsValuesTable
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
UM.Label anchors.top: printerSettingsTitleRow.bottom
{
id: printer_settings_label
text: catalog.i18nc("@action:label", "Printer settings")
font: UM.Theme.getFont("default_bold")
}
Row Row
{ {
@ -239,17 +259,36 @@ UM.Dialog
} }
} }
Column Row
{ {
width: parent.width id: profileSettingsTitleRow
height: childrenRect.height anchors.top: parent.top
spacing: UM.Theme.getSize("default_margin").height anchors.bottomMargin: UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("default_margin").width
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getIcon("Printer")
height: UM.Theme.getSize("medium_button_icon").height
width: height
}
UM.Label UM.Label
{ {
text: catalog.i18nc("@action:label", "Profile settings") text: catalog.i18nc("@action:label", "Profile settings")
anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
} }
}
Column
{
id: profileSettingsValuesTable
width: parent.width
height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
anchors.top: profileSettingsTitleRow.bottom
Row Row
{ {
@ -356,24 +395,35 @@ UM.Dialog
} }
} }
Row
{
id: materialSettingsTitleRow
anchors.top: parent.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("default_margin").width
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getIcon("Printer")
height: UM.Theme.getSize("medium_button_icon").height
width: height
}
UM.Label
{
text: catalog.i18nc("@action:label", "Material settings")
anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("default_bold")
}
}
Column Column
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
Row leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
{ anchors.top: materialSettingsTitleRow.bottom
height: childrenRect.height
width: parent.width
spacing: UM.Theme.getSize("narrow_margin").width
UM.Label
{
text: catalog.i18nc("@action:label", "Material settings")
font: UM.Theme.getFont("default_bold")
width: (parent.width / 3) | 0
}
}
Repeater Repeater
{ {
@ -398,17 +448,41 @@ UM.Dialog
} }
} }
Item
{
width: parent.width
height: childrenRect.height
Row
{
id: visibilitySettingsTitleRow
anchors.top: parent.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("default_margin").width
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getIcon("Printer")
height: UM.Theme.getSize("medium_button_icon").height
width: height
}
UM.Label
{
text: catalog.i18nc("@action:label", "Setting visibility")
anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("default_bold")
}
}
Column Column
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("medium_button_icon").width + UM.Theme.getSize("default_margin").width
anchors.top: visibilitySettingsTitleRow.bottom
UM.Label
{
text: catalog.i18nc("@action:label", "Setting visibility")
font: UM.Theme.getFont("default_bold")
}
Row Row
{ {
width: parent.width width: parent.width
@ -463,6 +537,7 @@ UM.Dialog
} }
} }
} }
}
property bool warning: manager.missingPackages.length > 0 property bool warning: manager.missingPackages.length > 0