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_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
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.:
"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.
# 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.
"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.

4
resources/qml/Cura.qml
View file

@ -78,13 +78,13 @@ UM.MainWindow
{
welcomeDialog.visible = true;
welcomeDialog.currentStep = 0;
welcomeDialog.show();
}
else
{
welcomeDialog.hide()
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

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

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