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

Merge branch '15.06'

Browse source 
* 15.06:
  Add a background to the tool additional controls
  Rescale the current layer number based on the maximum layer
  Add a text field style that can be used for generic text fields
  Implemented feature described by #30
  Handle finished signal for the ReadMeshJob started from command line args
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Fix for #29
This commit is contained in:
Arjen Hiemstra 2015-06-08 16:41:46 +02:00
commit 8c12426760
8 changed files with 212 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,4 +246,32 @@ QtObject {
}
}
}
property Component text_field: Component {
TextFieldStyle {
textColor: UM.Theme.colors.setting_control_text;
font: UM.Theme.fonts.default;
background: Rectangle
{
implicitHeight: control.height;
implicitWidth: control.width;
border.width: 1;
border.color: UM.Theme.colors.setting_control_border;
color: UM.Theme.colors.setting_validation_ok;
Label {
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.sizes.setting_unit_margin.width;
anchors.verticalCenter: parent.verticalCenter;
text: control.unit ? control.unit : ""
color: UM.Theme.colors.setting_unit;
font: UM.Theme.fonts.default;
}
}
}
}
}

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

@ -110,7 +110,9 @@
"save_button_text": [35, 35, 35, 255],
"message": [205, 202, 201, 255],
"message_text": [35, 35, 35, 255]
"message_text": [35, 35, 35, 255],
"tool_panel_background": [255, 255, 255, 255]
},
"sizes": {