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.95
  Update changelog
  Hide the bed temperature for UMO
  Do not hide the entire material category for UM2 but just the unused settings
  Add a precision value to the time/quality slider settings and use that to round values
  Display the rotation angle when we are performing a rotation
  bugfix: avoid overlapping walls OFF by default
  Add a background to the tooltip label so long strings also have background
  Make sure the tool panel background is at least as wide as the active item
This commit is contained in:
Arjen Hiemstra 2015-06-22 11:45:44 +02:00
commit c387cd9420
10 changed files with 85 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/Cura.qml
View file

@ -279,6 +279,19 @@ UM.MainWindow {
configureMachinesAction: actions.configureMachines;
saveAction: actions.save;
}
Rectangle {
x: base.mouseX;
y: base.mouseY;
width: childrenRect.width;
height: childrenRect.height;
Label {
text: UM.ActiveTool.properties.Rotation != undefined ? "%1°".arg(UM.ActiveTool.properties.Rotation) : "";
}
visible: UM.ActiveTool.valid && UM.ActiveTool.properties.Rotation != undefined;
}
}
}

4
resources/qml/Toolbar.qml
View file

@ -18,6 +18,7 @@ Item {
id: activeItemBackground;
anchors.bottom: parent.bottom;
anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
width: UM.Theme.sizes.button.width;
height: UM.Theme.sizes.button.height * 2;
@ -59,7 +60,6 @@ Item {
MouseArea {
anchors.fill: parent;
onClicked: parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
}
}
}
@ -72,7 +72,7 @@ Item {
anchors.bottom: buttons.top;
anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
width: panel.item ? panel.width + 2 * UM.Theme.sizes.default_margin.width : 0;
width: panel.item ? Math.max(panel.width + 2 * UM.Theme.sizes.default_margin.width, activeItemBackground.x + activeItemBackground.width) : 0;
height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0;
opacity: panel.item ? 1 : 0

2
resources/settings/fdmprinter.json
View file

@ -1672,4 +1672,4 @@
}
}
}
}
}

15
resources/settings/ultimaker2.json
View file

@ -38,7 +38,20 @@
"categories": {
"material": {
"visible": false
"settings": {
"material_print_temperature": {
"visible": false
},
"material_bed_temperature": {
"visible": false
},
"material_diameter": {
"visible": false
},
"material_flow": {
"visible": false
}
}
}
}
}

10
resources/settings/ultimaker_original.json
View file

@ -20,5 +20,15 @@
"machine_nozzle_offset_x_1": { "default": 18.0 },
"machine_nozzle_offset_y_1": { "default": 0.0 },
"machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }
},
"categories": {
"material": {
"settings": {
"material_bed_temperature": {
"visible": false
}
}
}
}
}

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

@ -103,12 +103,17 @@ QtObject {
opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 100; } }
Label {
id: label
Rectangle {
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text.replace("&", "");
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
width: childrenRect.width;
height: childrenRect.height;
Label {
id: label
text: control.text.replace("&", "");
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
}
}
}