6648 Commits

Author SHA1 Message Date
Ghostkeeper
88954922d4
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.
2021-06-30 16:46:19 +02:00
Remco Burema
45977e109b
Merge branch '4.10' 2021-06-30 15:49:19 +02:00
Remco Burema
4f63e5eaf5
Fix capitalization for extensions in whats-new. 2021-06-29 11:40:20 +02:00
Konstantinos Karmas
fae5e2cffd Adjust the text of the material according to the size of the window
Now, when the size of the Cura window changes and the configurationSelector gets resized, instead of eliding the material text it will now change as follows:

* If it fits, display "Brand, Color, and Type" of material (e.g. Ultimaker Black PLA)
* If "Brand, Color, and Type" doesn't fit, change it to "Color and Type" of material (e.g. Black PLA)
* If "Color Type" doesn't fit either, display only the type (e.g. PLA)
* If "Type" doesn't fit, elide it

CURA-8013
2021-06-28 14:53:50 +02:00
Ghostkeeper
e296b0897b
Merge branch '4.10' 2021-06-25 14:16:23 +02:00
Konstantinos Karmas
4435a10f9d Revert "Show warning when restoring backup failed"
We decided to add the warning message in a separate ticket for 4.11.

This reverts commit 584a387debec75023094db6cba84a8bf1781d6ea.
2021-06-25 09:22:12 +02:00
jelle Spijker
584a387deb Show warning when restoring backup failed
We now allow the backup to fail gracefully when partial files
fail to be restored. But the user is not actively informed by
these failures. Leaving him/her unaware of the state of his
configuration folder.

This commit show's a message windows, listing the failed files.
Due to a string freeze at the moment we reuse the following i18n
message:

> The following error occurred while trying to restore a Cura backup:
followed by a list of files that fails to be restored.

Which is not ideal, but a sufficient warning in my opinion. At least
better then being completely uninformed.

Contributes to CURA-8313
2021-06-25 08:24:06 +02:00
Konstantinos Karmas
4fe199ccc7 Ignore files-in-use while restoring a backup
Sometimes, while a backup is being restore, one of the files in the current config folder may be still in use. This means that once the backup tries to replace this file with the one in the backup, the entire backup restoration fails and half the configuration folder has been messed up.

To prevent that, we decided to ignore files that are currently in use while restoring a backup. This _may_ lead to a slightly wrong configuration (e.g. a plugin may not be restored properly), but it is an acceptable result, as the rest of the configuration folder is restored properly.

CURA-8313
2021-06-24 17:26:57 +02:00
Ghostkeeper
84b5b19584
Merge branch '4.10' 2021-06-24 14:19:40 +02:00
Ghostkeeper
4d29de4579
Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.
Revert "Change file extension to .umm"

This reverts commit 56db7f7144083df4bca77746d7ee30f2a54fda36.

Revert "Re-enable compression"

This reverts commit 62bc9be22bbc5595dbfce69893163c3a0ebc4415.

Revert "Add documentation"

This reverts commit e9031f1aff5d40f3c69ac625edf11963a3253eb8.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a667f9aa9618005d2a5875383a3658f4f.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068c3ac2cab7f95fb88c5d4d101e28e17.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f556f455f352786123476ec40e3ae4c.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664bf73dd9b1e3c6af6f01321763470d2e.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10a994a1b38bcb426a27ba379febeac7.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b879a8913b25f2a049413ec0721f1c5.
2021-06-24 14:15:54 +02:00
Evangelos Trantos
aabbdd2040
Merge pull request #10023 from Ultimaker/CURA-8332_Cura_crashes_when_access_to_keyring_is_denied
CURA-8332: Cura crashes when access to keyring is denied
2021-06-23 15:13:23 +02:00
Jaime van Kessel
7e7a09ffa7
Merge branch '4.10' of github.com:Ultimaker/Cura 2021-06-23 14:26:19 +02:00
Konstantinos Karmas
ceca0c417a Catch the KeyringLocked also when setting the token in the keyring
CURA-8332
2021-06-23 11:22:12 +02:00
Konstantinos Karmas
8ade68dbef Catch the KeyringLocked error instead of the MacOS specific
Turns out that when the KeychainDenied error is raised, it is being caught by the macOS keyring api and the non-macOS-specific KeyringLocked error is raised instead, so we need to catch this one.

CURA-8332
2021-06-23 11:20:35 +02:00
Konstantinos Karmas
bcd44b8b6f Process events while extracting the downloaded backup
To prevent the UI from being frozen. This way, the user knows that something is happening in the background and Cura didn't just stop working.

CURA-8313
2021-06-22 17:01:36 +02:00
Konstantinos Karmas
7c72e84215 Read preferences from new restored configs
Before calling the illuminate, we need to make sure that the previous cached Preferences have been overridden by the newly restored preferences from the backup. Otherwise, the `illuminate()` function will bring back the cached preferences and the new ones from the backup will be lost.

CURA-8313
2021-06-22 15:16:13 +02:00
Ghostkeeper
3331b7c267
Merge branch 'CURA-8332_Dont_crash_if_keyring_access_is_denied_on_mac' into 4.10 2021-06-21 17:36:06 +02:00
Konstantinos Karmas
f62a403f28 Really fix the mypy issue
Hopefully

CURA-8332
2021-06-21 17:20:36 +02:00
Konstantinos Karmas
4a8b5ae61e Fix mypy issue
CURA-8332
2021-06-21 17:07:36 +02:00
Konstantinos Karmas
9fd0ac333e Don't check against generic exception
Define the KeychainDenied exception locally in non-Mac operating systems.

