26014 Commits

Author SHA1 Message Date
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +02:00
Remco Burema
778172a07a
Merge pull request #10046 from Ultimaker/CURA-8342_unrevert_icons
Unrevert new icon set
2021-06-29 10:58:09 +02:00
Konstantinos Karmas
5a3675df95 Calculate the width of the header items only once
CURA-8013
2021-06-29 10:54:46 +02:00
fvrmr
3318a7ff85 Update 0.png
Updated 0.png
2021-06-29 10:46:55 +02:00
fvrmr
3433e9912d Update change log and whats new pages
Added new bug fixes to change log
Updated whats new pages with support article and added 2 more pages with images.
2021-06-29 10:39:26 +02:00
Ghostkeeper
9046506f2a
Convert icons to UTF-8
As per our architecture design, all of these files should be UTF-8. Luckily it maps well.

Contributes to issue CURA-8342.
2021-06-28 18:28:50 +02:00
Ghostkeeper
1d0620908e
Remove useless and unused SVG elements
- Remove unused imports of xlink.
- Remove comments about which application originally wrote the text file. It's untrue because PyCharm edited it, etc.
- Remove unused IDs.
- Remove unused colours for icons rendered with RecolorImage.
- Remove useless x and y positions on 0, which is the default.
- Remove useless style setting the background to transparent.
- Remove useless whitespace in the path d attribute, and remove the then-useless XML space preserving attribute.
- Remove unused groups.
- Remove unused CSS classes.

Contributes to issue CURA-8342.
2021-06-28 18:22:52 +02:00
Konstantinos Karmas
294b67f72f Replace the shadow of the PrepareMenu with a border
In order for that to be possible, the background border of the ExpandablePopup and the ExpandableComponent had to be exposed.

In addition, since in the `RowLayout` the `ConfigurationMenu` and the `MachineSelector` both draw a border around them, it means that there will be a double "divider" (one border line from each button). To overcome that, we set the spacing of the `RowLayout` as a `- border_width`, which ensures then that there will be only a single line of border between the two adjacent buttons.

CURA-8013
2021-06-28 17:50:38 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Konstantinos Karmas
77a8f36153 Change the color of a circle around the toolbar button
Instead of changing the color of the entire tool when it is hovered or selected, now a background circle will be drawn and its color will change according to whether the button is hovered/selected or not.

In addition, the button icons will now be half the size of the button itself.

CURA-8013
2021-06-28 14:56:26 +02:00
Konstantinos Karmas
eeccfc32b9 Remove spacing between toolbar buttons
CURA-8013
2021-06-28 14:54:44 +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
Konstantinos Karmas
bbfa93c9a7 Make the machineSelection header adjust its width
Whenever the window gets resized, the machineSelector header will now change it size, similar to the configurationSelector next to it.

CURA-8013
2021-06-28 14:48:54 +02:00
Ghostkeeper
7ff86547ef
Add fallback for if the example file can't be read
Fixes Sentry issue CURA-2KM.
2021-06-28 14:32:12 +02:00
Ghostkeeper
1ccff0e3eb
Merge branch '4.10' 2021-06-25 16:42:11 +02:00
Ghostkeeper
914f4bbebe
Show Minimum Support Area setting also when there are only support meshes
The setting influences support meshes. If support was disabled but there was a support mesh, this setting would influence the slice result even if it was invisible.

Fixes #10002.
2021-06-25 16:41:59 +02:00
Ghostkeeper
c86782440c
Upgrade version of Voron variant profiles
These were made when the setting_version was still 16.

Contributes to issue CURA-8350.
2021-06-25 16:26:59 +02:00
Ghostkeeper
4b7646e736
Do away with stylized caps
No preferential treatments.

