GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action

Browse Source
This commit is contained in:
Lipu Fei 2019-03-21 15:49:12 +01:00
commit 570b6b9804
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View File

@ -147,19 +147,19 @@ ScrollView
indicator: Rectangle indicator: Rectangle
{ {
implicitWidth: 16 implicitWidth: UM.Theme.getSize("radio_button").width
implicitHeight: 16 implicitHeight: UM.Theme.getSize("radio_button").height
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
radius: width / 2 radius: (width / 2) | 0
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: radioButton.hovered ? UM.Theme.getColor("small_button_text") : UM.Theme.getColor("small_button_text_hover") border.color: radioButton.hovered ? UM.Theme.getColor("small_button_text") : UM.Theme.getColor("small_button_text_hover")
Rectangle Rectangle
{ {
width: parent.width / 2 width: (parent.width / 2) | 0
height: width height: width
anchors.centerIn: parent anchors.centerIn: parent
radius: width / 2 radius: (width / 2) | 0
color: radioButton.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button") color: radioButton.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button")
visible: radioButton.checked visible: radioButton.checked
} }

21
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View File

@ -118,23 +118,24 @@ Item
} }
} }
Cura.RoundedRectangle Item
{ {
id: controlsRectangle id: controlsRectangle
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: networkPrinterInfo.bottom anchors.top: networkPrinterInfo.bottom
// Make sure that the left, right, and bottom borders do not show up, otherwise you see double
// borders. // Horizontal line separating the buttons (below) and the discovered network printers (above)
anchors.bottomMargin: -border.width Rectangle
anchors.leftMargin: -border.width {
anchors.rightMargin: -border.width anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
height: UM.Theme.getSize("default_lining").width
color: UM.Theme.getColor("lining")
}
height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
color: "white"
cornerSide: Cura.RoundedRectangle.Direction.Down
Cura.SecondaryButton Cura.SecondaryButton
{ {

2
resources/themes/cura-light/theme.json
View File

@ -513,6 +513,8 @@
"action_button_icon": [1.0, 1.0], "action_button_icon": [1.0, 1.0],
"action_button_radius": [0.15, 0.15], "action_button_radius": [0.15, 0.15],
"radio_button": [1.3, 1.3],
"small_button": [2, 2], "small_button": [2, 2],
"small_button_icon": [1.5, 1.5], "small_button_icon": [1.5, 1.5],