GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,379 Commits 289 Branches 260 Tags
Commit Graph

635 Commits

Author SHA1 Message Date
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow) 
CURA-7129
 2020-01-21 17:07:21 +01:00
Dimitriovski
369329c476
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-21 15:08:24 +01:00
Dimitriovski
5c498de1e4
Use meaningful variable name && some TODOs for later. 
CURA-7090
 2020-01-21 15:07:11 +01:00
Dimitriovski
e7ed93c132
fixed typing 
CURA-7090
 2020-01-21 14:51:53 +01:00
Nino van Hooff
1287ebdc51 Change backgroundColor and margin for licenseDialog 
CURA-7129
 2020-01-21 14:43:02 +01:00
Dimitriovski
8abaa60052
Passed the sdk_version to the reevalute() function 
CURA-7090
 2020-01-21 11:24:31 +01:00
Dimitriovski
365c30fadb
Added check to reevaluate dismissed incompatible packages (in case the package gets updated and has the correct SDK version) 
CURA-7090-addition
 2020-01-21 09:52:33 +01:00
Nino van Hooff
b03be75a13 Show error messages for cloud flow errors 
- failed downloads
- failed installs

CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
9dd50c8804 Replace buttons by PrimaryButtons for cloud sync dialogs 
CURA-6984
 2020-01-17 13:54:39 +01:00
Nino van Hooff
4e8534b93b Unsubscribe from package when a license is declined (cloud flow) 
CURA-6984
 2020-01-17 13:54:39 +01:00
Dimitriovski
ddd2afa08a
Added dummy image downloaded from internet for presentation only. 
CURA-7071
 2020-01-16 16:30:58 +01:00
Dimitriovski
51ec8a539f
Added a 'Marketplace' icon in the header of the Toolbox 
CURA-7071
 2020-01-16 16:30:11 +01:00
ninovanhooff
8bf7666493
Merge pull request #6986 from Ultimaker/CURA-7027_Add_more_materials_from_Marketplace_button 
Cura 7027 add more materials from marketplace button
 2020-01-16 16:26:38 +01:00
Nino van Hooff
59331666db Add missing cloud package manager 
CURA-6983
 2020-01-16 15:45:42 +01:00
Kostas Karmas
50fbe02c58 Add comment 
CURA-7027
 2020-01-16 15:19:51 +01:00
Kostas Karmas
18e5d76990 Fix button to open in-Cura Marketplace materials 
The button was opening the online Marketplace, which was wrong.
This fix changes the behavior to open the in-Cura Marketplace at
the materials tab.

In order to achieve that, the button calls an action called
materialsMarketplace, which in turn is connected through a
Connection in the ApplicationMenu. When the action is triggered,
it first launched the Toolbox and then it sets its category to
the materials tab.

Since the callExtensionMethod does not allow us to provide input
arguments to the called method, a new method had to be created in
the toolbox that changes the view to the materials tab, instead
of immediately calling the setViewCategory("material").

CURA-7027
 2020-01-16 15:11:34 +01:00
Nino van Hooff
8dffed9195 Fix 2 mypy errors 
CURA-6983
 2020-01-16 14:58:09 +01:00
Nino van Hooff
46133fe2f3 Do not start Sync flow when there are no compatible packages to sync 
(and remove unused import)

CURA-6983
 2020-01-16 14:44:37 +01:00
Nino van Hooff
6763bed95f Fix Toolbox import error (continued) 
(and remove unused import)

CURA-6983
 2020-01-16 14:39:10 +01:00
Nino van Hooff
4ba8b4ae91 Fix Toolbox import error 
(and remove unused import)

CURA-6983
 2020-01-16 14:13:16 +01:00
Jaime van Kessel
fa3a985404
Rename 2 functions that didn't adhere to codestyle 
CURA-6983
 2020-01-15 16:57:40 +01:00
Jaime van Kessel
0f7f39745d
Add missing typing 
CURA-6983
 2020-01-15 16:57:10 +01:00
Jaime van Kessel
f12501aec4
Move the message to body instead of title 
CURA-6983
 2020-01-15 16:46:04 +01:00
