3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 23:35:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.3'

Browse source
This commit is contained in:
Ghostkeeper 2019-09-17 13:08:49 +02:00
commit b34895703b
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/OAuth2/AuthorizationService.py
View file

@ -199,8 +199,6 @@ class AuthorizationService:
self._unable_to_get_data_message.hide()
self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", "Unable to reach the Ultimaker account server."), title = i18n_catalog.i18nc("@info:title", "Warning"))
self._unable_to_get_data_message.addAction("retry", i18n_catalog.i18nc("@action:button", "Retry"), "[no_icon]", "[no_description]")
self._unable_to_get_data_message.actionTriggered.connect(self._onMessageActionTriggered)
self._unable_to_get_data_message.show()
except ValueError:
Logger.logException("w", "Could not load auth data from preferences")
@ -222,6 +220,3 @@ class AuthorizationService:
self.accessTokenChanged.emit()
def _onMessageActionTriggered(self, _, action):
if action == "retry":
self.loadAuthDataFromPreferences()

3
cura/Settings/MachineManager.py
View file

@ -201,7 +201,8 @@ class MachineManager(QObject):
# An empty build plate configuration from the network printer is presented as an empty string, so use "" for an
# empty build plate.
self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != empty_variant_container else ""
self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value")\
if self._global_container_stack.variant != empty_variant_container else self._global_container_stack.getProperty("machine_buildplate_type", "default_value")
self.currentConfigurationChanged.emit()
@pyqtSlot(QObject, result = bool)