8174 Commits

Author SHA1 Message Date
Konstantinos Karmas
196e5ba397 Increase size of buildplate icon in monitor page
CURA-8202
2021-07-01 11:21:45 +02:00
Konstantinos Karmas
c3a7cd59be Add medium quality "Folder" icon
CURA-8202
2021-06-30 12:24:49 +02:00
Konstantinos Karmas
348bf0c4c1 Remove unused import
CURA-8013
2021-06-29 15:33:44 +02:00
Konstantinos Karmas
8a22eaa5cc Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar 2021-06-29 11:04:51 +02:00
Konstantinos Karmas
5a3675df95 Calculate the width of the header items only once
CURA-8013
2021-06-29 10:54:46 +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
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
e296b0897b
Merge branch '4.10' 2021-06-25 14:16:23 +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
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
Jaime van Kessel
7e7a09ffa7
Merge branch '4.10' of github.com:Ultimaker/Cura 2021-06-23 14:26:19 +02:00
Konstantinos Karmas
4f5e055cd8 Show the backup item as busy while it is being restored
Previously, after pressing the "Restore" button of a backup, there was no indication about it being restored. This commit changes that by making the "Restore" button of that backup display the busy rotating wheel.

CURA-8313
2021-06-22 16:33:32 +02:00
Konstantinos Karmas
51de50cd05 Hide the backup window when the application is shutting down
CURA-8313
2021-06-22 16:31:37 +02:00
Konstantinos Karmas
b1ee6d3d22 Revert "Hide the backup window when the application is shutting down"
This reverts commit 32eac869994ec1e84a81c6247b59c982f6619152.
2021-06-22 16:29:52 +02:00
Ghostkeeper
9a470f639d
Only add G92 for Griffin if redoing layer
Also, don't add it twice for the Repetier flavour.
This way the code is separated better into if-else cases to make it easier to read, even though it has this line in there 3 times.

Fixes issue CURA-8331.
2021-06-22 16:29:28 +02:00
Konstantinos Karmas
32eac86999 Hide the backup window when the application is shutting down
CURA-8313
2021-06-22 16:24:43 +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
Konstantinos Karmas
50d9b1284c Don't log sentry issues when backup fails due to size
We do not consider this necessary since it is not a crash.
2021-06-21 15:13:03 +02:00
Ghostkeeper
788efcc83e
Prevent crash when cloud printer gets added while trying to connect to active printers
The cloud printers get added asynchronously, which could lead to a crash because the dict gets modified while we're iterating over it.

Fixes Sentry issue CURA-2EN.
2021-06-17 13:35:15 +02:00
Ghostkeeper
5252d53187
Merge branch '4.10' 2021-06-17 12:07:25 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Ghostkeeper
92ff9ac313
Merge branch '4.10' 2021-06-16 16:45:51 +02:00
Ghostkeeper
ddfcc94649
Merge branch 'CURA-8320_update_sdk' into 4.10 2021-06-16 16:45:37 +02:00
Remco Burema
d3ccf5a9e3
Merge pull request #8463 from rrrlasse/rrrlasse/fix_usb_connection
Fix connecting to printer via USB
2021-06-16 15:14:38 +02:00
Ghostkeeper
31106d13d0
Reduce nesting complexity with some pre-checks
There were two pre-checks here, where the main body of the function was indented two deep. Instead, just early-out if the checks fail. This is easier to read and understand.

Found during investigation of CURA-8128.
2021-06-16 12:58:09 +02:00
Ghostkeeper
cc6a629d92
Merge branch '4.10' 2021-06-15 17:13:25 +02:00
Ghostkeeper
f18e5f96ab
Use Cura-style drop-down to select mesh type
MacOS has some trouble with the QtQuick.Controls 1 system-styled drop-downs since Qt 5.15. We've removed the other ones, but forgot about this one.

Contributes to issue CURA-8128.
2021-06-15 17:13:08 +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
Ewald Kleefstra
94871a32e3
Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
Get extrusion mode from global container stack instead of first extruder

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-06-14 15:26:57 +02:00
Ewald Kleefstra
76da7768e8
Added relative extrusion mode support for PauseAtHeight.py script 2021-06-14 15:26:41 +02:00
Ghostkeeper
af6603e63d
Merge branch 'master' of https://github.com/ewaldkleefstra/Cura into ewaldkleefstra-master 2021-06-14 15:21:11 +02:00
Remco Burema
9d951fbe10
Merge pull request #9724 from Ultimaker/CURA-8141_Double_click_to_open_digital_library_files
CURA-8141: Immediately open a digital library file after double clicking on it
2021-06-08 16:22:57 +02:00
Ewald Kleefstra
755d844f72
Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
Get extrusion mode from global container stack instead of first extruder

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-06-07 17:45:51 +02:00
Jaime van Kessel
dc8c5e4268
Merge branch 'mb-fix-flow-rates-min-max' of https://github.com/smartavionics/Cura 2021-06-07 15:29:45 +02:00
Ghostkeeper
515c7459d3
Catch EnvironmentError when writing to UFP files
This should result in a user-visible error message rather than a crashing application.

Fixes Sentry issue CURA-28E.
2021-06-07 14:34:26 +02:00
Ghostkeeper
9a65008952
Catch correct exceptions
To catch the exception of duplicate file types, catch only the exception that triggers at this, OPCError. To catch generic file writing errors, catch all of EnvironmentError, not just OSError.
2021-06-07 14:28:33 +02:00
Mark Burton
d2a7a4186a Avoid crash calculating max/min flow rates if there are no visible lines with extrusion. 2021-06-07 07:51:58 +01:00
Mark Burton
f65731e4c2 Reset min/max flow rates in calculateColorSchemeLimits(). 2021-06-06 12:17:19 +01:00
Mark Burton
2f1f370fe0 Remove local variable. 2021-06-06 12:17:03 +01:00
Mark Burton
4973d53057 Rework calculation of min/max flow rates for simulation view colour scheme.
The max value was being calculated as the product of the max line width, max layer thickness
and max feedrate but it should be calculated as the maximum of the products of the width,
thickness and feedrate for each individual line. i.e. calculate the flow for each line
and use the min and max values of the flows.
2021-06-06 09:34:56 +01:00
Ghostkeeper
3dc1dbbbdb
Load profile from ContainerRegistry if the stack refers to it
We encountered a case where the version upgrade changed the quality profile to a new one which was specific to the printer rather than a global profile. As the upgraded stack was being read from the project file, it would go look for the new quality profile in the workspace. That ID wouldn't be present in there, and so it would crash and pretend the project file is plain 3MF.
This change makes it fallback to the built-in profiles, for precisely such cases as when a version upgrade changes the stack.

Contributes to issue CURA-8212.
2021-06-03 17:13:22 +02:00
Ghostkeeper
cc6191a141
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2021-06-02 15:24:23 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
Jaime van Kessel
38ce22ba7c
Revert "Fix typo in icon name"
This reverts commit 12a98388d9fd00cd9e3b85a2ea060d6c8c9a215e.
2021-05-27 16:03:13 +02:00
Jaime van Kessel
6483db3d47
Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"
This reverts commit 90eb2bfbdcc66fdbf82b0e1dac6bcf1a536845b0, reversing
changes made to 91c4d8b5f2cf3c18df2f75a0161f727eeae1bf41.
2021-05-27 16:01:17 +02:00