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

Merge branch '4.0' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-01-17 14:28:35 +01:00
commit 94cf61ca18
8 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/SimulationView/SimulationViewMainComponent.qml
View file

@ -71,6 +71,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "view/only_show_top_layers" && preference !== "view/top_layer_count" && ! preference.match("layerview/"))
{
return;
}
playButton.pauseSimulation()
}
}

5
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -22,6 +22,11 @@ Cura.ExpandableComponent
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "view/only_show_top_layers" && preference !== "view/top_layer_count" && ! preference.match("layerview/"))
{
return;
}
layerTypeCombobox.currentIndex = UM.SimulationView.compatibilityMode ? 1 : UM.Preferences.getValue("layerview/layer_view_type")
layerTypeCombobox.updateLegends(layerTypeCombobox.currentIndex)
viewSettings.extruder_opacities = UM.Preferences.getValue("layerview/extruder_opacities").split("|")

5
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -142,6 +142,11 @@ Column
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "general/auto_slice")
{
return;
}
var autoSlice = UM.Preferences.getValue("general/auto_slice")
if(prepareButtons.autoSlice != autoSlice)
{

22
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -64,29 +64,33 @@ Cura.ExpandablePopup
// Label for the brand of the material
Label
{
id: brandNameLabel
id: typeAndBrandNameLabel
text: model.material_brand
text: model.material_brand + " " + model.material
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_inactive")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
top: extruderIcon.top
left: extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
}
}
// Label that shows the name of the material
// Label that shows the name of the variant
Label
{
text: model.material
id: variantLabel
visible: Cura.MachineManager.hasVariants
text: model.variant
elide: Text.ElideRight
font: UM.Theme.getFont("medium")
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
@ -94,9 +98,7 @@ Cura.ExpandablePopup
{
left: extruderIcon.right
leftMargin: UM.Theme.getSize("default_margin").width
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
top: brandNameLabel.bottom
top: typeAndBrandNameLabel.bottom
}
}
}

5
resources/qml/Preferences/GeneralPage.qml
View file

@ -746,6 +746,11 @@ UM.PreferencesPage
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "info/send_slice_info")
{
return;
}
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
}
}

5
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -139,6 +139,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands")
{
return;
}
expanded = materialList.expandedBrands.indexOf(sectionName) > -1
}
}

5
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -130,6 +130,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands")
{
return;
}
expanded = materialList.expandedTypes.indexOf(materialType.brand + "_" + materialType.name) > -1
}
}

5
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View file

@ -77,6 +77,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "view/settings_list_height" && preference !== "general/window_height" && preference !== "general/window_state")
{
return;
}
customPrintSetup.height =
Math.min
(