diff options
| author | Jelle Spijker <spijker.jelle@gmail.com> | 2022-07-14 17:30:52 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2022-07-14 17:30:52 +0300 |
| commit | 1a0ecfd850a64985526553dbdca5a008dd3632b8 (patch) | |
| tree | 4fa57c637327a369cc0ec25fa9303ddc6590eb05 /resources/qml | |
| parent | f5a559179bac2e638e62c6a41adf22dcb3ec3bdf (diff) | |
| parent | e0c7259149fce773c85e0e8b5ef3f67c8f523c87 (diff) | |
Merge branch '5.1'
# Conflicts:
# .github/workflows/conan-package.yml
# .github/workflows/cura-installer.yml
Diffstat (limited to 'resources/qml')
3 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 9b6f5bf609..c77545bc03 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -92,6 +92,7 @@ UM.ManagementPage minimumHeight: UM.Theme.getSize("modal_window_minimum").height maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 + backgroundColor: UM.Theme.getColor("main_background") } UM.ConfirmRemoveDialog diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml index 6e4c628114..7bcd65ed5d 100644 --- a/resources/qml/Preferences/RenameDialog.qml +++ b/resources/qml/Preferences/RenameDialog.qml @@ -23,7 +23,7 @@ UM.Dialog property string explanation: catalog.i18nc("@info", "Please provide a new name.") title: dialogTitle - + backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width minimumHeight: UM.Theme.getSize("small_popup_dialog").height width: minimumWidth diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 87cb271ed4..bc5826fe7c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -43,7 +43,6 @@ Item qualityType = Cura.MachineManager.activeQualityType } else { qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) - print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)) } Cura.IntentManager.selectIntent(model.intent_category, qualityType) } |