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

Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-16 16:20:14 +02:00
commit c4d197ea8a
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DiscoverUM3Action.py
View File

@ -21,7 +21,7 @@ class DiscoverUM3Action(MachineAction):
self._network_plugin = None self._network_plugin = None
self._context = None self._additional_components_context = None
self._additional_component = None self._additional_component = None
self._additional_components_view = None self._additional_components_view = None
@ -110,9 +110,9 @@ class DiscoverUM3Action(MachineAction):
self._additional_component = QQmlComponent(Application.getInstance()._engine, path) self._additional_component = QQmlComponent(Application.getInstance()._engine, path)
# We need access to engine (although technically we can't) # We need access to engine (although technically we can't)
self._context = QQmlContext(Application.getInstance()._engine.rootContext()) self._additional_components_context = QQmlContext(Application.getInstance()._engine.rootContext())
self._context.setContextProperty("manager", self) self._additional_components_context.setContextProperty("manager", self)
self._additional_components_view = self._additional_component.create(self._context) self._additional_components_view = self._additional_component.create(self._additional_components_context)
Application.getInstance().addAdditionalComponent("monitorButtons", self._additional_components_view.findChild(QObject, "networkPrinterConnectButton")) Application.getInstance().addAdditionalComponent("monitorButtons", self._additional_components_view.findChild(QObject, "networkPrinterConnectButton"))
Application.getInstance().addAdditionalComponent("machinesDetailPane", self._additional_components_view.findChild(QObject, "networkPrinterConnectionInfo")) Application.getInstance().addAdditionalComponent("machinesDetailPane", self._additional_components_view.findChild(QObject, "networkPrinterConnectionInfo"))

17
UM3InfoComponents.qml
View File

@ -10,7 +10,7 @@ Item
{ {
id: base id: base
property bool isUM3: Cura.MachineManager.activeDefinitionId == "ultimaker3" property bool isUM3: Cura.MachineManager.activeQualityDefinitionId == "ultimaker3"
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property bool authenticationRequested: printerConnected && Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 // AuthState.AuthenticationRequested property bool authenticationRequested: printerConnected && Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 // AuthState.AuthenticationRequested
@ -28,7 +28,7 @@ Item
text: catalog.i18nc("@action:button", "Request Access") text: catalog.i18nc("@action:button", "Request Access")
style: UM.Theme.styles.sidebar_action_button style: UM.Theme.styles.sidebar_action_button
onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication() onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication()
visible: !base.printerAcceptsCommands && !base.authenticationRequested visible: printerConnected && !printerAcceptsCommands && !authenticationRequested
} }
Button Button
@ -38,8 +38,7 @@ Item
text: catalog.i18nc("@action:button", "Connect") text: catalog.i18nc("@action:button", "Connect")
style: UM.Theme.styles.sidebar_action_button style: UM.Theme.styles.sidebar_action_button
onClicked: connectActionDialog.show() onClicked: connectActionDialog.show()
enabled: true visible: !printerConnected
visible: !base.printerConnected
} }
} }
@ -72,12 +71,12 @@ Item
tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer") tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer")
text: catalog.i18nc("@action:button", "Request Access") text: catalog.i18nc("@action:button", "Request Access")
onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication() onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication()
visible: !base.printerAcceptsCommands && !base.authenticationRequested visible: printerConnected && !printerAcceptsCommands && !authenticationRequested
} }
Row Row
{ {
visible: base.printerConnected visible: printerConnected
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
anchors.left: parent.left anchors.left: parent.left
@ -97,7 +96,7 @@ Item
Repeater Repeater
{ {
id: nozzleColumn id: nozzleColumn
model: Cura.MachineManager.printerOutputDevices[0].hotendIds model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].hotendIds : null
Label { text: nozzleColumn.model[index] } Label { text: nozzleColumn.model[index] }
} }
} }
@ -106,7 +105,7 @@ Item
Repeater Repeater
{ {
id: materialColumn id: materialColumn
model: Cura.MachineManager.printerOutputDevices[0].materialNames model: printerConnected ? Cura.MachineManager.printerOutputDevices[0].materialNames : null
Label { text: materialColumn.model[index] } Label { text: materialColumn.model[index] }
} }
} }
@ -116,7 +115,7 @@ Item
{ {
tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura") tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura")
text: catalog.i18nc("@action:button", "Activate Configuration") text: catalog.i18nc("@action:button", "Activate Configuration")
visible: base.printerConnected visible: printerConnected
onClicked: manager.loadConfigurationFromPrinter() onClicked: manager.loadConfigurationFromPrinter()
} }
} }