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

Change extruder tabs to buttons

Browse Source 
CURA-4211

Change extruder tabs to buttons according to the new design.
This commit is contained in:
Lipu Fei 2017-08-31 17:14:38 +02:00
parent b75140973e
commit c2645d0022
1 changed files with 114 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
resources/qml/SidebarHeader.qml
View File

@ -22,6 +22,30 @@ Column
signal showTooltip(Item item, point location, string text) signal showTooltip(Item item, point location, string text)
signal hideTooltip() signal hideTooltip()
Item
{
height: UM.Theme.getSize("default_margin").height / 4
width: height
visible: extruderSelectionRow.visible
}
Label
{
id: extruderSelectionLabel
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
height: UM.Theme.getSize("sidebar_tabs").height / 3
text: catalog.i18nc("@label", "Extruder configuration")
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
visible: extruderSelectionRow.visible
}
Item Item
{ {
id: extruderSelectionRow id: extruderSelectionRow
@ -29,16 +53,12 @@ Column
height: UM.Theme.getSize("sidebar_tabs").height height: UM.Theme.getSize("sidebar_tabs").height
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
Rectangle anchors
{ {
id: extruderSeparator left: parent.left
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
width: parent.width rightMargin: UM.Theme.getSize("default_margin").width
height: parent.height
color: UM.Theme.getColor("sidebar_lining")
anchors.top: extruderSelectionRow.top
} }
ListView ListView
@ -53,8 +73,10 @@ Column
anchors anchors
{ {
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width / 2
right: parent.right right: parent.right
bottom: extruderSelectionRow.bottom rightMargin: UM.Theme.getSize("default_margin").width / 2
verticalCenter: parent.verticalCenter
} }
ExclusiveGroup { id: extruderMenuGroup; } ExclusiveGroup { id: extruderMenuGroup; }
@ -98,93 +120,106 @@ Column
{ {
anchors.fill: parent anchors.fill: parent
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: control.checked ? UM.Theme.getColor("tab_checked_border") : border.color: control.checked ? UM.Theme.getColor("toggle_checked_border") :
control.pressed ? UM.Theme.getColor("tab_active_border") : control.pressed ? UM.Theme.getColor("toggle_active_border") :
control.hovered ? UM.Theme.getColor("tab_hovered_border") : UM.Theme.getColor("tab_unchecked_border") control.hovered ? UM.Theme.getColor("toggle_hovered_border") : UM.Theme.getColor("toggle_unchecked_border")
color: control.checked ? UM.Theme.getColor("tab_checked") : color: control.checked ? UM.Theme.getColor("toggle_checked") :
control.pressed ? UM.Theme.getColor("tab_active") : control.pressed ? UM.Theme.getColor("toggle_active") :
control.hovered ? UM.Theme.getColor("tab_hovered") : UM.Theme.getColor("tab_unchecked") control.hovered ? UM.Theme.getColor("toggle_hovered") : UM.Theme.getColor("toggle_unchecked")
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
} }
Text
{
id: extruderStaticText
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.horizontalCenter
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
control.pressed ? UM.Theme.getColor("tab_active_text") :
control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text")
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "Extruder")
visible: width < (control.width - UM.Theme.getSize("default_margin").width) / 2
elide: Text.ElideRight
}
Item Item
{ {
anchors.verticalCenter: parent.verticalCenter id: extruderButtonFace
anchors.left: !extruderStaticText.visible ? parent.left : parent.horizontalCenter anchors.centerIn: parent
anchors.leftMargin: !extruderStaticText.visible ? (parent.width - width) / 2 : UM.Theme.getSize("default_margin").width / 2 width: {
var extruderTextWidth = extruderStaticText.visible ? extruderStaticText.width : 0;
property var sizeToUse: var iconWidth = extruderIconItem.width;
{ return extruderTextWidth + iconWidth + UM.Theme.getSize("default_margin").width / 4;
var minimumWidth = control.width < UM.Theme.getSize("button").width ? control.width : UM.Theme.getSize("button").width;
var minimumHeight = control.height < UM.Theme.getSize("button").height ? control.height : UM.Theme.getSize("button").height;
var minimumSize = minimumWidth < minimumHeight ? minimumWidth : minimumHeight;
minimumSize -= UM.Theme.getSize("default_margin").width;
return minimumSize;
}
width: sizeToUse
height: sizeToUse
UM.RecolorImage {
id: mainCircle
anchors.fill: parent
sourceSize.width: parent.width
sourceSize.height: parent.width
source: UM.Theme.getIcon("extruder_button")
color: control.checked ? UM.Theme.getColor("setting_category_text") : UM.Theme.getColor("setting_control_disabled_text")
} }
// Static text "Extruder"
Text Text
{ {
anchors.centerIn: parent id: extruderStaticText
text: index + 1; anchors.verticalCenter: parent.verticalCenter
color: control.checked ? UM.Theme.getColor("tab_checked_text") : anchors.left: parent.left
control.pressed ? UM.Theme.getColor("tab_active_text") :
control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text") color: control.checked ? UM.Theme.getColor("toggle_checked_text") :
font: UM.Theme.getFont("default_bold") control.pressed ? UM.Theme.getColor("toggle_active_text") :
control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text")
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "Extruder")
visible: width < (control.width - extruderIconItem.width - UM.Theme.getSize("default_margin").width)
elide: Text.ElideRight
} }
// Material colour circle // Everthing for the extruder icon
// Only draw the filling colour of the material inside the SVG border. Item
Rectangle
{ {
anchors id: extruderIconItem
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
property var sizeToUse:
{ {
right: parent.right var minimumWidth = control.width < UM.Theme.getSize("button").width ? control.width : UM.Theme.getSize("button").width;
top: parent.top var minimumHeight = control.height < UM.Theme.getSize("button").height ? control.height : UM.Theme.getSize("button").height;
rightMargin: parent.sizeToUse * 0.04 var minimumSize = minimumWidth < minimumHeight ? minimumWidth : minimumHeight;
topMargin: parent.sizeToUse * 0.04 minimumSize -= UM.Theme.getSize("default_margin").width;
return minimumSize;
} }
color: model.color width: sizeToUse
height: sizeToUse
width: parent.width * 0.27 UM.RecolorImage {
height: parent.height * 0.27 id: mainCircle
radius: width / 2 anchors.fill: parent
border.width: 0 sourceSize.width: parent.width
border.color: "transparent" sourceSize.height: parent.width
source: UM.Theme.getIcon("extruder_button")
opacity: !control.checked ? 0.6 : 1.0 color: extruderNumberText.color
}
Text
{
id: extruderNumberText
anchors.centerIn: parent
text: index + 1;
color: control.checked ? UM.Theme.getColor("toggle_checked_text") :
control.pressed ? UM.Theme.getColor("toggle_active_text") :
control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text")
font: UM.Theme.getFont("default_bold")
}
// Material colour circle
// Only draw the filling colour of the material inside the SVG border.
Rectangle
{
anchors
{
right: parent.right
top: parent.top
rightMargin: parent.sizeToUse * 0.04
topMargin: parent.sizeToUse * 0.04
}
color: model.color
width: parent.width * 0.27
height: parent.height * 0.27
radius: width / 2
border.width: 0
border.color: "transparent"
opacity: !control.checked ? 0.6 : 1.0
}
} }
} }
} }