Contributes to issue CURA-8350.
2021-06-25 16:23:50 +02:00
Ghostkeeper
6275f32840
Merge branch 'jg-voron-v0' of https://github.com/jgehrig/Cura into jgehrig-jg-voron-v0 2021-06-25 16:22:17 +02:00
Konstantinos Karmas
efc28872f1 Merge branch '4.10' 2021-06-25 15:04:41 +02:00
Konstantinos Karmas
a8a9b80f0b Merge branch '4.10_translation' into 4.10 2021-06-25 14:54:31 +02:00
Ghostkeeper
e296b0897b
Merge branch '4.10' 2021-06-25 14:16:23 +02:00
Ghostkeeper
a3f7c5f098
Merge branch 'PETG_updates_410' into 4.10 2021-06-25 14:16:05 +02:00
Konstantinos Karmas
04b56c47c4 Merge branch '4.10_translation' of https://github.com/Ultimaker/Cura into 4.10_translation 2021-06-25 14:11:03 +02:00
Konstantinos Karmas
61a6442c71 Add Chinese simplified 4.10 translations
CURA-8310
2021-06-25 14:10:47 +02:00
Jelle Spijker
9406d454d4
Merge pull request #10003 from Patola/4.10
Updated pt_BR strings for Cura 4.10.
2021-06-25 14:06:07 +02:00
Remco Burema
ca2ecfbc6e
Merge pull request #10020 from Ultimaker/CURA-8331_superfluous_g92_pause_at_height
Only add G92 for Griffin if redoing layer in Pause At Height
2021-06-25 14:04:25 +02:00
Konstantinos Karmas
102e66cf50 Remove empty plurals from 4.10 translations 2021-06-25 13:42:27 +02:00
StijnArntz
e25ca09bec PETG_updates_410
Changed max combing distance for UMS3, UMS5, UM2C and UM3 to reduce stringing. Fixed distance of 8 mm.
2021-06-25 13:31:18 +02:00
Konstantinos Karmas
b1e79f79d4 Add lionbridge translations for 4.10
* de_DE
* es_ED
* fr_FR
* it_IT
* ja_JP
* ko_KR
* nl_NL
* pt_PT
* ru_RU
* tr_TR
* zh_CN
2021-06-25 13:22:26 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Konstantinos Karmas
d35f018729 Prevent exception being logged if no backups window was created
CURA-8313
2021-06-25 09:52:48 +02:00
Konstantinos Karmas
2e694ff834
Merge pull request #9866 from oducceu/master
Fix Power-loss Recovery and update G-codes for Flying Bear Base
2021-06-25 09:47:36 +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
ivovk9
16e2ebd489 moved files to folders
moved files to folders
2021-06-25 09:01:06 +02:00
Jelle Spijker
9a27a63b7e
Merge pull request #10031 from Ultimaker/CURA-8313_Fail_gracefully_when_a_file_is_in_use_while_restoring_the_backup
CURA-8313: Ignore files-in-use while restoring a backup
2021-06-25 08:48:28 +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
Ghostkeeper
879f44a776
Merge branch 'update-Liquid-printer' of https://github.com/liquid-printer/Cura into liquid-printer-update-Liquid-printer 2021-06-24 17:32:30 +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
668d51c16b
Improve description of steps per mm (E) setting
Technically, moving the feeder wheel by 1mm doesn't guarantee that the filament gets extruded by 1mm, since there might be slip.

Reported in issue #9924.
2021-06-24 17:01:35 +02:00
Ghostkeeper
f82384d93c
Revert "Revert CURA-8055 in the 4.10 branch. This should not have been merged in there."
This reverts commit 4d29de45796dc42f76c774a216a0601bb57cf790.
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 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
Patola
365808e6bc
changed translation of Digital Library
changed it to just Digital Library as per Ruben's request
2021-06-24 11:17:04 +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
Jaime van Kessel
c7ce0f2236
Merge branch 'CURA-8313_Restore_backup_messes_configurations' of github.com:Ultimaker/Cura into 4.10 2021-06-23 13:32:46 +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