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

Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash

Browse source
This commit is contained in:
Jaime van Kessel 2022-04-06 11:21:01 +02:00
commit 1158856f80
2 changed files with 86 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

53
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2022 Ultimaker B.V. // Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.4 import QtQuick 2.15
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
@ -483,23 +483,9 @@ Cura.ExpandableComponent
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
LinearGradient
{
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_lining").width
right: parent.right
rightMargin: UM.Theme.getSize("default_lining").width
top: parent.top
topMargin: UM.Theme.getSize("default_lining").width
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_lining").width
}
start: Qt.point(0, 0)
end: Qt.point(parent.width, 0)
gradient: Gradient gradient: Gradient
{ {
orientation: Gradient.Horizontal
GradientStop GradientStop
{ {
position: 0.000 position: 0.000
@ -522,7 +508,6 @@ Cura.ExpandableComponent
} }
} }
} }
}
// Gradient colors for layer thickness (similar to parula colormap) // Gradient colors for layer thickness (similar to parula colormap)
Rectangle Rectangle
@ -537,23 +522,9 @@ Cura.ExpandableComponent
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
LinearGradient
{
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_lining").width
right: parent.right
rightMargin: UM.Theme.getSize("default_lining").width
top: parent.top
topMargin: UM.Theme.getSize("default_lining").width
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_lining").width
}
start: Qt.point(0, 0)
end: Qt.point(parent.width, 0)
gradient: Gradient gradient: Gradient
{ {
orientation: Gradient.Horizontal
GradientStop GradientStop
{ {
position: 0.000 position: 0.000
@ -581,7 +552,6 @@ Cura.ExpandableComponent
} }
} }
} }
}
// Gradient colors for flow (similar to jet colormap) // Gradient colors for flow (similar to jet colormap)
Rectangle Rectangle
@ -596,23 +566,9 @@ Cura.ExpandableComponent
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
LinearGradient
{
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_lining").width
right: parent.right
rightMargin: UM.Theme.getSize("default_lining").width
top: parent.top
topMargin: UM.Theme.getSize("default_lining").width
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_lining").width
}
start: Qt.point(0, 0)
end: Qt.point(parent.width, 0)
gradient: Gradient gradient: Gradient
{ {
orientation: Gradient.Horizontal
GradientStop GradientStop
{ {
position: 0.0 position: 0.0
@ -661,7 +617,6 @@ Cura.ExpandableComponent
} }
} }
} }
}
FontMetrics FontMetrics
{ {

1
resources/qml/ObjectSelector.qml
View file

@ -1,3 +1,4 @@
// Copyright (c) 2022 Ultimaker B.V. // Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.