3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 13:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove all the entries in the theme that make reference to the sidebar,

Browse source 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
This commit is contained in:
Diego Prado Gesto 2018-10-26 17:51:28 +02:00
parent c8bdf7321c
commit 90e8a05aab
25 changed files with 174 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resources/qml/CustomConfigurationSelector.qml
View file

@ -14,7 +14,7 @@ Rectangle
implicitHeight: parent.height
id: base
color: UM.Theme.getColor("sidebar")
color: UM.Theme.getColor("main_background")
// Height has an extra 2x margin for the top & bottom margin.
height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").width
@ -28,7 +28,7 @@ Rectangle
visible: extrudersModel.items.length > 1
property var index: 0
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
height: UM.Theme.getSize("configuration_selector_mode_tabs").height
boundsBehavior: Flickable.StopAtBounds
anchors
@ -36,7 +36,7 @@ Rectangle
left: parent.left
right: parent.right
top: parent.top
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
ExclusiveGroup { id: extruderMenuGroup }
@ -209,7 +209,7 @@ Rectangle
Item
{
id: materialRow
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasMaterials
anchors
@ -217,7 +217,7 @@ Rectangle
left: parent.left
right: parent.right
top: extrudersList.bottom
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
Label
@ -246,7 +246,7 @@ Rectangle
enabled: !extrudersList.visible || Cura.ExtruderManager.activeExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height
width: Math.round(parent.width * 0.7) + UM.Theme.getSize("sidebar_margin").width
width: Math.round(parent.width * 0.7) + UM.Theme.getSize("thick_margin").width
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -263,7 +263,7 @@ Rectangle
Item
{
id: variantRow
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasVariants
anchors
@ -271,7 +271,7 @@ Rectangle
left: parent.left
right: parent.right
top: materialRow.bottom
margins: UM.Theme.getSize("sidebar_margin").width
margins: UM.Theme.getSize("thick_margin").width
}
Label
@ -293,7 +293,7 @@ Rectangle
visible: Cura.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height
width: Math.round(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
width: Math.round(parent.width * 0.7 + UM.Theme.getSize("thick_margin").width)
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -305,11 +305,11 @@ Rectangle
Item
{
id: materialCompatibilityLink
height: UM.Theme.getSize("sidebar_setup").height
height: UM.Theme.getSize("print_setup_item").height
anchors.right: parent.right
anchors.top: variantRow.bottom
anchors.margins: UM.Theme.getSize("sidebar_margin").width
anchors.margins: UM.Theme.getSize("thick_margin").width
UM.RecolorImage
{
id: warningImage