3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Revert "fix merge conflict""

Browse source 
This reverts commit 4bffa6d90f.
This commit is contained in:
Daniel Schiavini 2018-12-07 10:25:46 +01:00
parent 4bffa6d90f
commit a1c252d3a2
73 changed files with 3047 additions and 1216 deletions
Download patch file Download diff file Expand all files Collapse all files

30
resources/qml/MainWindow/MainWindowHeader.qml
View file

@ -12,38 +12,13 @@ import QtGraphicalEffects 1.0
import "../Account"
Rectangle
Item
{
id: base
implicitHeight: UM.Theme.getSize("main_window_header").height
implicitWidth: UM.Theme.getSize("main_window_header").width
LinearGradient
{
anchors.fill: parent
start: Qt.point(0, 0)
end: Qt.point(parent.width, 0)
gradient: Gradient
{
GradientStop
{
position: 0.0
color: UM.Theme.getColor("main_window_header_background")
}
GradientStop
{
position: 0.5
color: UM.Theme.getColor("main_window_header_background_gradient")
}
GradientStop
{
position: 1.0
color: UM.Theme.getColor("main_window_header_background")
}
}
}
Image
{
id: logo
@ -54,9 +29,6 @@ Rectangle
source: UM.Theme.getImage("logo")
width: UM.Theme.getSize("logo").width
height: UM.Theme.getSize("logo").height
sourceSize.width: width
sourceSize.height: height
}
Row