3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change margins in the side bar

Browse source 
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-23 16:28:28 +02:00
parent 078b9e8b66
commit 11f8204644
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
7 changed files with 73 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

32
resources/qml/SidebarHeader.qml
View file

@ -17,7 +17,7 @@ Column
property int currentExtruderIndex: ExtruderManager.activeExtruderIndex;
property bool currentExtruderVisible: extrudersList.visible;
spacing: UM.Theme.getSize("default_margin").height
spacing: UM.Theme.getSize("sidebar_margin").height
signal showTooltip(Item item, point location, string text)
signal hideTooltip()
@ -133,9 +133,9 @@ Column
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: swatch.visible ? swatch.right : parent.left
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("sidebar_margin").width / 2 : UM.Theme.getSize("sidebar_margin").width
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
control.pressed ? UM.Theme.getColor("tab_active_text") :
@ -155,7 +155,7 @@ Column
Item
{
id: variantRowSpacer
height: UM.Theme.getSize("default_margin").height / 4
height: UM.Theme.getSize("sidebar_margin").height / 4
width: height
visible: !extruderSelectionRow.visible
}
@ -170,16 +170,16 @@ Column
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
Text
{
id: printCoreLabel
text: Cura.MachineManager.activeDefinitionVariantsName;
width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
}
@ -191,7 +191,7 @@ Column
visible: Cura.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -210,16 +210,16 @@ Column
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
Text
{
id: materialLabel
text: catalog.i18nc("@label","Material");
width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
}
@ -247,7 +247,7 @@ Column
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -266,16 +266,16 @@ Column
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
leftMargin: UM.Theme.getSize("sidebar_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
Item
{
height: UM.Theme.getSize("sidebar_setup").height
anchors.right: parent.right
width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
Text
{
@ -307,7 +307,7 @@ Column
var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
base.showTooltip(
materialInfoRow,
Qt.point(-UM.Theme.getSize("default_margin").width, 0),
Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),
catalog.i18nc("@tooltip", content)
);
}