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 17

Merge branch '15.10'

Browse source 
* 15.10:
  Remove full screen from menu and disable the shortcut key
  Properly default infill_sparse_thickness to layer_height`
  Changes the color of the 'C' in one iconfile
  moves the changelog from on-startup to the extensions menu
  Fix firmware update to properly report progress
  Use a decorator to track Z offset
  Remove infill_sparse_combine setting
  Update for BQ printers profiles
  Bump version
  Properly position groups and nodes once ungrouped
This commit is contained in:
Arjen Hiemstra 2015-10-27 14:24:25 +01:00
commit 936c2f9365
13 changed files with 74 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/images/cura-icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

8
resources/machines/bq_hephestos_2.json
View file

@ -39,7 +39,7 @@
"overrides": {
"bottom_thickness": { "default": 1.2, "visible": true },
"cool_fan_full_at_height": { "default": 0.8, "visible": false },
"speed_wall_0": { "default": 35.0, "visible": false },
"speed_wall_0": { "default": 30.0, "visible": false },
"material_diameter": { "default": 1.75 },
"layer_height_0": { "default": 0.2, "visible": true },
"speed_layer_0": { "default": 35.0, "visible": true },
@ -53,8 +53,8 @@
"retraction_speed": { "default": 45.0, "visible": false },
"skirt_gap": { "default": 7.0 },
"skirt_line_count": { "default": 4 },
"speed_infill": { "default": 50.0, "visible": true },
"material_print_temperature": { "default": 220.0, "visible": true },
"speed_infill": { "default": 60.0, "visible": true },
"material_print_temperature": { "default": 210.0, "visible": true },
"speed_topbottom": { "default": 35.0, "visible": false },
"top_thickness": { "default": 1.2, "visible": false },
"top_layers": { "default": 6, "visible": false },
@ -66,6 +66,6 @@
"support_enable": { "default": false },
"speed_print": { "default": 50.0 },
"skirt_speed": { "default": 35.0, "visible": false },
"skirt_minimal_length": { "default": 300.0, "visible": false }
"skirt_minimal_length": { "default": 30.0, "visible": false }
}
}

8
resources/machines/bq_witbox_2.json
View file

@ -39,7 +39,7 @@
"overrides": {
"bottom_thickness": { "default": 1.2, "visible": true },
"cool_fan_full_at_height": { "default": 0.8, "visible": false },
"speed_wall_0": { "default": 35.0, "visible": false },
"speed_wall_0": { "default": 30.0, "visible": false },
"material_diameter": { "default": 1.75 },
"layer_height_0": { "default": 0.2, "visible": true },
"speed_layer_0": { "default": 35.0, "visible": true },
@ -53,8 +53,8 @@
"retraction_speed": { "default": 45.0, "visible": false },
"skirt_gap": { "default": 7.0 },
"skirt_line_count": { "default": 4 },
"speed_infill": { "default": 50.0, "visible": true },
"material_print_temperature": { "default": 220.0, "visible": true },
"speed_infill": { "default": 60.0, "visible": true },
"material_print_temperature": { "default": 210.0, "visible": true },
"speed_topbottom": { "default": 35.0, "visible": false },
"top_thickness": { "default": 1.2, "visible": false },
"top_layers": { "default": 6, "visible": false },
@ -66,6 +66,6 @@
"support_enable": { "default": false },
"speed_print": { "default": 50.0 },
"skirt_speed": { "default": 35.0, "visible": false },
"skirt_minimal_length": { "default": 300.0, "visible": false }
"skirt_minimal_length": { "default": 30.0, "visible": false }
}
}

11
resources/machines/fdmprinter.json
View file

@ -497,16 +497,7 @@
"type": "float",
"default": 0.1,
"visible": false,
"children": {
"infill_sparse_combine": {
"label": "Infill Layers",
"description": "Amount of layers that are combined together to form sparse infill.",
"type": "int",
"default": 1,
"visible": false,
"inherit_function": "math.floor(( parent_value + 0.001) / layer_height)"
}
}
"inherit_function": "layer_height"
},
"infill_before_walls": {
"label": "Infill Before Walls",

1
resources/qml/Actions.qml
View file

@ -47,7 +47,6 @@ Item
Action
{
id:toggleFullScreenAction
shortcut: StandardKey.FullScreen;
text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen");
iconName: "view-fullscreen";
}

4
resources/qml/Cura.qml
View file

@ -152,10 +152,6 @@ UM.MainWindow
onObjectRemoved: top_view_menu.removeItem(object)
}
ExclusiveGroup { id: view_menu_top_group; }
MenuSeparator { }
MenuItem { action: actions.toggleFullScreen; }
}
Menu
{