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

Resolve merge conflicts

Browse source 
CURA-6483
This commit is contained in:
Lipu Fei 2019-05-02 07:45:40 +02:00
commit 71e32d94f7
30 changed files with 348 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,10 +41,7 @@ Item
onClicked:
{
if (contentShown)
{
addLocalPrinterDropDown.contentShown = false
}
addLocalPrinterDropDown.contentShown = !contentShown
}
contentComponent: networkPrinterListComponent
@ -79,16 +76,13 @@ Item
anchors.top: addNetworkPrinterDropDown.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("wide_margin").height
anchors.topMargin: UM.Theme.getSize("default_margin").height
title: catalog.i18nc("@label", "Add a non-networked printer")
onClicked:
{
if (contentShown)
{
addNetworkPrinterDropDown.contentShown = false
}
addNetworkPrinterDropDown.contentShown = !contentShown
}
contentComponent: localPrinterListComponent