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:
  Do not cause "dictionary changed size during iteration" errors when changing view
  Adds an idle-state for the layerview slider
  Adds an idle-state for the safebutton
  Sets the platform activity on true when a model is loaded
  Sets the platform activity on true when a model is loaded
  Create functions that get & set platform activity
  Send M104 to set the temperature to 0
  Do not store files that fail to load in recent files
This commit is contained in:
Arjen Hiemstra 2015-07-13 13:52:33 +02:00
commit 89b175bc5c
7 changed files with 52 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -389,7 +389,7 @@ QtObject {
}
Label {
id: maxValueLabel
visible: UM.LayerView.getLayerActivity ? true : false
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
text: control.maximumValue + 1
font: control.maximumValue > 998 ? UM.Theme.fonts.small : UM.Theme.fonts.default
transformOrigin: Item.BottomLeft
@ -399,7 +399,7 @@ QtObject {
}
Label {
id: minValueLabel
visible: UM.LayerView.getLayerActivity ? true : false
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
text: '1'
font: control.maximumValue > 998 ? UM.Theme.fonts.small : UM.Theme.fonts.default
transformOrigin: Item.BottomLeft
@ -416,7 +416,7 @@ QtObject {
Behavior on color { ColorAnimation { duration: 50; } }
Label {
id: valueLabel
visible: UM.LayerView.getLayerActivity ? true : false
visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
text: control.value + 1
anchors.bottom: layerSliderControl.bottom
anchors.right: layerSliderControl.left