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

Add rounded corners to the settings

Browse source 
Contributes to CURA-5941
This commit is contained in:
Diego Prado Gesto 2018-12-03 15:56:21 +01:00
parent 4e9c595bdd
commit d3b5b2717d
6 changed files with 81 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

43
resources/qml/Settings/SettingCheckBox.qml
View file

@ -28,37 +28,40 @@ SettingItem
// 3: material -> user changed material in materials page
// 4: variant
// 5: machine
var value;
if ((base.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
var value
if ((base.resolve != "None") && (stackLevel != 0) && (stackLevel != 1))
{
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).
value = base.resolve;
} else {
value = propertyProvider.properties.value;
value = base.resolve
}
else
{
value = propertyProvider.properties.value
}
switch(value)
{
case "True":
return true;
return true
case "False":
return false;
return false
default:
return value;
return value
}
}
Keys.onSpacePressed:
{
forceActiveFocus();
propertyProvider.setPropertyValue("value", !checked);
forceActiveFocus()
propertyProvider.setPropertyValue("value", !checked)
}
onClicked:
{
forceActiveFocus();
propertyProvider.setPropertyValue("value", !checked);
forceActiveFocus()
propertyProvider.setPropertyValue("value", !checked)
}
Keys.onTabPressed:
@ -72,9 +75,9 @@ SettingItem
onActiveFocusChanged:
{
if(activeFocus)
if (activeFocus)
{
base.focusReceived();
base.focusReceived()
}
}
@ -90,32 +93,34 @@ SettingItem
color:
{
if(!enabled)
if (!enabled)
{
return UM.Theme.getColor("setting_control_disabled")
}
if(control.containsMouse || control.activeFocus)
if (control.containsMouse || control.activeFocus)
{
return UM.Theme.getColor("setting_control_highlight")
}
return UM.Theme.getColor("setting_control")
}
radius: UM.Theme.getSize("setting_control_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color:
{
if(!enabled)
if (!enabled)
{
return UM.Theme.getColor("setting_control_disabled_border")
}
if(control.containsMouse || control.activeFocus)
if (control.containsMouse || control.activeFocus)
{
return UM.Theme.getColor("setting_control_border_highlight")
}
return UM.Theme.getColor("setting_control_border")
}
UM.RecolorImage {
UM.RecolorImage
{
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: Math.round(parent.width / 2.5)