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

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

Browse Source
This commit is contained in:
Lipu Fei 2019-03-21 08:35:06 +01:00
commit f2d7f93101
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/CuraApplication.py
View File

@ -454,7 +454,6 @@ class CuraApplication(QtApplication):
# Misc.: # Misc.:
"ConsoleLogger", #You want to be able to read the log if something goes wrong. "ConsoleLogger", #You want to be able to read the log if something goes wrong.
"CuraEngineBackend", #Cura is useless without this one since you can't slice. "CuraEngineBackend", #Cura is useless without this one since you can't slice.
# NOTE: User-Agreement is part of the 'onboarding flow' now (See Welcome Pages).
"FileLogger", #You want to be able to read the log if something goes wrong. "FileLogger", #You want to be able to read the log if something goes wrong.
"XmlMaterialProfile", #Cura crashes without this one. "XmlMaterialProfile", #Cura crashes without this one.
"Toolbox", #This contains the interface to enable/disable plug-ins, so if you disable it you can't enable it back. "Toolbox", #This contains the interface to enable/disable plug-ins, so if you disable it you can't enable it back.

4
resources/qml/Cura.qml
View File

@ -78,13 +78,13 @@ UM.MainWindow
{ {
welcomeDialog.visible = true; welcomeDialog.visible = true;
welcomeDialog.currentStep = 0; welcomeDialog.currentStep = 0;
welcomeDialog.show();
} }
else else
{ {
welcomeDialog.hide()
welcomeDialog.visible = false; welcomeDialog.visible = false;
} }
// TODO: While the new onboarding process contains the user-agreement,
// it should probably not entirely rely on 'needToShowUserAgreement' for show/hide.
} }
Item Item

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

@ -18,7 +18,6 @@ Item
id: addPrinterByIpScreen id: addPrinterByIpScreen
property bool hasPushedAdd: false
property bool hasSentRequest: false property bool hasSentRequest: false
property bool haveConnection: false property bool haveConnection: false
@ -42,7 +41,7 @@ Item
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.bottomMargin: UM.Theme.getSize("default_margin").height anchors.bottomMargin: UM.Theme.getSize("default_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: (parent.width * 3 / 4) | 0 width: Math.floor(parent.width * 3 / 4)
Item Item
{ {
@ -79,7 +78,7 @@ Item
validator: RegExpValidator validator: RegExpValidator
{ {
regExp: /[0-9\.\-\_]*/ regExp: /[a-fA-F0-9\.\:]*/
} }
onAccepted: addPrinterButton.clicked() onAccepted: addPrinterButton.clicked()
@ -99,12 +98,11 @@ Item
{ {
if (hostnameField.text.trim() != "") if (hostnameField.text.trim() != "")
{ {
addPrinterByIpScreen.hasPushedAdd = true enabled = false;
UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text) UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text);
} }
} }
enabled: ! addPrinterByIpScreen.hasPushedAdd
BusyIndicator BusyIndicator
{ {
anchors.fill: parent anchors.fill: parent