Commit graph

7031 commits

Author SHA1 Message Date
Ghostkeeper
ccc295e2bc
Use sets for folder names from the start
We use a set here because we want to remove the current version from it later on. However if we change the variable to contain a set instead of a list, MyPy will start complaining that we change the type.

Contributes to issue CURA-7024.
2020-02-04 14:20:08 +01:00
Ghostkeeper
f38dc82ac8
Remove hidden stacks and their dependencies
This searches for stacks that are hidden and removes them, and also removes any extruder stacks that depended on those hidden global stacks and any user and quality changes profiles referred to by those removed stacks.

Contributes to issue CURA-7024.
2020-02-04 14:12:57 +01:00
Ghostkeeper
bb73831889
Cura directory may be empty
Contributes to issue CURA-7024.
2020-02-04 14:11:41 +01:00
Ghostkeeper
94e97aff37
Add a function that only gets called when upgrading from version 4.4
Contributes to issue CURA-7024.
2020-02-04 13:02:07 +01:00
Ghostkeeper
fa44da3155
Slightly improve wording
'Layer data' is a bit technical.
2020-02-04 11:46:29 +01:00
Matt Jani
35aadad747 Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-02-03 16:55:57 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Matt Jani
81429f8985 Cleaned up timelapse post processing script (issue #6730) 2020-02-03 15:19:11 +01:00
Jaime van Kessel
1fc0705c31
Remove a bit of over verbose logging
It would put the content of the entire licence file into the log,
which seems a bit much to me.
2020-02-03 13:20:08 +01:00
Jaime van Kessel
42f7cead4d
Merge branch 'CURA-7155_confusing_license_dialog_page_count' of github.com:Ultimaker/Cura 2020-02-03 13:16:23 +01:00
Ghostkeeper
2c28f70016
Add warning if you haven't sliced before going to layer view
Done as a 5 minute fix.

Fixes #7044.
2020-02-03 11:22:22 +01:00
Nino van Hooff
a02b753d53 Count the number of packages which have a license to display
CURA-7155
2020-01-30 16:42:42 +01:00
Ghostkeeper
d437d480dc
Code style: Spaces around binary operators
Contributes to issue CURA-7099.
2020-01-30 16:10:36 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura 2020-01-30 15:32:21 +01:00
Remco Burema
99680db819
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-30 15:07:06 +01:00
Remco Burema
c6b6af14cf
Fix typo. 2020-01-30 15:06:47 +01:00
Nino van Hooff
eec7d2f0cd Use default timeout for sync dialog 2020-01-30 14:56:19 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
CURA-7152
2020-01-30 12:51:13 +01:00
Nino van Hooff
8c250cfbbc Process review comments
CURA-7099
2020-01-29 11:28:29 +01:00
Matt Jani
155408d77d Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b Fixed wrong extrusion (issue #6730) 2020-01-28 15:26:43 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
2020-01-28 13:08:57 +01:00
Nino van Hooff
5cedb2933e Only subscribe when logged in. (When installing a package from toolbox) 2020-01-28 09:31:36 +01:00
ninovanhooff
3a0bd48e1b
Merge pull request #7011 from Ultimaker/CURA-7090-addition
CURA-7090/Added check to reevaluate dismissed incompatible packages
2020-01-27 14:33:13 +01:00
Kostas Karmas
a720939e64 Fix max layer to correspond to starting layer
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master
Update DisplayFilenameAndLayerOnLCD.py
2020-01-27 14:08:26 +01:00
Dimitriovski
a08bea1376
String translate improvements
CURA-7090
2020-01-27 14:00:47 +01:00
Dimitriovski
2e0fef3bd4
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-27 13:25:35 +01:00
Dimitriovski
aa2c612925
PR review changes 2020-01-27 13:25:29 +01:00
Jaime van Kessel
61a3122a78
Merge branch 'CURA-7129_license_window_design' of github.com:Ultimaker/Cura 2020-01-24 16:56:23 +01:00
Dimitriovski
537891d80b
Further improvements and refactors to the CloudPackageChecker 2020-01-24 16:05:35 +01:00
Dimitriovski
526cdac200
fixed silly merge conflict 2020-01-24 15:41:13 +01:00
Dimitriovski
38c7d80f82
Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list 2020-01-24 15:39:58 +01:00
Remco Burema
40ec88ab70
Merge pull request #7005 from Ultimaker/CURA-6627_Store_extra_data_project_files
CURA-6627_Store_extra_data_project_files
2020-01-24 15:21:04 +01:00
Dimitriovski
d829405347
Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py 2020-01-24 14:54:12 +01:00
Ghostkeeper
d31240ad70
Merge branch 'CURA-6627_Store_extra_data_project_files' 2020-01-24 14:53:33 +01:00
Dimitriovski
05e17843c6
Removed previous variants of the dismiss incompatible package functionality
CURA-7090
2020-01-24 13:56:59 +01:00
Dimitriovski
7ee8270b2e
Added the mechanism to dismiss all Incompatible packages when the Compatibility Dialog is closed
CURA-7090
2020-01-24 13:51:49 +01:00
Dimitriovski
ae494110ba
Removed unnecessary line (because we still want to show the Compatability Dialog even if there are only Incompatible packages)
CURA-7090
2020-01-24 11:28:36 +01:00
Dimitriovski
eb3bd811c1
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition 2020-01-24 11:27:05 +01:00
Nino van Hooff
a02e8d3b58 Use display_name for the package name in the license dialog
Implemented for both CloudSync and Toolbox
2020-01-24 10:36:36 +01:00
Jaime van Kessel
57648e2bb0
Merge branch 'CURA-6627_Store_extra_data_project_files' of github.com:Ultimaker/Cura into CURA-6627_Store_extra_data_project_files 2020-01-23 09:29:18 +01:00
Jaime van Kessel
87fb0d7df3
Fix incorrect read location for plugin metadata
CURA-6627
2020-01-23 09:28:28 +01:00
Nino van Hooff
b25d6360ab More documentation for UltimakerCloudScope 2020-01-22 11:53:48 +01:00
Nino van Hooff
1324969dc2 Add some documentation for HttpRequestScope 2020-01-22 11:50:22 +01:00
Nino van Hooff
95def2850d Make license decline button text context-dependant
CURA-7129
2020-01-22 11:17:29 +01:00
Nino van Hooff
3b534ea986 Add icon to licenseDialog (Toolbox flow)
CURA-7129
2020-01-22 10:54:05 +01:00
Nino van Hooff
2f3cf3c493 LicenseDialog layout tweaking
CURA-7129
2020-01-22 10:53:43 +01:00
Nino van Hooff
b3812a3630 Add icon to licenseDialog (clowd flow)
CURA-7129
2020-01-21 17:07:21 +01:00
Ghostkeeper
a3825c1f14
Merge branch 'master' into CURA-6627_Store_extra_data_project_files 2020-01-21 15:14:45 +01:00