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

Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder

Browse source
This commit is contained in:
Jack Ha 2018-03-01 13:14:10 +01:00
commit ac76d6ea52
29 changed files with 567 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Actions.qml
View file

@ -69,7 +69,6 @@ Item
property alias configureSettingVisibility: configureSettingVisibilityAction
property alias browsePlugins: browsePluginsAction
property alias configurePlugins: configurePluginsAction
UM.I18nCatalog{id: catalog; name:"cura"}
@ -425,13 +424,6 @@ Item
iconName: "plugins_browse"
}
Action
{
id: configurePluginsAction
text: catalog.i18nc("@action:menu", "Installed plugins...");
iconName: "plugins_configure"
}
Action
{
id: expandSidebarAction;

1
resources/qml/Cura.qml
View file

@ -268,7 +268,6 @@ UM.MainWindow
title: catalog.i18nc("@title:menu menubar:toplevel", "P&lugins")
MenuItem { action: Cura.Actions.browsePlugins }
MenuItem { action: Cura.Actions.configurePlugins }
}
Menu

2
resources/qml/Preferences/MaterialsPage.qml
View file

@ -17,7 +17,7 @@ Item
UM.I18nCatalog { id: catalog; name: "cura"; }
Cura.MaterialsModel {
Cura.MaterialManagementModel {
id: materialsModel
}

2
resources/qml/Preferences/ProfileTab.qml
View file

@ -86,7 +86,7 @@ Tab
{
id: qualitySettings
extruderPosition: base.extruderPosition
qualityItem: base.qualityItem
selectedQualityItem: base.qualityItem
}
SystemPalette { id: palette }

15
resources/qml/SidebarSimple.qml
View file

@ -516,8 +516,7 @@ Item
// Update the slider value to represent the rounded value
infillSlider.value = roundedSliderValue
// Explicitly cast to string to make sure the value passed to Python is an integer.
infillDensity.setPropertyValue("value", String(roundedSliderValue))
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue)
}
style: SliderStyle
@ -647,14 +646,20 @@ Item
onClicked: {
// Set to 90% only when enabling gradual infill
var newInfillDensity;
if (parseInt(infillSteps.properties.value) == 0) {
previousInfillDensity = parseInt(infillDensity.properties.value)
infillDensity.setPropertyValue("value", String(90))
newInfillDensity = 90;
} else {
infillDensity.setPropertyValue("value", String(previousInfillDensity))
newInfillDensity = previousInfillDensity;
}
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", String(newInfillDensity))
infillSteps.setPropertyValue("value", (parseInt(infillSteps.properties.value) == 0) ? 5 : 0)
var infill_steps_value = 0;
if (parseInt(infillSteps.properties.value) == 0)
infill_steps_value = 5;
Cura.MachineManager.setSettingForAllExtruders("gradual_infill_steps", "value", infill_steps_value)
}
onEntered: {