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

Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup

Browse source 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
This commit is contained in:
j.delarago 2022-02-28 08:51:42 +01:00
commit e2fe50baf1
155 changed files with 406 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Widgets/Menu.qml
View file

@ -12,9 +12,11 @@ import Cura 1.0 as Cura
UM.Menu
{
id: menu
topPadding: UM.Theme.getSize("narrow_margin").height
bottomPadding: UM.Theme.getSize("narrow_margin").height
padding: 0
width: UM.Theme.getSize("context_menu").width
implicitWidth: UM.Theme.getSize("menu").width
delegate: Cura.MenuItem {}
background: Rectangle

5
resources/qml/Widgets/MenuItem.qml
View file

@ -12,6 +12,9 @@ import UM 1.5 as UM
UM.MenuItem
{
id: menuItem
implicitHeight: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
implicitWidth: UM.Theme.getSize("menu").width
opacity: enabled ? 1.0 : 0.5
arrow: UM.RecolorImage
@ -46,6 +49,6 @@ UM.MenuItem
width: menuItem.width - 2 * UM.Theme.getSize("default_lining").width
height: menuItem.height - 2 * UM.Theme.getSize("default_lining").height
color: menuItem.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent"
color: menuItem.highlighted ? UM.Theme.getColor("secondary"): UM.Theme.getColor("setting_control_highlight")
}
}

6
resources/qml/Widgets/MenuSeparator.qml
View file

@ -11,8 +11,10 @@ import UM 1.1 as UM
//
MenuSeparator
{
padding: 0
contentItem: Rectangle {
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
contentItem: Rectangle
{
implicitHeight: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("setting_control_border")
}