CURA-8332
2021-06-21 16:47:47 +02:00
Konstantinos Karmas
502bdda8ea Fix reference before assignment
Fixes sentry issue CURA-2M1.
2021-06-21 16:34:01 +02:00
Konstantinos Karmas
7785142831 Log info instead of exception when keyring is denied on Mac
CURA-8332
2021-06-21 16:14:48 +02:00
Konstantinos Karmas
c3782c9468 Check for KeychainDenied Exception only on OSX
CURA-8332
2021-06-21 15:40:18 +02:00
Konstantinos Karmas
951c656096 Import they KeychainDenied exception only on Mac
CURA-8332
2021-06-21 10:55:22 +02:00
Konstantinos Karmas
c1618565ea Don't crash if keyring access is denied on MacOS
CURA-8332
2021-06-21 10:47:53 +02:00
Remco Burema
e7a423ea6f
Merge branch '4.10' 2021-06-17 18:54:07 +02:00
Remco Burema
1bd6b3f091
Merge pull request #9991 from Ultimaker/CURA-8313
Re-enable backing up of plugins
2021-06-17 18:28:37 +02:00
Jaime van Kessel
ee16f61d65
Add missing typing
CURA-8313
2021-06-17 16:21:01 +02:00
Jaime van Kessel
40a981b902
Re-enable the backing up of plugins
Because we're adding a messgae for the user if the loading of a plugin failed
(which can happen after backing up a plugin in central storage), we can re-enable
the backing up of plugins again.

CURA-8313
2021-06-17 15:36:45 +02:00
Ghostkeeper
cf7e1af99d
Don't create disallowed areas for areas without any points
It seems people edit definitions to remove all vertices. This causes Cura to crash because of the calculation of disallowed areas.

Fixes Sentry issue CURA-2FY.
2021-06-17 14:56:49 +02:00
Ghostkeeper
fcd585963f
Check if there is a global stack when discard/keep dialog closes
When we close Cura, we now remove the global stack first. If the discard/keep dialog closes as a result of closing Cura, this would crash since there is no global stack any more to discard changes from or keep changes in, and we can't access the extruder stacks either.
So if there's no global stack, just skip this. It'll be as if you selected 'keep'.

Fixes Sentry issue CURA-2ET.
2021-06-17 13:44:02 +02:00
Ghostkeeper
611208368c
Merge branch 'master' into libArachne_rebased
Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes
2021-06-16 18:04:54 +02:00
Jaime van Kessel
fa690a0f5e
Fix issue with restoring backups from 4.10
There were some cases where issues could occur due to plugins no longer being there

CURA-8313
2021-06-16 13:51:09 +02:00
Remco Burema
04002056ae
Update SDK/API from 7.5.0 to 7.6.0 for 4.10
CURA-8320
2021-06-15 16:08:07 +02:00
Jaime van Kessel
88f6bb743c
Merge branch '4.10' of github.com:Ultimaker/Cura into 4.10 2021-06-15 11:12:41 +02:00
Jaime van Kessel
467ae6a1d3
Fix quality_changes profile not showing
CURA-7392
2021-06-15 11:12:18 +02:00
Ghostkeeper
ac859fd4c2
Merge branch 'CURA-7859_fix_center_selected_model' into 4.10 2021-06-14 15:47:08 +02:00
Ghostkeeper
cf604570bb
Fix code style
Contributes to issue CURA-7859.
2021-06-14 15:41:30 +02:00
Jaime van Kessel
392c4cfec1
Fix extruder profiles not being shown in profile preferences
CURA-7392

Fixes #7530
2021-06-10 16:55:22 +02:00
Jaime van Kessel
8caae610ba
Set object bottom to be on buildplate with center model action
CURA-7859
2021-06-10 16:18:42 +02:00
Ghostkeeper
62bc9be22b
Re-enable compression
I had disabled that in an attempt to fix the bytes-to-str conversion issue, but it turned out to not be the cause. Compression is fine.

Contributes to issue CURA-8055.
2021-06-09 17:14:46 +02:00
Ghostkeeper
e9031f1aff
Add documentation
Contributes to issue CURA-8055.
2021-06-09 17:10:31 +02:00
Ghostkeeper
66b2825a66
Fix writing bytes to string-stream
Don't open the file first. We can let the zipfile module handle that.

Contributes to issue CURA-8055.
2021-06-09 17:08:57 +02:00
Ghostkeeper
bdcaef134f
Basic implementation of exporting all materials in a .zip archive
It seems to complain about the data types though.

Contributes to issue CURA-8055.
2021-06-09 16:35:51 +02:00
Ghostkeeper
e66783664b
Implement default path for exporting all materials
It needs to be a removable drive if one is available, or else just the local file paths.

Contributes to issue CURA-8055.
2021-06-08 17:36:25 +02:00
Ghostkeeper
f436cb8e7b
Add notion of whether printers support the material export archive
Contributes to issue CURA-8055.
2021-06-08 16:50:03 +02:00
Remco Burema
c73e25195d
Merge pull request #9948 from Ultimaker/CURA-8291_Verbose_plugin_loading_on_startup
CURA-8291: Set enterprise edition on initialization
2021-06-08 15:55:54 +02:00
Konstantinos Karmas
633002865c Set enterprise edition on initialization
CURA-8291
2021-06-08 15:12:33 +02:00
Remco Burema
58a5323709
Merge pull request #9884 from Ultimaker/CURA-7873_fix_positioning_merged_meshes
Fix positioning of merged transformed meshes
2021-06-08 12:37:34 +02:00
Ghostkeeper
e60e44b919
Interpret timeouts as general connection errors
It's a similar problem for us.
We should really have used the HttpRequestManager for these things.

Fixes Sentry issue CURA-295.
2021-06-07 15:03:46 +02:00