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

Layout changes, extruders are now displayed as extruder tabs. CURA-2763

Browse Source
This commit is contained in:
Jack Ha 2016-12-06 15:49:34 +01:00
parent a65a81e60b
commit 30a74fb2c1
2 changed files with 105 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resources/qml/SidebarHeader.qml
View File

@ -61,22 +61,41 @@ Column
} }
} }
Row
{
id: extruderSelectionRow
height: UM.Theme.getSize("sidebar_tabs").height
anchors
{
left: parent.left
right: parent.right
}
Rectangle
{
anchors.verticalCenter: parent.verticalCenter
width: parent.width
height: parent.height
color: UM.Theme.getColor("tab_background")
}
ListView ListView
{ {
id: extrudersList id: extrudersList
property var index: 0 property var index: 0
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
height: UM.Theme.getSize("sidebar_header_mode_toggle").height height: UM.Theme.getSize("sidebar_header_mode_tabs").height
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
anchors anchors
{ {
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width bottom: parent.bottom
} }
ExclusiveGroup { id: extruderMenuGroup; } ExclusiveGroup { id: extruderMenuGroup; }
@ -137,7 +156,7 @@ Column
color: model.color color: model.color
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("tab_checked_border") border.color: UM.Theme.getColor("setting_control_border")
} }
Label Label
@ -161,6 +180,7 @@ Column
} }
} }
} }
}
Row Row
{ {

13
resources/themes/cura/theme.json
View File

@ -94,17 +94,18 @@
"toggle_active_text": [24, 41, 77, 255], "toggle_active_text": [24, 41, 77, 255],
"tab_checked": [255, 255, 255, 255], "tab_checked": [255, 255, 255, 255],
"tab_checked_border": [24, 41, 77, 255], "tab_checked_border": [255, 255, 255, 255],
"tab_checked_text": [24, 41, 77, 255], "tab_checked_text": [24, 41, 77, 255],
"tab_unchecked": [224, 224, 224, 255], "tab_unchecked": [224, 224, 224, 255],
"tab_unchecked_border": [224, 224, 224, 255], "tab_unchecked_border": [224, 224, 224, 255],
"tab_unchecked_text": [24, 41, 77, 255], "tab_unchecked_text": [152, 152, 152, 255],
"tab_hovered": [240, 240, 240, 255], "tab_hovered": [240, 240, 240, 255],
"tab_hovered_border": [128, 128, 128, 255], "tab_hovered_border": [240, 240, 240, 255],
"tab_hovered_text": [24, 41, 77, 255], "tab_hovered_text": [32, 166, 219, 255],
"tab_active": [255, 255, 255, 255], "tab_active": [255, 255, 255, 255],
"tab_active_border": [24, 41, 77, 255], "tab_active_border": [255, 255, 255, 255],
"tab_active_text": [24, 41, 77, 255], "tab_active_text": [24, 41, 77, 255],
"tab_background": [245, 245, 245, 255],
"action_button": [255, 255, 255, 255], "action_button": [255, 255, 255, 255],
"action_button_text": [24, 41, 77, 255], "action_button_text": [24, 41, 77, 255],
@ -206,8 +207,10 @@
"sidebar_header": [0.0, 4.0], "sidebar_header": [0.0, 4.0],
"sidebar_header_highlight": [0.5, 0.5], "sidebar_header_highlight": [0.5, 0.5],
"sidebar_header_mode_toggle": [0.0, 2.0], "sidebar_header_mode_toggle": [0.0, 2.0],
"sidebar_header_mode_tabs": [0.0, 3.0],
"sidebar_lining": [0.5, 0.5], "sidebar_lining": [0.5, 0.5],
"sidebar_setup": [0.0, 2.0], "sidebar_setup": [0.0, 2.0],
"sidebar_tabs": [0.0, 4.0],
"sidebar_inputfields": [0.0, 2.0], "sidebar_inputfields": [0.0, 2.0],
"simple_mode_infill_caption": [0.0, 5.0], "simple_mode_infill_caption": [0.0, 5.0],
"simple_mode_infill_height": [0.0, 8.0], "simple_mode_infill_height": [0.0, 8.0],