GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Lipu Fei 2019-03-22 10:25:07 +01:00
commit 77720c9039
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,10 +73,9 @@ Item
Component.onCompleted:
{
// select the first one that's not "unknown" by default.
// Select the first one that's not "unknown" by default.
for (var i = 0; i < count; i++)
{
if (!model[i].is_unknown_machine_type)
{
currentIndex = i

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

@ -18,7 +18,9 @@ Item
id: addPrinterByIpScreen
// Whether an IP address is currently being resolved.
property bool hasSentRequest: false
// Whether the IP address user entered can be resolved as a recognizable printer.
property bool haveConnection: false
Label
@ -116,7 +118,7 @@ Item
}
}
Rectangle
Item
{
width: parent.width
anchors.top: userInputFields.bottom
@ -133,7 +135,7 @@ Item
text: catalog.i18nc("@label", "The printer at this address has not responded yet.")
}
Rectangle
Item
{
id: printerInfoLabels
anchors.top: parent.top
@ -202,9 +204,7 @@ Item
text: catalog.i18nc("@button", "Cancel")
width: UM.Theme.getSize("action_button").width
fixedWidthMode: true
onClicked: base.gotoPage("add_printer_by_selection")
enabled: true
onClicked: base.goToPage("add_printer_by_selection")
}
Cura.PrimaryButton

6
resources/qml/WelcomePages/AddPrinterBySelectionContent.qml
View File

@ -67,7 +67,7 @@ Item
onAddByIpButtonClicked:
{
base.gotoPage("add_printer_by_ip")
base.goToPage("add_printer_by_ip")
}
}
}
@ -139,7 +139,7 @@ Item
CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
// If we have created a machine, go to the last page, which is the "cloud" page.
base.gotoPage("cloud")
base.goToPage("cloud")
}
else
{
@ -147,7 +147,7 @@ Item
const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
Cura.MachineManager.addMachine(localPrinterItem.id)
base.gotoPage("machine_actions")
base.goToPage("machine_actions")
}
}
}

5
resources/qml/WelcomePages/StepPanel.qml
View File

@ -31,7 +31,7 @@ Item
signal showNextPage()
signal showPreviousPage()
signal passLastPage() // Emitted when there is no more page to show
signal gotoPage(string page_id) // Go to a specific page by the given page_id.
signal goToPage(string page_id) // Go to a specific page by the given page_id.
onShowNextPage:
{
@ -52,7 +52,7 @@ Item
}
}
onGotoPage:
onGoToPage:
{
// find the page index
var page_index = -1
@ -108,7 +108,6 @@ Item
source: parent
horizontalOffset: base.shadowOffset
verticalOffset: base.shadowOffset
visible: true
color: UM.Theme.getColor("monitor_shadow")
transparentBorder: true
// Should always be drawn behind the background.