3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Lipu Fei 2019-03-26 12:07:25 +01:00
commit 839d8c2227
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -35,7 +35,7 @@ Item
anchors.top: titleLabel.bottom anchors.top: titleLabel.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: 20 anchors.margins: UM.Theme.getSize("wide_margin").width
title: catalog.i18nc("@label", "Add a networked printer") title: catalog.i18nc("@label", "Add a networked printer")
contentShown: true // by default expand the network printer list contentShown: true // by default expand the network printer list
@ -80,7 +80,7 @@ Item
anchors.top: addNetworkPrinterDropDown.bottom anchors.top: addNetworkPrinterDropDown.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: 20 anchors.margins: UM.Theme.getSize("wide_margin").width
title: catalog.i18nc("@label", "Add a non-networked printer") title: catalog.i18nc("@label", "Add a non-networked printer")

4
resources/qml/WelcomePages/WelcomeDialog.qml
View file

@ -22,8 +22,8 @@ Window
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
flags: Qt.Window | Qt.FramelessWindowHint flags: Qt.Window | Qt.FramelessWindowHint
width: 580 // TODO width: 580 * screenScaleFactor
height: 600 // TODO height: 600 * screenScaleFactor
color: "transparent" color: "transparent"
property int shadowOffset: 1 * screenScaleFactor property int shadowOffset: 1 * screenScaleFactor