mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 02:45:55 +08:00
Add a pattern in the background of the header.
Adjust some main colors to the ones in the designs.
This commit is contained in:
parent
024bf409c9
commit
f655e6c43e
@ -88,6 +88,30 @@ UM.MainWindow
|
|||||||
window: base
|
window: base
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Rectangle
|
||||||
|
{
|
||||||
|
id: headerBackground
|
||||||
|
anchors
|
||||||
|
{
|
||||||
|
top: parent.top
|
||||||
|
left: parent.left
|
||||||
|
right: parent.right
|
||||||
|
}
|
||||||
|
height: stageMenu.source != "" ? Math.round(mainWindowHeader.height + stageMenu.height / 2) : mainWindowHeader.height
|
||||||
|
color: UM.Theme.getColor("main_window_header_background")
|
||||||
|
|
||||||
|
// This is the new fancy pattern
|
||||||
|
Image
|
||||||
|
{
|
||||||
|
id: backgourndPattern
|
||||||
|
anchors.fill: parent
|
||||||
|
fillMode: Image.Tile
|
||||||
|
source: UM.Theme.getImage("header_pattern")
|
||||||
|
horizontalAlignment: Image.AlignLeft
|
||||||
|
verticalAlignment: Image.AlignTop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
MainWindowHeader
|
MainWindowHeader
|
||||||
{
|
{
|
||||||
id: mainWindowHeader
|
id: mainWindowHeader
|
||||||
@ -144,44 +168,6 @@ UM.MainWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle
|
|
||||||
{
|
|
||||||
id: stageMenuBackground
|
|
||||||
anchors
|
|
||||||
{
|
|
||||||
left: parent.left
|
|
||||||
right: parent.right
|
|
||||||
top: parent.top
|
|
||||||
}
|
|
||||||
visible: stageMenu.source != ""
|
|
||||||
height: visible ? Math.round(UM.Theme.getSize("stage_menu").height / 2) : 0
|
|
||||||
|
|
||||||
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")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Connections
|
Connections
|
||||||
{
|
{
|
||||||
target: stageMenu.item
|
target: stageMenu.item
|
||||||
@ -257,7 +243,8 @@ UM.MainWindow
|
|||||||
|
|
||||||
anchors
|
anchors
|
||||||
{
|
{
|
||||||
top: stageMenuBackground.bottom
|
// Align to the top of the stageMenu since the stageMenu may not exist
|
||||||
|
top: parent.top
|
||||||
left: parent.left
|
left: parent.left
|
||||||
right: parent.right
|
right: parent.right
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
|
@ -12,38 +12,13 @@ import QtGraphicalEffects 1.0
|
|||||||
|
|
||||||
import "../Account"
|
import "../Account"
|
||||||
|
|
||||||
Rectangle
|
Item
|
||||||
{
|
{
|
||||||
id: base
|
id: base
|
||||||
|
|
||||||
implicitHeight: UM.Theme.getSize("main_window_header").height
|
implicitHeight: UM.Theme.getSize("main_window_header").height
|
||||||
implicitWidth: UM.Theme.getSize("main_window_header").width
|
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
|
Image
|
||||||
{
|
{
|
||||||
id: logo
|
id: logo
|
||||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 310 KiB After Width: | Height: | Size: 792 KiB |
@ -93,14 +93,14 @@
|
|||||||
"secondary_button_hover": [228, 228, 228, 255],
|
"secondary_button_hover": [228, 228, 228, 255],
|
||||||
"secondary_button_text": [30, 102, 215, 255],
|
"secondary_button_text": [30, 102, 215, 255],
|
||||||
|
|
||||||
"main_window_header_background": [10, 8, 80, 255],
|
"main_window_header_background": [8, 7, 63, 255],
|
||||||
"main_window_header_background_gradient": [25, 23, 91, 255],
|
"main_window_header_background_gradient": [25, 23, 91, 255],
|
||||||
"main_window_header_button_text_active": [10, 8, 80, 255],
|
"main_window_header_button_text_active": [8, 7, 63, 255],
|
||||||
"main_window_header_button_text_inactive": [255, 255, 255, 255],
|
"main_window_header_button_text_inactive": [255, 255, 255, 255],
|
||||||
"main_window_header_button_text_hovered": [255, 255, 255, 255],
|
"main_window_header_button_text_hovered": [255, 255, 255, 255],
|
||||||
"main_window_header_button_background_active": [255, 255, 255, 255],
|
"main_window_header_button_background_active": [255, 255, 255, 255],
|
||||||
"main_window_header_button_background_inactive": [255, 255, 255, 0],
|
"main_window_header_button_background_inactive": [255, 255, 255, 0],
|
||||||
"main_window_header_button_background_hovered": [255, 255, 255, 102],
|
"main_window_header_button_background_hovered": [117, 114, 159, 255],
|
||||||
|
|
||||||
"account_widget_outline_active": [70, 66, 126, 255],
|
"account_widget_outline_active": [70, 66, 126, 255],
|
||||||
|
|
||||||
@ -113,7 +113,7 @@
|
|||||||
|
|
||||||
"toolbar_background": [255, 255, 255, 255],
|
"toolbar_background": [255, 255, 255, 255],
|
||||||
|
|
||||||
"printer_type_label_background": [171, 171, 191, 255],
|
"printer_type_label_background": [228, 228, 242, 255],
|
||||||
|
|
||||||
"text": [0, 0, 0, 255],
|
"text": [0, 0, 0, 255],
|
||||||
"text_detail": [174, 174, 174, 128],
|
"text_detail": [174, 174, 174, 128],
|
||||||
@ -127,9 +127,9 @@
|
|||||||
"text_scene_hover": [70, 84, 113, 255],
|
"text_scene_hover": [70, 84, 113, 255],
|
||||||
|
|
||||||
"error": [255, 140, 0, 255],
|
"error": [255, 140, 0, 255],
|
||||||
"warning": [255, 190, 35, 255],
|
"warning": [245, 166, 35, 255],
|
||||||
|
|
||||||
"toolbar_button_text": [10, 8, 80, 255],
|
"toolbar_button_text": [8, 7, 63, 255],
|
||||||
"toolbar_button_hover": [232, 242, 252, 255],
|
"toolbar_button_hover": [232, 242, 252, 255],
|
||||||
"toolbar_button_active": [232, 242, 252, 255],
|
"toolbar_button_active": [232, 242, 252, 255],
|
||||||
"toolbar_button_active_hover": [232, 242, 252, 255],
|
"toolbar_button_active_hover": [232, 242, 252, 255],
|
||||||
@ -144,9 +144,9 @@
|
|||||||
"button_text_active_hover": [255, 255, 255, 255],
|
"button_text_active_hover": [255, 255, 255, 255],
|
||||||
|
|
||||||
"small_button": [0, 0, 0, 0],
|
"small_button": [0, 0, 0, 0],
|
||||||
"small_button_hover": [10, 8, 80, 255],
|
"small_button_hover": [8, 7, 63, 255],
|
||||||
"small_button_active": [10, 8, 80, 255],
|
"small_button_active": [8, 7, 63, 255],
|
||||||
"small_button_active_hover": [10, 8, 80, 255],
|
"small_button_active_hover": [8, 7, 63, 255],
|
||||||
"small_button_text": [171, 171, 191, 255],
|
"small_button_text": [171, 171, 191, 255],
|
||||||
"small_button_text_hover": [255, 255, 255, 255],
|
"small_button_text_hover": [255, 255, 255, 255],
|
||||||
"small_button_text_active": [255, 255, 255, 255],
|
"small_button_text_active": [255, 255, 255, 255],
|
||||||
@ -222,8 +222,8 @@
|
|||||||
"progressbar_control": [50, 130, 255, 255],
|
"progressbar_control": [50, 130, 255, 255],
|
||||||
|
|
||||||
"slider_groove": [223, 223, 223, 255],
|
"slider_groove": [223, 223, 223, 255],
|
||||||
"slider_groove_fill": [10, 8, 80, 255],
|
"slider_groove_fill": [8, 7, 63, 255],
|
||||||
"slider_handle": [10, 8, 80, 255],
|
"slider_handle": [8, 7, 63, 255],
|
||||||
"slider_handle_active": [50, 130, 255, 255],
|
"slider_handle_active": [50, 130, 255, 255],
|
||||||
"slider_text_background": [255, 255, 255, 255],
|
"slider_text_background": [255, 255, 255, 255],
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user