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

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Tim Kuipers 2016-03-15 10:00:50 +01:00
commit 1608f06c6c
4 changed files with 43 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/ProfileSetup.qml
View file

@ -74,9 +74,9 @@ Item{
MenuItem
{
id: item
text: model_data.name
text: model_data ? model_data.name : ""
checkable: true;
checked: model_data.active;
checked: model_data ? model_data.active : false;
exclusiveGroup: profileSelectionMenuGroup;
onTriggered:
{

3
resources/themes/cura/styles.qml
View file

@ -295,6 +295,9 @@ QtObject {
controlBorderHighlightColor: Theme.getColor("setting_control_border_highlight");
controlTextColor: Theme.getColor("setting_control_text");
controlBorderWidth: Theme.getSize("default_lining").width;
controlDisabledColor: Theme.getColor("setting_control_disabled");
controlDisabledTextColor: Theme.getColor("setting_control_disabled_text");
controlDisabledBorderColor: Theme.getColor("setting_control_disabled_border");
controlFont: Theme.getFont("default");
validationErrorColor: Theme.getColor("setting_validation_error");

3
resources/themes/cura/theme.json
View file

@ -138,6 +138,9 @@
"setting_control_depth_line": [127, 127, 127, 255],
"setting_control_button": [127, 127, 127, 255],
"setting_control_button_hover": [70, 84, 113, 255],
"setting_control_disabled": [245, 245, 245, 255],
"setting_control_disabled_text": [127, 127, 127, 255],
"setting_control_disabled_border": [127, 127, 127, 255],
"setting_unit": [127, 127, 127, 255],
"setting_validation_error": [255, 57, 14, 255],
"setting_validation_warning": [255, 186, 15, 255],