GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 19:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,983 Commits 295 Branches 268 Tags
Commit Graph

6290 Commits

Author SHA1 Message Date
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
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML 
Provides a single source of truth

CURA-7290
 2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15 
Once more into the fray.

Contributes to issue CURA-7420.
 2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
fieldOfView
cdc5c8948c Simplify single instance preference 
The Preferences have already been initialized in QTApplication.initialize to get the language to use in the splashscreen.
 2020-05-07 18:13:23 +02:00
fieldOfView
1b34449242 Add a preference to use a single instance for loading files 
Contributes to #7664
 2020-05-07 17:29:18 +02:00
Ghostkeeper
88bf80c424
Don't provide setVariant with None as variant 
That is not allowed as per the type. This could happen if the preferred variant of a printer also doesn't exist.

Fixes Sentry issue CURA-NP.
 2020-05-07 08:53:52 +02:00
Nino van Hooff
8937c63219 Finish merge of auto sync packages 
CURA-7290
 2020-05-06 16:08:47 +02:00
Nino van Hooff
9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
 2020-05-06 16:03:37 +02:00
Nino van Hooff
ef6cf8d5cc Remove unused pyqtProperty 
CURA-7290
 2020-05-06 12:08:55 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer 
Cura 7022 add cloud printer within add a connected printer
 2020-05-06 11:13:27 +02:00
Nino van Hooff
7322526791 Fix typing warning 
CURA-7290
 2020-05-04 17:30:32 +02:00
Nino van Hooff
eac884fcd2 Convert SYNC_STATES to Enum 
CURA-7290
 2020-05-04 17:26:38 +02:00
Nino van Hooff
88ff68e40c Also check for package updates automatically 
Moves the 30-second sync timer from CloudOutputDeviceManager to
Account and subscribes CloudPackageChecker to the timer.

CURA-7290
 2020-05-04 16:56:09 +02:00
Nino van Hooff
637a241d99 Use single qml file for sync states 
CURA-7290
 2020-05-04 15:13:38 +02:00
Nino van Hooff
049c1946d4 Create Account sync state interface to allow for multiple sync services 
Needed to add the package sync

CURA-7290
 2020-05-04 13:52:40 +02:00
Nino van Hooff
81d02d5d58 Implement printer cloud sync error state 
CURA-7290
 2020-05-04 13:19:16 +02:00
Kostas Karmas
aab2257574 Up the setting version to 14 in CuraApplication 
CURA-7421
 2020-05-04 13:06:19 +02:00
Nino van Hooff
4e7f446fe1 Account sync: create additional sync states 
CURA-7290
 2020-05-04 11:26:20 +02:00
Nino van Hooff
4b88247af8 Account sync: remove debug info 
CURA-7290
 2020-05-01 17:49:40 +02:00
Ghostkeeper
51378cae56
Don't crash if the shader fails to compile 2020-05-01 17:49:29 +02:00
Nino van Hooff
acf36d1e42 Add Account sync last update datetime 
CURA-7290
 2020-05-01 17:44:58 +02:00
Nino van Hooff
0aed6d3731 Connect the manual sync button 
CURA-7290
 2020-05-01 15:56:09 +02:00
Nino van Hooff
828e931f52 Add manual sync button (non-functional) 
CURA-7290
 2020-04-30 17:19:14 +02:00
Kostas Karmas
6959c9ac42 Rename _discovered_ultimaker_cloud_printers_list to _discovered_cloud_printers_list 
CURA-7022
 2020-04-29 15:01:50 +02:00
Kostas Karmas
b459895589 Add comments 
CURA-7022
 2020-04-29 14:19:28 +02:00
Kostas Karmas
2fb7e67043 Cleanup _update() 
CURA-7022
 2020-04-29 13:55:03 +02:00
Kostas Karmas
58b61f2331 Remove unnecessary newCloudPrintersDetected variable 
Variable newCloudPrintersDetected is no longer needed, as it is communicated through the
signal itself.

CURA-7022
 2020-04-29 13:47:11 +02:00