GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,784 Commits 288 Branches 260 Tags
Commit Graph

671 Commits

Author SHA1 Message Date
Jaime van Kessel
00bc1bfcdc
Add extra cast to author model 
Contributes to #8817
 2020-11-27 10:46:33 +01:00
Jaime van Kessel
10ed7c1288
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-22 13:41:44 +02:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0 
In preparation for release of the 4.8.

CURA-7795
 2020-10-22 11:29:25 +02:00
Ghostkeeper
5668eba6b2
Don't use anchors in a Layout context 
The anchors won't work then. They can never mix.
In this case it's easiest to continue with the Layout.

Contributes to issue CURA-7501.
 2020-10-16 15:41:14 +02:00
Ghostkeeper
8f9e0da400
Fix binding of extruder enable checkbox if there is no active stack 
There was a typo there.

Contributes to issue CURA-7501.
 2020-10-16 14:03:59 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back 
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
 2020-08-11 11:32:53 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back 
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
 2020-08-11 11:18:37 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7 
CURA-7641
 2020-08-07 11:12:27 +02:00
Kostas Karmas
3228766dd5 Fix "Fetching Packages" text in the Marketplace in dark mode 
CURA-7627
 2020-08-05 14:12:00 +02:00
Remco Burema
60dd4f411b
Readable text in dark mode. 
part of CURA-7627
 2020-08-05 08:03:12 +02:00
Kostas Karmas
8a7dd2cfdf Update Toolbox labels to be aligned with the Digital Factory 
CURA-7605
 2020-07-27 11:58:55 +02:00
Kostas Karmas
2c6cbc7be4 Fix qml warnings in ToolboxAuthorPage 2020-07-27 10:40:53 +02:00
Remco Burema
3898516607
More remove rating packages/materials. 
Forgot some lines in the previous commit.

CURA-7606
 2020-07-22 13:56:22 +02:00
Remco Burema
51a13675a5
Remove rating packages/materials. 
Online teams decided not to support ratings anymore, making this a rather useless feature in the upcoming release.

CURA-7606
 2020-07-22 12:51:20 +02:00
Jaime van Kessel
82ecc95c22
Merge branch 'master' of github.com:Ultimaker/Cura 2020-07-07 10:47:58 +02:00
Jaime van Kessel
29bd061184
Fix incorrect update of set 2020-07-07 10:47:39 +02:00
Ghostkeeper
3032221b70
Prevent division by 0 if total download size is 0 
This can happen if the downloads are all so small that it gets rounded to 0kB.

Fixes Sentry issue CURA-ZM.
 2020-07-06 17:23:58 +02:00
Nino van Hooff
979407eddf Additional typing fixes 
CURA-7473
 2020-06-29 11:10:50 +02:00
Nino van Hooff
c815b098d4 Fix a bug where a package sync dialog would incorrectly not be shown 
1. user subscribes to a package
2. dismisses the license/unsubscribes
3. subscribes to the same packafe again

in this scenario we want to notify the user again after step 3. This was
not the case because situations in step 1 and  3 are equal and thus the
user was considered notified.

CURA-7473
 2020-06-26 16:28:03 +02:00
Nino van Hooff
4f1a18f102 Add Install Pending Updates button to Account popup 
CURA-7473
 2020-06-26 11:37:01 +02:00
Ghostkeeper
f8a88642c2
Don't crash when failing to create Toolbox.qml dialogue 
Basically we should never be raising the master Exception class, really.
The enclosing class has error handling in case this returns None already, so this fix is easy.

Contributes to Sentry issue CURA-Y5.
 2020-06-18 14:53:18 +02:00
Nino van Hooff
1024879f9d Process Review feedback for CURA-7438 
Renames UltimakerCloudAuthentication to UltimakerCloudConstants

Cura-7438
 2020-06-09 13:41:30 +02:00
Jaime van Kessel
fd2a7689cc
Remove overly spammy logging 2020-06-04 14:32:37 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Nino van Hooff
d96359f208 Convert doxygen to rst for Toolbox, TrimeshReader 2020-05-15 13:53:10 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +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
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
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
3ac0e7bed9 Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-06 16:01:36 +02:00
Nino van Hooff
5b245434d0 Add _last_check_packages type hint 
CURA-7290
 2020-05-04 17:32:54 +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
eeea1692fd Register CloudPackageChecker as Account sync service 
CURA-7290
 2020-05-04 14:08:36 +02:00
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-04-22 15:18:48 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 
CURA-7383
 2020-04-21 11:46:12 +02:00
Jaime van Kessel
ab62ac6e01
Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:40 +02:00
Nino van Hooff
db758a7e19 Add None-checks to CloudPackageChecker 
Might help prevent the sync message to show multiple times

CURA-7364
 2020-04-15 17:16:38 +02:00
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Remco Burema
8d6cbdf673
Fix long materials title causes misalign. 
CURA-7240
 2020-04-01 17:57:33 +02:00
Remco Burema
07569c6b88
Fix extra line after plugin/materials list. 
CURA-7240
 2020-04-01 17:54:56 +02:00
Ghostkeeper
4edef85346
Code style: Space around binary operators 
Contributes to issue CURA-7240.
 2020-04-01 17:35:40 +02:00
Remco Burema
90ffa2a772
Explain empty installed materials/plugins brackets. 
part of CURA-7240
 2020-03-31 16:56:45 +02:00
Jaime van Kessel
c764326c25
Fix marketplace installed plugins/materials empty rectangle 
CURA-7240
 2020-03-31 15:57:08 +02:00
Remco Burema
d89fce6240
Order bundled/installed packages/materials section. 
And other finishing touches.
part of CURA-7240
 2020-03-31 12:02:46 +02:00
Remco Burema
85490dc58a
[Marketplace] De-emphasize pre-installed packages. 
Tried to do it the elegant way, couldn't get that to work within timebox.
part of CURA-7240
 2020-03-31 11:52:55 +02:00
Kostas Karmas
189c734145 Changed wrapMode to WordWrap, similar to master 
CURA-7332
 2020-03-31 11:41:03 +02:00