3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Update Material selection and variant selection buttons to QtControls 2

Browse source 
CURA-8684
This commit is contained in:
casper 2022-01-20 22:38:00 +01:00
parent f2ee58a08b
commit 07095a5802
3 changed files with 110 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -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