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

Merge branch '15.06'

Browse source 
* 15.06:
  Implement rendering the top 5 layers solid and with infill
  Add a createMesh function to LayerData::Layer that creates a mesh from a layer
  Add support for line width and infill types to LayerData::Polygon
  Use the new layer message properties to properly create layers
  Do not render the convex hull node unless the object is selected
  Update generated protobuf protocol file as per CuraEngine changes
  helps with making the messagestack adapt to the total size of messages + pogressbar
  Defines the style of the progressbar
  Makes the openfile button blue/active as long as there is no file loaded.
This commit is contained in:
Arjen Hiemstra 2015-06-16 14:06:57 +02:00
commit 46576ba5e7
7 changed files with 322 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,39 +35,42 @@ QtObject {
}
}
property Component open_file_button: Component {
property Component open_file_button: Component {
ButtonStyle {
background: UM.AngledCornerRectangle {
background: Item {
implicitWidth: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.button.height;
color: {
if(control.hovered) {
return UM.Theme.colors.button_active_hover;
} else {
return UM.Theme.colors.button_active;
}
}
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
Rectangle {
anchors.bottom: parent.top;
anchors.bottom: parent.verticalCenter;
width: parent.width;
height: control.hovered ? label.height : 0;
Behavior on height { NumberAnimation { duration: 75; } }
height: control.hovered ? parent.height / 2 + label.height : 0;
Behavior on height { NumberAnimation { duration: 100; } }
opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 75; } }
Behavior on opacity { NumberAnimation { duration: 100; } }
Label {
id: label
id: label;
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text;
text: control.text.replace("&", "");
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
}
}
UM.AngledCornerRectangle {
anchors.fill: parent;
color: {
if(control.hovered) {
return UM.Theme.colors.button_active_hover;
} else {
return UM.Theme.colors.button_active;
}
}
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
}
}
label: Item {
@ -148,6 +151,49 @@ QtObject {
}
}
property Component progressbar: Component{
ProgressBarStyle {
background: UM.AngledCornerRectangle {
anchors.fill: parent
anchors.left: parent.left
implicitWidth: UM.Theme.sizes.progressbar.width
implicitHeight: UM.Theme.sizes.progressbar.height
color: "transparent"
}
progress: UM.AngledCornerRectangle {
anchors.left: parent.left
anchors.fill: parent
cornerSize: UM.Theme.sizes.progressbar_control.height
color: UM.Theme.colors.progressbar_background
Item {
anchors.fill: parent
anchors.margins: UM.Theme.sizes.progressbar_margin.width
visible: control.indeterminate
Row {
Repeater {
UM.AngledCornerRectangle {
cornerSize: UM.Theme.sizes.progressbar_control.height
color: UM.Theme.colors.progressbar_control
width: UM.Theme.sizes.progressbar_control.width
height: UM.Theme.sizes.progressbar_control.height
}
model: 1
}
SequentialAnimation on x {
id: xAnim
property int animEndPoint: UM.Theme.sizes.progressbar.width - UM.Theme.sizes.progressbar_control.width
running: control.indeterminate
loops: Animation.Infinite
NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;}
NumberAnimation { from: xAnim.animEndPoint; to: 0; duration: 2000;}
}
}
}
}
}
}
property Component sidebar_category: Component {
ButtonStyle {
background: UM.AngledCornerRectangle {

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

@ -88,6 +88,9 @@
"setting_validation_warning": [255, 186, 15, 255],
"setting_validation_ok": [255, 255, 255, 255],
"progressbar_background": [245, 245, 245, 255],
"progressbar_control": [12, 169, 227, 255],
"slider_groove": [245, 245, 245, 255],
"slider_groove_border": [205, 202, 201, 255],
"slider_groove_fill": [205, 202, 201, 255],
@ -135,6 +138,10 @@
"button": [4.25, 4.25],
"button_icon": [2.9, 2.9],
"progressbar": [26.0, 0.5],
"progressbar_control": [8.0, 0.5],
"progressbar_padding": [0.0, 1.0],
"scrollbar": [0.5, 0.5],
"slider_groove": [0.5, 0.5],