Commit graph

6967 commits

Author SHA1 Message Date
Kostas Karmas
f677be14c2 Fix spacing
CURA-7436
2020-05-20 15:10:04 +02:00
Kostas Karmas
4e930b4d52 Remove unused "has_cloud_connection" variable
CURA-7436
2020-05-20 15:08:05 +02:00
Nino van Hooff
7388829fc1 Change account sync date format back to dd/mm/YYYY
For consistency with the rest of the application
2020-05-19 14:32:02 +02:00
Nino van Hooff
23c039a873
Add type hint in cura/API/Account.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-05-19 14:14:39 +02:00
Nino van Hooff
050878bbfe
Update cura/API/Account.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-05-19 14:14:10 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager
CURA-7436
2020-05-18 16:22:55 +02:00
Nino van Hooff
c61f5a162e Update remote and local printer labels in Machines page
CURA-7436
2020-05-18 14:49:05 +02:00
Nino van Hooff
3d19e75c82 Notify user of proper way to remove cloud printer
CURA-7436
2020-05-18 14:48:19 +02:00
Luc Rubio
6fe66bf525 Add support for more than one network plugin when adding a network printer by IP address. 2020-05-18 00:16:09 +01:00
Ghostkeeper
d499c6fdfe
Keep this position a string
We've set up enough defensive coding that this kept working, but the typing checker fails on it.
2020-05-15 18:50:20 +02:00
Ghostkeeper
acc8e24cb4
Use extruderList rather than extruders dictionary
The extruders dictionary has been deprecated.

Done during Turbo Testing and Tooling to reduce the amount of warnings in our log.
2020-05-15 16:07:19 +02:00
Ghostkeeper
17762cb431
Use extruderList rather than extruders to switch userChanges over
It's a bit weird that it switches the user changes over though. Won't it be a different printer type then?
2020-05-15 16:04:42 +02:00
Ghostkeeper
33c1901070
Replace another extruders() call with extruderList
The extruders function is deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:51:49 +02:00
Ghostkeeper
174a8e5411
Use extruderList rather than deprecated extruders
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:50:03 +02:00
Ghostkeeper
a6d7b97abc
Use extruderList rather than deprecated extruders
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:39:28 +02:00
Ghostkeeper
fe0bae4c25
MORE usage of extruderList, LESS of extruders
Extruders has been deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:23:29 +02:00
Ghostkeeper
afde5353eb
Use extruderList rather than extruders
Extruders is deprecated. Always use the extruderList.
In fact, the else case beneath was already using extruderList in the same way.
Hopefully we can one day get rid of all the string conversion for the position in this class. I don't dare to refactor that without having a review though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:20:46 +02:00
Ghostkeeper
6d3acf946a
Use new extruderList rather than extruders
The extruders dictionary has been deprecated in favour of extruderList.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:16:43 +02:00
Ghostkeeper
4482b4f352
Use extruderList rather than deprecated extruders
This fixes a possible bug, too, if the extruders dictionary weren't iterated over in the order of the extruders. It would sometimes assign the profiles to the wrong extruders then. However I think the dictionary iteration in Python is in order of insertion and we probably insert them in the proper order by accident.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:14:56 +02:00
Ghostkeeper
e0e0371de4
Use extruderList rather than extruders
Removes another warning from the log. And it makes the code simpler in this case.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log file.
2020-05-15 15:10:30 +02:00
Ghostkeeper
bbf53c441f
Don't use extruders() but extruderList
The extruders() slot has been deprecated. We need to replace it with extruderList. I'm changing them one by one and testing each time whether everything still seems to function correctly, but it's fairly safe anyway.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:06:58 +02:00
Ghostkeeper
833a7a3804
Don't use deprecated extruders()
It has been replaced by extruderList.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:04:47 +02:00
Ghostkeeper
0482371fc6
Don't use deprecated extruders() slot
It's been replaced by extruderList.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:02:07 +02:00
Ghostkeeper
b231a4b3a2
Remove unnecessary re-adding of extruders
This was originally added for backwards compatibility with old versions of Uranium. However the link between Cura versions and Uranium versions is already very strong (Cura crashes with old Uranium versions) so this is not necessary.
It was also adding warnings in our log that these extruders had already been added to the printer.