Nino van Hooff
248a4cbb94 Fix merge issues 
CURA-6983
 2020-01-15 16:14:17 +01:00
Nino van Hooff
182bab6467 Merge remote-tracking branch 'origin/master' into CURA-6983_sync_packages 
# Conflicts:
#	plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py
#	plugins/Toolbox/src/Toolbox.py
 2020-01-15 15:40:03 +01:00
Nino van Hooff
15dc866cbe Provess some code review comments 
CURA-6983
 2020-01-15 15:26:31 +01:00
Nino van Hooff
b1ecfb627d Only emit compatible packages from DiscrepanciesPresenter 
CURA-6983
 2020-01-15 12:00:01 +01:00
Nino van Hooff
1a1e8a9525 Fix rebase bug regarding package compatibility 
CURA-6983
 2020-01-15 11:54:34 +01:00
Nino van Hooff
88e5626b59 Fix more Mypy warnings 
CURA-6983
 2020-01-14 17:57:12 +01:00
Dimitriovski
15a3922436
Removed unnecessary checks 
CURA-7090
 2020-01-14 14:07:55 +01:00
Dimitriovski
e8f22beb27
Removed unnecessary function and a call to it. Added some typing. 
CURA-7090
 2020-01-14 11:50:47 +01:00
Dimitriovski
7359492e11
Added a Tooltip over the Dismiss button. Changed the cursor on hover. 2020-01-13 11:44:23 +01:00
Dimitriovski
071cf5517e
linting 
CURA-7090
 2020-01-13 10:37:40 +01:00
Nino van Hooff
53115dc3b2 Fix Mypy warnings 
CURA-6983
 2020-01-13 09:57:35 +01:00
Nino van Hooff
6aba835c1c Only show restart dialog when packages were installed 
CURA-6983
 2020-01-13 09:57:14 +01:00
Dimitriovski
fbe38dc658
added typing, refactored some functions 
CURA-7090
 2020-01-13 09:55:18 +01:00
Dimitriovski
071326b890
Added logic for dismissing packages from the Incompatible list 
CURA-7090
 2020-01-11 01:11:49 +01:00
Dimitriovski
c86cc3ae5a
Added 'dismiss' link and logic for removing the item from the dialog 
CURA-7090
 2020-01-10 16:48:45 +01:00
Nino van Hooff
2da8040e5a Show a restart dialog at the end of the cloud sync flow 
CURA-6983
 2020-01-10 15:49:18 +01:00
Nino van Hooff
f15e21805c Remove unused member 
CURA-6983
 2020-01-10 14:29:21 +01:00
Nino van Hooff
35695e5ab6 Install and cloud-subscribe a package when after agreeing to the license 
CURA-6983
 2020-01-10 14:20:58 +01:00
Nino van Hooff
1cf3cd8228 Fix Subscribing to a package 
CURA-6983
 2020-01-10 13:17:48 +01:00
Nino van Hooff
88d210d12d Fix The toolbox license dialog 
CURA-6983
 2020-01-10 11:47:36 +01:00
Nino van Hooff
317061029c Use more high-level temporary file api 
CURA-6983
 2020-01-10 11:45:59 +01:00
Nino van Hooff
f79949a150 Use scope instead of manual request header updates in Toolbox.py 
CURA-6983
 2020-01-10 11:45:58 +01:00
Nino van Hooff
6069096141 CloudSync: documentation and cleanup 
CURA-6983
 2020-01-10 11:43:43 +01:00
Nino van Hooff
89994b92b5 Finished LicensePresenter 
CURA-6983
 2020-01-10 11:43:42 +01:00
Nino van Hooff
dda3d0b4eb Fix downloadPresenter and initial LicensePresenter.py code 
CURA-6983
 2020-01-10 11:43:42 +01:00
Nino van Hooff
84e676c1f8 Download packages to be installed and show a message with progress. 
CURA-6983
 2020-01-10 11:42:48 +01:00
Nino van Hooff
883243b533 Move UltimaterCloudScope to Cura project 
CURA-6983
 2020-01-10 11:42:48 +01:00