3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'origin/4.1'

Browse source
This commit is contained in:
Lipu Fei 2019-04-25 08:48:34 +02:00
commit 2e32b33bbb
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/OAuth2/AuthorizationService.py
View file

@ -130,6 +130,7 @@ class AuthorizationService:
self._storeAuthData(response) self._storeAuthData(response)
self.onAuthStateChanged.emit(logged_in = True) self.onAuthStateChanged.emit(logged_in = True)
else: else:
Logger.log("w", "Failed to get a new access token from the server.")
self.onAuthStateChanged.emit(logged_in = False) self.onAuthStateChanged.emit(logged_in = False)
## Delete the authentication data that we have stored locally (eg; logout) ## Delete the authentication data that we have stored locally (eg; logout)

2
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -57,7 +57,7 @@ Item
{ {
id: networkPrinterScrollView id: networkPrinterScrollView
maxItemCountAtOnce: 6 // show at max 6 items at once, otherwise you need to scroll. maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
onRefreshButtonClicked: onRefreshButtonClicked:
{ {