From 6435e8ce6f9e21440181344292f97b6faedcb5f2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 13 Sep 2016 09:49:17 +0200 Subject: [PATCH 1/2] Request is now only triggered on right actions CURA-2279 --- NetworkPrinterOutputDevice.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py index 5d70005d5f..239076383d 100644 --- a/NetworkPrinterOutputDevice.py +++ b/NetworkPrinterOutputDevice.py @@ -246,14 +246,15 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): @pyqtSlot() def requestAuthentication(self, message_id, action_id): - self._authentication_failed_message.hide() - self._not_authenticated_message.hide() - self._authentication_state = AuthState.NotAuthenticated - self._authentication_counter = 0 - self._authentication_requested_message.setProgress(0) - self._authentication_id = None - self._authentication_key = None - self._createNetworkManager() # Re-create network manager to force re-authentication. + if action_id == "Request" or action_id == "Retry": + self._authentication_failed_message.hide() + self._not_authenticated_message.hide() + self._authentication_state = AuthState.NotAuthenticated + self._authentication_counter = 0 + self._authentication_requested_message.setProgress(0) + self._authentication_id = None + self._authentication_key = None + self._createNetworkManager() # Re-create network manager to force re-authentication. ## Request data from the connected device. def _update(self): From 6069182175e8841ce08e0dde27052e41b72bd857 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 13 Sep 2016 09:50:04 +0200 Subject: [PATCH 2/2] Added UM3InfoComponents.qml to CMakeLists to the file also gets installed in the build --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 618e8ecbbe..c551e7f707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ install(FILES DiscoverUM3Action.qml NetworkPrinterOutputDevice.py NetworkPrinterOutputDevicePlugin.py + UM3InfoComponents.qml LICENSE README.md DESTINATION lib/cura/plugins/JediWifiPrintingPlugin