3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'cura4.0_header' into cura4.0_action_panel

Browse source
This commit is contained in:
Diego Prado Gesto 2018-10-30 10:45:25 +01:00
commit 8fee8eeb5e
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Account/AccountDetails.qml
View file

@ -22,7 +22,7 @@ Column
height: UM.Theme.getSize("avatar_image").height
anchors.horizontalCenter: parent.horizontalCenter
source: loggedIn ? profile["profile_image_url"] : UM.Theme.getImage("avatar_no_user")
outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("account_widget_outline_inactive")
outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("lining")
}
Label

2
resources/qml/Account/AccountWidget.qml
View file

@ -26,7 +26,7 @@ Button
anchors.horizontalCenter: accountWidget.horizontalCenter
source: loggedIn ? profile["profile_image_url"] : UM.Theme.getImage("avatar_no_user")
outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("account_widget_outline_inactive")
outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("lining")
}
onClicked: popup.opened ? popup.close() : popup.open()

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

@ -60,7 +60,7 @@ Rectangle
anchors.verticalCenter: parent.verticalCenter
exclusiveGroup: mainWindowHeaderMenuGroup
style: UM.Theme.styles.main_window_header_tab
height: Math.round(0.56 * UM.Theme.getSize("main_window_header").height)
height: UM.Theme.getSize("main_window_header_button").height
onClicked: UM.Controller.setActiveStage(model.id)
iconSource: model.stage.iconSource

3
resources/themes/cura-light/theme.json
View file

@ -97,7 +97,6 @@
"main_window_header_secondary_button_outline_hovered": [255, 255, 255, 255],
"account_widget_outline_active": [70, 66, 126, 255],
"account_widget_outline_inactive": [229, 229, 229, 255],
"machine_selector_bar": [31, 36, 39, 255],
"machine_selector_active": [68, 72, 75, 255],
@ -362,7 +361,7 @@
"window_minimum_size": [106, 66],
"main_window_header": [0.0, 4.5],
"main_window_header_button": [8, 4],
"main_window_header_button": [8, 2.35],
"main_window_header_button_icon": [1.2, 1.2],
"stage_menu": [0.0, 4.5],