diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 92f0b1d5be..9d3da51356 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -68,7 +68,10 @@ Item } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended - function onModeChanged() { currentModeIndex = PrintSetupSelectorContents.Mode.Custom } + function onModeChanged() + { + currentModeIndex = PrintSetupSelectorContents.Mode.Custom; + } } CustomPrintSetup @@ -125,7 +128,8 @@ Item { id: buttonRow property real padding: UM.Theme.getSize("default_margin").width - height: { + height: + { if (currentModeIndex == PrintSetupSelectorContents.Mode.Custom) { return recommendedButton.height + 2 * padding + (draggableArea.visible ? draggableArea.height : 0) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 7deef3cd3e..3d0c4ac82c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 5231af7232..1149ef220f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -1,4 +1,4 @@ -//Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml index 1b5ad8bd17..ca9869db68 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml index 3bdc3cdd65..a8cfaee79f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSettingSection.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -17,7 +17,7 @@ Item property alias enableSectionSwitchVisible: enableSectionSwitch.visible property alias enableSectionSwitchChecked: enableSectionSwitch.checked property alias enableSectionSwitchEnabled: enableSectionSwitch.enabled - property string tooltipText: "test" + property string tooltipText: "" property var enableSectionClicked: { return } property int leftColumnWidth: Math.floor(width * 0.35) property bool isCompressed: false diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml index 52a2197b99..53a54cdc94 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index f7f7df0fe3..457585936f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -20,7 +20,8 @@ RecommendedSettingSection enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") - function onEnableSectionChanged(state) { + function onEnableSectionChanged(state) + { supportEnabled.setPropertyValue("value", state) } diff --git a/resources/qml/Validators/FloatValidator.qml b/resources/qml/Validators/FloatValidator.qml index 62ff981e2e..55f2fbae00 100644 --- a/resources/qml/Validators/FloatValidator.qml +++ b/resources/qml/Validators/FloatValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/HexColorValidator.qml b/resources/qml/Validators/HexColorValidator.qml index 2c3ba706ec..4a15000b8a 100644 --- a/resources/qml/Validators/HexColorValidator.qml +++ b/resources/qml/Validators/HexColorValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/IntListValidator.qml b/resources/qml/Validators/IntListValidator.qml index 2f5b3c829a..f0b9d790e2 100644 --- a/resources/qml/Validators/IntListValidator.qml +++ b/resources/qml/Validators/IntListValidator.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Validators/IntValidator.qml b/resources/qml/Validators/IntValidator.qml index 6b7ced9ce8..29b04ea94c 100644 --- a/resources/qml/Validators/IntValidator.qml +++ b/resources/qml/Validators/IntValidator.qml @@ -1,5 +1,6 @@ // Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 RegularExpressionValidator diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml index 0767c271ca..9d3f0402c3 100644 --- a/resources/qml/Widgets/SingleSettingComboBox.qml +++ b/resources/qml/Widgets/SingleSettingComboBox.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 diff --git a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml index c4045b57f0..389f70f4f9 100644 --- a/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml +++ b/resources/qml/Widgets/SingleSettingExtruderSelectorBar.qml @@ -1,3 +1,6 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.3 diff --git a/resources/qml/Widgets/SingleSettingSlider.qml b/resources/qml/Widgets/SingleSettingSlider.qml index f1b0f2c54d..91ff9c1ed4 100644 --- a/resources/qml/Widgets/SingleSettingSlider.qml +++ b/resources/qml/Widgets/SingleSettingSlider.qml @@ -104,7 +104,8 @@ RowLayout } // Override this function to update a setting differently - function updateSetting(value) { + function updateSetting(value) + { if (updateAllExtruders) { Cura.MachineManager.setSettingForAllExtruders(propertyProvider.key, "value", value) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 72edf58681..4def7f4179 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10