Done during Turbo Testing and Tooling, to clean up our log files.
2020-05-15 14:26:44 +02:00
Nino van Hooff
8e347c1034 Merge remote-tracking branch 'origin/doxygen_to_restructuredtext_comments' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/OAuth2/AuthorizationService.py
2020-05-15 13:40:22 +02:00
Nino van Hooff
c6e6c76962 Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/Account.py
#	plugins/SimulationView/SimulationView.py
2020-05-15 13:38:37 +02:00
Nino van Hooff
94f094380b Log sync state transitions
CURA-7290
2020-05-15 11:59:22 +02:00
Nino van Hooff
a9692e3d27 Refactor setManualSyncEnabled
CURA-7290
2020-05-14 15:15:16 +02:00
Nino van Hooff
59b40c72f0 Additional scenarios for enabling/disabling the manual sync button
CURA-7290
2020-05-13 17:32:57 +02:00
Nino van Hooff
f78fa884c1 Only show the manual sync button after the account popup was closed
CURA-7290
2020-05-13 17:19:20 +02:00
Nino van Hooff
de0ef8ae62 Change account sync date format to mm/dd/YYYY
CURA-7290
2020-05-13 16:15:29 +02:00
Jaime van Kessel
580bd13a76
Prevent crash if icon was not found
Fixes CURA-A2
2020-05-13 11:16:26 +02:00
Jaime van Kessel
384f92a516
Prevent crashes when loading objects before initialization is done
Fixes CURA-7J
2020-05-13 11:12:11 +02:00
Nino van Hooff
f34e05ac03
Merge pull request #7743 from Ultimaker/CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers
Cura 7427 add option to sign in with different account while waiting for printers
2020-05-12 17:39:07 +02:00
Kostas Karmas
eac4d3e463 Make login parametrized with a force_logout boolean
Instead of using a separate function to force logging out before
login, login now has a boolean parameter that instructs it to logout
before loging in again, if the user is alread logged in. It then
starts the authorization with a force browser logout first.

CURA-7427
2020-05-12 16:54:41 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
2020-05-12 14:59:01 +02:00
Nino van Hooff
3ca703f00c Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync 2020-05-12 14:19:51 +02:00
Nino van Hooff
903c251f34 Additional account sync documentation
CURA-7290
2020-05-12 14:19:36 +02:00
Kostas Karmas
898ca852f0 Fix mypy complaint about Optional type
CURA-7427
2020-05-12 13:40:27 +02:00
Jaime van Kessel
6af502088e
Fix typing issue
CURA-7290
2020-05-12 13:25:36 +02:00
Kostas Karmas
32efb8d7bb Fix description comment of _generate_auth_url()
CURA-7427
2020-05-12 13:17:18 +02:00
Kostas Karmas
d3fb002d9b Transfer the generation of the auth link into its own function
The authentication link should be prepended with a logoff link from
mycloud, if it is requested. In order to make this process testable
this commit separates the generation of the authentication link,
based on whether it requests for a browser logoff first, into its
own function.

This commit also adds tests for this function.

CURA-7427
2020-05-12 13:07:39 +02:00
Kostas Karmas
96387ef2aa Add tests for loginWithForcedLogout() in account
CURA-7427
2020-05-12 13:06:47 +02:00
Nino van Hooff
3e1b695c43 Add some missing account sync timer logic
CURA-7290
2020-05-12 11:55:50 +02:00
Nino van Hooff
8e75da552d Do not inherit SyncState from QObject
not necessary and fixes mypy warning

CURA-7290
2020-05-12 11:23:14 +02:00
Kostas Karmas
b717755f20 Add "Sign in with another account" button in AddCloudPrintersView
There are cases where Cura and the browser fall out of sync when it
comes to accounts. In such cases, you may be logged in cura with an
account that has no cloud printers and in the browser with an account
that has printers. So when you press the "Add cloud printer" button,
you are redirected to mycloud and you see cloud printers that are not
detected by Cura (because Cura is in a different acconut). In such
cases, the user can now press the "Sign in with a different account"
link in the "Waiting for cloud response" page, which will log him/her
out in Cura AND in the browser, and then reinitiate the whole
authorization flow, to make sure the accounts are in sync.

CURA-7427
2020-05-11 17:47:09 +02:00
jelle Spijker
b032101e55
Updated comments in cura/OAuth2
Used DOX_2_RST.py to convert doxygen style comments to sphinx style comments
2020-05-11 13:16:29 +02:00
Jelle Spijker
120541a8db
Updated comments in Models
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Model directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.

 Note: dox_2rst.py struggles with decorated functions.
2020-05-08 18:59:38 +02:00
Jelle Spijker
d69bf84424
Updated comments in Backup
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Backup directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.
2020-05-08 15:39:16 +02:00
Nino van Hooff
176919eee0 Merge branch 'master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	plugins/CuraEngineBackend/CuraEngineBackend.py
#	plugins/CuraEngineBackend/StartSliceJob.py
2020-05-08 15:31:23 +02:00