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

This commit is contained in:
Jaime van Kessel 2016-09-13 11:17:44 +02:00
commit 2c29085a20
2 changed files with 8 additions and 1 deletions

View File

@ -7,6 +7,7 @@ install(FILES
DiscoverUM3Action.qml
NetworkPrinterOutputDevice.py
NetworkPrinterOutputDevicePlugin.py
UM3InfoComponents.qml
LICENSE
README.md
DESTINATION lib/cura/plugins/JediWifiPrintingPlugin

View File

@ -65,12 +65,18 @@ Item
visible: isUM3
Button
{
height: UM.Theme.getSize("save_button_save_to_button").height
tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer")
text: catalog.i18nc("@action:button", "Request Access")
onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication()
visible: base.printerConnected && !base.printerAcceptsCommands
}
Button
{
tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura")
text: catalog.i18nc("@action:button", "Activate Configuration")
visible: false
}
}
UM.I18nCatalog{id: catalog; name:"cura"}