mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 15:37:27 -06:00
Add-by-IP onboarding: Create (and set active) new device. [CURA-6294]
This commit is contained in:
parent
bb17ab14da
commit
b12b6892ca
2 changed files with 15 additions and 51 deletions
|
@ -301,7 +301,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
|
|||
self._onRemoveDevice(instance_name)
|
||||
self._onAddDevice(instance_name, address, properties)
|
||||
|
||||
if device:
|
||||
if device and address in self._manual_instances:
|
||||
self.getOutputDeviceManager().addOutputDevice(device)
|
||||
self.addManualDeviceSignal.emit(self.getPluginId(), device.getId(), address, properties)
|
||||
|
||||
def _onRemoveDevice(self, device_id):
|
||||
|
|
|
@ -22,47 +22,6 @@ Item
|
|||
property bool hasSentRequest: false
|
||||
property bool haveConnection: false
|
||||
|
||||
Timer
|
||||
{
|
||||
id: tempTimerButton
|
||||
|
||||
interval: 1200
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered:
|
||||
{
|
||||
hasPushedAdd = true
|
||||
tempTimerRequest.running = true
|
||||
}
|
||||
}
|
||||
// TODO: Remove timers after review interface!
|
||||
|
||||
Timer
|
||||
{
|
||||
id: tempTimerRequest
|
||||
|
||||
interval: 1200
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered:
|
||||
{
|
||||
hasSentRequest = true
|
||||
tempTimerConnection.running = true
|
||||
}
|
||||
}
|
||||
// TODO: Remove timers after review interface!
|
||||
|
||||
Timer
|
||||
{
|
||||
id: tempTimerConnection
|
||||
|
||||
interval: 1200
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered: haveConnection = true
|
||||
}
|
||||
// TODO: Remove timers after review interface!
|
||||
|
||||
Label
|
||||
{
|
||||
id: titleLabel
|
||||
|
@ -141,14 +100,9 @@ Item
|
|||
text: catalog.i18nc("@button", "Add")
|
||||
onClicked:
|
||||
{
|
||||
// TEMP: Simulate successfull connection to printer with 127.0.0.1 or unsuccessful with anything else
|
||||
// TODO, alter after review interface, now it just starts the timers.
|
||||
|
||||
if (hostnameField.text.trim() != "")
|
||||
{
|
||||
addPrinterByIpScreen.hasPushedAdd = true
|
||||
tempTimerRequest.running = true
|
||||
|
||||
UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text)
|
||||
}
|
||||
}
|
||||
|
@ -203,13 +157,13 @@ Item
|
|||
columns: 2
|
||||
columnSpacing: 20
|
||||
|
||||
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Type") }
|
||||
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Type") }
|
||||
Label { id: typeText; font: UM.Theme.getFont("default"); text: "?" }
|
||||
|
||||
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Firmware version") }
|
||||
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Firmware version") }
|
||||
Label { id: firmwareText; font: UM.Theme.getFont("default"); text: "0.0.0.0" }
|
||||
|
||||
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Address") }
|
||||
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Address") }
|
||||
Label { id: addressText; font: UM.Theme.getFont("default"); text: "0.0.0.0" }
|
||||
|
||||
Connections
|
||||
|
@ -230,6 +184,7 @@ Item
|
|||
onManualDeviceChanged:
|
||||
{
|
||||
printerNameLabel.text = UM.OutputDeviceManager.manualDeviceProperty("name")
|
||||
addPrinterByIpScreen.haveConnection = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -260,7 +215,15 @@ Item
|
|||
text: catalog.i18nc("@button", "Connect")
|
||||
width: 140
|
||||
fixedWidthMode: true
|
||||
onClicked: base.showNextPage()
|
||||
onClicked:
|
||||
{
|
||||
Cura.MachineManager.addMachine(
|
||||
UM.OutputDeviceManager.manualDeviceProperty("printer_type"),
|
||||
UM.OutputDeviceManager.manualDeviceProperty("name")
|
||||
)
|
||||
UM.OutputDeviceManager.setActiveDevice(UM.OutputDeviceManager.manualDeviceProperty("device_id"))
|
||||
base.showNextPage()
|
||||
}
|
||||
|
||||
enabled: addPrinterByIpScreen.haveConnection
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue