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

Remove unnecessary ; line endings in QML

Browse source 
CURA-6683
This commit is contained in:
Nino van Hooff 2019-09-13 11:17:07 +02:00
parent 90fefac37f
commit fe0e1e5aba
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

74
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -213,26 +213,26 @@ Item
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: addedSettingsModel; id: addedSettingsModel
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: "" containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
expanded: [ "*" ] expanded: [ "*" ]
filter: filter:
{ {
if (printSequencePropertyProvider.properties.value == "one_at_a_time") if (printSequencePropertyProvider.properties.value == "one_at_a_time")
{ {
return {"settable_per_meshgroup": true}; return {"settable_per_meshgroup": true}
} }
return {"settable_per_mesh": true}; return {"settable_per_mesh": true}
} }
exclude: exclude:
{ {
var excluded_settings = [ "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ]; var excluded_settings = [ "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ]
if(current_mesh_type == "support_mesh") if(current_mesh_type == "support_mesh")
{ {
excluded_settings = excluded_settings.concat(base.all_categories_except_support); excluded_settings = excluded_settings.concat(base.all_categories_except_support)
} }
return excluded_settings; return excluded_settings
} }
visibilityHandler: Cura.PerObjectSettingVisibilityHandler visibilityHandler: Cura.PerObjectSettingVisibilityHandler
@ -243,7 +243,7 @@ Item
// For some reason the model object is updated after removing him from the memory and // For some reason the model object is updated after removing him from the memory and
// it happens only on Windows. For this reason, set the destroyed value manually. // it happens only on Windows. For this reason, set the destroyed value manually.
Component.onDestruction: { Component.onDestruction: {
setDestroyed(true); setDestroyed(true)
} }
} }
@ -353,7 +353,7 @@ Item
target: inheritStackProvider target: inheritStackProvider
onPropertiesChanged: onPropertiesChanged:
{ {
provider.forcePropertiesChanged(); provider.forcePropertiesChanged()
} }
} }
@ -366,22 +366,22 @@ Item
// so here we connect to the signal and update the those values. // so here we connect to the signal and update the those values.
if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined") if (typeof UM.ActiveTool.properties.getValue("SelectedObjectId") !== "undefined")
{ {
const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId"); const selectedObjectId = UM.ActiveTool.properties.getValue("SelectedObjectId")
if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId) if (addedSettingsModel.visibilityHandler.selectedObjectId != selectedObjectId)
{ {
addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId; addedSettingsModel.visibilityHandler.selectedObjectId = selectedObjectId
} }
} }
if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined") if (typeof UM.ActiveTool.properties.getValue("ContainerID") !== "undefined")
{ {
const containerId = UM.ActiveTool.properties.getValue("ContainerID"); const containerId = UM.ActiveTool.properties.getValue("ContainerID")
if (provider.containerStackId != containerId) if (provider.containerStackId != containerId)
{ {
provider.containerStackId = containerId; provider.containerStackId = containerId
} }
if (inheritStackProvider.containerStackId != containerId) if (inheritStackProvider.containerStackId != containerId)
{ {
inheritStackProvider.containerStackId = containerId; inheritStackProvider.containerStackId = containerId
} }
} }
} }
@ -415,17 +415,17 @@ Item
function updateFilter() function updateFilter()
{ {
var new_filter = {}; var new_filter = {}
new_filter["settable_per_mesh"] = true; new_filter["settable_per_mesh"] = true
// Don't filter on "settable_per_meshgroup" any more when `printSequencePropertyProvider.properties.value` // Don't filter on "settable_per_meshgroup" any more when `printSequencePropertyProvider.properties.value`
// is set to "one_at_a_time", because the current backend architecture isn't ready for that. // is set to "one_at_a_time", because the current backend architecture isn't ready for that.
if(filterInput.text != "") if(filterInput.text != "")
{ {
new_filter["i18n_label"] = "*" + filterInput.text; new_filter["i18n_label"] = "*" + filterInput.text
} }
listview.model.filter = new_filter; listview.model.filter = new_filter
} }
TextField { TextField {
@ -438,7 +438,7 @@ Item
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }
placeholderText: catalog.i18nc("@label:textbox", "Filter..."); placeholderText: catalog.i18nc("@label:textbox", "Filter...")
onTextChanged: settingPickDialog.updateFilter() onTextChanged: settingPickDialog.updateFilter()
} }
@ -456,7 +456,7 @@ Item
checked: listview.model.showAll checked: listview.model.showAll
onClicked: onClicked:
{ {
listview.model.showAll = checked; listview.model.showAll = checked
} }
} }
@ -466,25 +466,25 @@ Item
anchors anchors
{ {
top: filterInput.bottom; top: filterInput.bottom
left: parent.left; left: parent.left
right: parent.right; right: parent.right
bottom: parent.bottom; bottom: parent.bottom
} }
ListView ListView
{ {
id:listview id:listview
model: UM.SettingDefinitionsModel model: UM.SettingDefinitionsModel
{ {
id: definitionsModel; id: definitionsModel
containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: "" containerId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.definition.id: ""
visibilityHandler: UM.SettingPreferenceVisibilityHandler {} visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
expanded: [ "*" ] expanded: [ "*" ]
exclude: exclude:
{ {
var excluded_settings = [ "machine_settings", "command_line_settings", "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ]; var excluded_settings = [ "machine_settings", "command_line_settings", "support_mesh", "anti_overhang_mesh", "cutting_mesh", "infill_mesh" ]
excluded_settings = excluded_settings.concat(settingPickDialog.additional_excluded_settings); excluded_settings = excluded_settings.concat(settingPickDialog.additional_excluded_settings)
return excluded_settings; return excluded_settings
} }
} }
delegate:Loader delegate:Loader
@ -492,7 +492,7 @@ Item
id: loader id: loader
width: parent.width width: parent.width
height: model.type != undefined ? UM.Theme.getSize("section").height : 0; height: model.type != undefined ? UM.Theme.getSize("section").height : 0
property var definition: model property var definition: model
property var settingDefinitionsModel: definitionsModel property var settingDefinitionsModel: definitionsModel
@ -515,9 +515,9 @@ Item
rightButtons: [ rightButtons: [
Button { Button {
text: catalog.i18nc("@action:button", "Close"); text: catalog.i18nc("@action:button", "Close")
onClicked: { onClicked: {
settingPickDialog.visible = false; settingPickDialog.visible = false
} }
} }
] ]
@ -543,25 +543,25 @@ Item
storeIndex: 0 storeIndex: 0
} }
SystemPalette { id: palette; } SystemPalette { id: palette }
Component Component
{ {
id: settingTextField; id: settingTextField
Cura.SettingTextField { } Cura.SettingTextField { }
} }
Component Component
{ {
id: settingComboBox; id: settingComboBox
Cura.SettingComboBox { } Cura.SettingComboBox { }
} }
Component Component
{ {
id: settingExtruder; id: settingExtruder
Cura.SettingExtruder { } Cura.SettingExtruder { }
} }
@ -575,21 +575,21 @@ Item
Component Component
{ {
id: settingCheckBox; id: settingCheckBox
Cura.SettingCheckBox { } Cura.SettingCheckBox { }
} }
Component Component
{ {
id: settingCategory; id: settingCategory
Cura.SettingCategory { } Cura.SettingCategory { }
} }
Component Component
{ {
id: settingUnknown; id: settingUnknown
Cura.SettingUnknown { } Cura.SettingUnknown { }
} }