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

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine

Browse source
This commit is contained in:
Jaime van Kessel 2019-04-17 11:06:30 +02:00
commit ef92aad6bb
25 changed files with 185 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/bundled_packages/cura.json
View file

@ -33,23 +33,6 @@
}
}
},
"ChangeLogPlugin": {
"package_info": {
"package_id": "ChangeLogPlugin",
"package_type": "plugin",
"display_name": "Change Log",
"description": "Shows changes since latest checked version.",
"package_version": "1.0.1",
"sdk_version": "6.0.0",
"website": "https://ultimaker.com",
"author": {
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
}
}
},
"CuraDrive": {
"package_info": {
"package_id": "CuraDrive",

30
resources/definitions/fdmprinter.def.json
View file

@ -1316,8 +1316,7 @@
"default_value": 0,
"type": "float",
"enabled": "travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled",
"settable_per_mesh": true,
"settable_per_extruder": false
"settable_per_mesh": true
},
"wall_min_flow_retract":
{
@ -1326,8 +1325,7 @@
"type": "bool",
"default_value": false,
"enabled": "(travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled) and wall_min_flow > 0",
"settable_per_mesh": true,
"settable_per_extruder": false
"settable_per_mesh": true
},
"fill_perimeter_gaps":
{
@ -5855,10 +5853,10 @@
"description": "The minimum size of a line segment after slicing. If you increase this, the mesh will have a lower resolution. This may allow the printer to keep up with the speed it has to process g-code and will increase slice speed by removing details of the mesh that it can't process anyway.",
"type": "float",
"unit": "mm",
"default_value": 0.01,
"default_value": 0.25,
"minimum_value": "0.001",
"minimum_value_warning": "0.005",
"maximum_value_warning": "0.1",
"minimum_value_warning": "0.02",
"maximum_value_warning": "2",
"settable_per_mesh": true
},
"meshfix_maximum_travel_resolution":
@ -5867,14 +5865,26 @@
"description": "The minimum size of a travel line segment after slicing. If you increase this, the travel moves will have less smooth corners. This may allow the printer to keep up with the speed it has to process g-code, but it may cause model avoidance to become less accurate.",
"type": "float",
"unit": "mm",
"default_value": 0.02,
"default_value": 0.5,
"value": "meshfix_maximum_resolution * speed_travel / speed_print",
"minimum_value": "0.001",
"minimum_value_warning": "0.005",
"maximum_value_warning": "1",
"minimum_value_warning": "0.05",
"maximum_value_warning": "10",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"meshfix_maximum_deviation":
{
"label": "Maximum Deviation",
"description": "The maximum deviation allowed when reducing the resolution for the Maximum Resolution setting. If you increase this, the print will be less accurate, but the g-code will be smaller.",
"type": "float",
"unit": "mm",
"default_value": 0.005,
"minimum_value": "0.001",
"minimum_value_warning": "0.003",
"maximum_value_warning": "0.1",
"settable_per_mesh": true
},
"support_skip_some_zags":
{
"label": "Break Up Support In Chunks",

4
resources/definitions/peopoly_moai.def.json
View file

@ -173,8 +173,8 @@
"minimum_polygon_circumference": {
"value": "0.1"
},
"meshfix_maximum_resolution": {
"value": "0.005"
"meshfix_maximum_deviation": {
"value": "0.003"
},
"skin_outline_count": {
"value": 0

7
resources/qml/Actions.qml
View file

@ -61,6 +61,7 @@ Item
property alias documentation: documentationAction;
property alias showTroubleshooting: showTroubleShootingAction
property alias reportBug: reportBugAction;
property alias whatsNew: whatsNewAction
property alias about: aboutAction;
property alias toggleFullScreen: toggleFullScreenAction;
@ -229,6 +230,12 @@ Item
onTriggered: CuraActions.openBugReportPage();
}
Action
{
id: whatsNewAction;
text: catalog.i18nc("@action:inmenu menubar:help", "What's New");
}
Action
{
id: aboutAction;

64
resources/qml/Cura.qml
View file

@ -71,26 +71,42 @@ UM.MainWindow
Component.onCompleted:
{
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
// This means that all Actions are "Window Shortcuts". The code for this
// implements a rather naive check that just checks if any of the action's parents
// are a window. Since the "Actions" object is a singleton it has no parent by
// default. If we set its parent to something contained in this window, the
// shortcut will activate properly because one of its parents is a window.
//
// This has been fixed for QtQuick Controls 2 since the Shortcut item has a context property.
Cura.Actions.parent = backgroundItem
CuraApplication.purgeWindows()
}
if (CuraApplication.getWelcomePagesModel().shouldShowWelcomeFlow)
Connections
{
target: CuraApplication
onInitializationFinished:
{
welcomeDialogItem.visible = true
}
else
{
welcomeDialogItem.visible = false
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
// This means that all Actions are "Window Shortcuts". The code for this
// implements a rather naive check that just checks if any of the action's parents
// are a window. Since the "Actions" object is a singleton it has no parent by
// default. If we set its parent to something contained in this window, the
// shortcut will activate properly because one of its parents is a window.
//
// This has been fixed for QtQuick Controls 2 since the Shortcut item has a context property.
Cura.Actions.parent = backgroundItem
if (CuraApplication.shouldShowWelcomeDialog())
{
welcomeDialogItem.visible = true
}
else
{
welcomeDialogItem.visible = false
}
// Reuse the welcome dialog item to show "What's New" only.
if (CuraApplication.shouldShowWhatsNewDialog())
{
welcomeDialogItem.model = CuraApplication.getWhatsNewPagesModel()
welcomeDialogItem.progressBarVisible = false
welcomeDialogItem.visible = true
}
}
}
@ -780,6 +796,20 @@ UM.MainWindow
progressBarVisible: false
}
Cura.WizardDialog
{
id: whatsNewDialog
title: catalog.i18nc("@title:window", "What's New")
model: CuraApplication.getWhatsNewPagesModel()
progressBarVisible: false
}
Connections
{
target: Cura.Actions.whatsNew
onTriggered: whatsNewDialog.show()
}
Connections
{
target: Cura.Actions.addMachine

1
resources/qml/MainWindow/ApplicationMenu.qml
View file

@ -101,6 +101,7 @@ Item
MenuItem { action: Cura.Actions.documentation }
MenuItem { action: Cura.Actions.reportBug }
MenuSeparator { }
MenuItem { action: Cura.Actions.whatsNew }
MenuItem { action: Cura.Actions.about }
}
}

1
resources/qml/WelcomePages/WelcomeDialogItem.qml
View file

@ -26,6 +26,7 @@ Item
property int shadowOffset: 1 * screenScaleFactor
property alias progressBarVisible: wizardPanel.progressBarVisible
property var model: CuraApplication.getWelcomePagesModel()
onVisibleChanged:

2
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -51,7 +51,7 @@ Item
id: getStartedButton
anchors.right: parent.right
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Next")
text: base.currentItem.next_page_button_text
onClicked: base.showNextPage()
}
}

1
resources/setting_visibility/expert.cfg
View file

@ -347,6 +347,7 @@ infill_enable_travel_optimization
material_flow_dependent_temperature
material_flow_temp_graph
meshfix_maximum_resolution
meshfix_maximum_deviation
support_skip_some_zags
support_skip_zag_per_mm
support_zag_skip_count

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

@ -433,7 +433,7 @@
"monitor_skeleton_loading": [238, 238, 238, 255],
"monitor_placeholder_image": [230, 230, 230, 255],
"monitor_image_overlay": [0, 0, 0, 255],
"monitor_shadow": [220, 220, 220, 255],
"monitor_shadow": [200, 200, 200, 255],
"monitor_carousel_dot": [216, 216, 216, 255],
"monitor_carousel_dot_current": [119, 119, 119, 255]