Commit graph

6967 commits

Author SHA1 Message Date
Jelle Spijker
e845462e5d
Merge pull request #10198 from Ultimaker/CURA-8418_update_messages_with_new_types
Update messages to use the message_types
2021-07-28 11:36:49 +02:00
jelle Spijker
b6665f1142
Applied review comments
Contributes to CURA-8418
2021-07-28 11:32:29 +02:00
Jelle Spijker
2263969d5f
Updated message with message types
Contributes to CURA-8418
2021-07-28 08:45:42 +02:00
Jaime van Kessel
7cce2f770d
Change warning logging to debug
Since it's triggered every boot of Cura, it makes no sense to leave it
a warning...
2021-07-27 16:13:50 +02:00
Jaime van Kessel
900db57f0f
Update messages to use the message_types
CURA-8418
2021-07-27 11:54:43 +02:00
Ghostkeeper
41b1d8eff5
Merge branch 'CURA-7278_Differentiate_warning_messages_in_Cura' 2021-07-26 15:18:14 +02:00
Ghostkeeper
ff7b2a673f
Add experimental warning and error message types to two messages
These are for our testers to be able to test the new message types. Later they will be added to all messages that need them.

Contributes to issue CURA-7278.
2021-07-26 15:17:54 +02:00
fieldOfView
9c05d990ea Merge branch 'master' into feature_extruder_warning_icon
# Conflicts:
#	resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
2021-07-26 14:12:30 +02:00
Remco Burema
458fbd35f1 Merge branch 'master' into graphics_buffer_update 2021-07-25 22:30:39 +02:00
Remco Burema
96ca3b1417 Handle render-range in shader.
Instead of re-uploading the mesh each time the range changes, handle the range in the shaders with the new draw-range parameters. This does however, mean the range has to be in vertices, not in elements. This necessitates some changes to the simulation-view, and some added bits deeper in the base code. Mainly, since each time the type of a line changes, there is an extra vertex, there needs to be a type-change count available to get from 'paths' to range indices.
2021-07-25 22:26:59 +02:00
Ghostkeeper
a4f6e94ae0
Update the sync-storage path every time you sync
Instead of updating the storage path every time you add or remove a removable drive, we now update the storage path every time you press the button to sync. That way this detail has no impact on performance of other parts of Cura if they don't use this button. It also makes the code a bit simpler.
The only downside is that this FileDialog then contains state, instead of automatically syncing with the MaterialManagement property for its folder property. I see that as a lesser of two evils.

Contributes to issue CURA-8055.
2021-07-23 15:16:38 +02:00
Ghostkeeper
82c7f19164
Merge branch 'master' into CURA-8055_export_all_materials_usb_redone 2021-07-23 15:11:07 +02:00
Jaime van Kessel
b7ee3298c2
Add extra logging to auth server 2021-07-23 10:40:30 +02:00
Remco Burema
6c08bbfc9d
Merge branch 'master' into libArachne_rebased 2021-07-16 08:49:46 +02:00
Ghostkeeper
bcd11636d5
Catch error when release notes file could not be read
And show an error message to the user in that case.
This could happen if the user modified their installation or their resource folder.

Fixes Sentry issue CURA-2P2.
2021-07-09 13:36:53 +02:00
Konstantinos Karmas
7f6e6403d2 Set the "Not overridden" extruder color as transparetn
Otherwise a white extruder is drawn in the dark theme next to the "Not overridden" label.

CURA-8011
2021-07-02 12:13:28 +02:00
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 584a387deb.
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
f82384d93c
Revert "Revert CURA-8055 in the 4.10 branch. This should not have been merged in there."
This reverts commit 4d29de4579.
Effectively this re-applies the changes for CURA-8055 / #9957.
2021-06-24 14:20:38 +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 56db7f7144.

Revert "Re-enable compression"

This reverts commit 62bc9be22b.

Revert "Add documentation"

This reverts commit e9031f1aff.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a66.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068.

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

This reverts commit bdcaef134f.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664b.

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

This reverts commit abba3bdd10.

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

This reverts commit f436cb8e7b.
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