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:
  Bump version to 15.05.93
  Add a changelog file
  add missing width and height to section icon
  add missing color to tool_button
  add setting for sidebar background color
  Make cura_app executable
  Move Sidebar so it is on top of everything else
  Do not slice if there is any setting with an error value
  Start adding some more proper error/warning values to settings
  Position the setting tooltip to the left of the settings instead of below
  Set version to 15.05.92
This commit is contained in:
Arjen Hiemstra 2015-06-03 15:15:43 +02:00
commit aed224df08
9 changed files with 164 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ QtObject {
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text;
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_text;
}
}
}
@ -121,6 +122,8 @@ QtObject {
Image {
anchors.verticalCenter: parent.verticalCenter;
source: control.iconSource;
width: UM.Theme.sizes.section_icon.width;
height: UM.Theme.sizes.section_icon.height;
}
Label {

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

@ -44,6 +44,8 @@
},
"colors": {
"sidebar": [255, 255, 255, 255],
"primary": [12, 169, 227, 255],
"primary_hover": [34, 150, 190, 255],
"primary_text": [255, 255, 255, 255],