diff options
author | casper <c.lamboo@ultimaker.com> | 2022-01-21 00:38:00 +0300 |
---|---|---|
committer | casper <c.lamboo@ultimaker.com> | 2022-01-21 00:38:00 +0300 |
commit | 07095a5802189a19a865ee11056da0ab2b0d42dc (patch) | |
tree | 5f14f8a5875a8b32eb86ec78e0ee835233d4a767 /resources/qml/Menus/ConfigurationMenu | |
parent | f2ee58a08bb470379e47e115f1d31a12f74369e0 (diff) |
Update Material selection and variant selection buttons to QtControls 2
CURA-8684
Diffstat (limited to 'resources/qml/Menus/ConfigurationMenu')
-rw-r--r-- | resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index bacee0bc24..95026112ba 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -1,9 +1,8 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Controls 1.1 as OldControls import Cura 1.0 as Cura import UM 1.5 as UM @@ -262,7 +261,7 @@ Item width: selectors.textWidth } - OldControls.ToolButton + Cura.PrintSetupHeaderButton { id: materialSelection @@ -276,8 +275,8 @@ Item width: selectors.controlWidth height: parent.height - style: UM.Theme.styles.print_setup_header_button - activeFocusOnPress: true + focusPolicy: ClickFocus + Cura.MaterialMenu { id: materialsMenu @@ -324,15 +323,14 @@ Item width: selectors.textWidth } - OldControls.ToolButton + Cura.PrintSetupHeaderButton { id: variantSelection text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.variant.name : "" tooltip: text height: parent.height width: selectors.controlWidth - style: UM.Theme.styles.print_setup_header_button - activeFocusOnPress: true + focusPolicy: ClickFocus enabled: enabledCheckbox.checked Cura.NozzleMenu |