Commit graph

30698 commits

Author SHA1 Message Date
MariMakes
3aaf2ea078
Removed Indent Tabs
Aligning was weird because I used Tabs
2022-11-28 15:35:13 +01:00
MariskaMaas
be4324da53 Add Minimum to Adaptive Layers Maximum Variation
A negative value will result in a failed slice as mentioned here
https://github.com/Ultimaker/Cura/issues/13749

Warning value of 0 is added
2022-11-28 14:24:29 +01:00
Joey de l'Arago
ff65c1a670
Merge pull request #13886 from Ultimaker/9773-add_quality_type_to_ufp_files
Add quality type to ufp files
2022-11-28 13:19:09 +01:00
c.lamboo
be40920042 Fix cura crashing
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property

Cura-9773
2022-11-28 13:14:47 +01:00
c.lamboo
8e8437eab0 Split of getStringParts function
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.

Cura-9773
2022-11-28 13:10:52 +01:00
Joey de l'Arago
5ed572779d remove redundant properties in settings
CURA-9773
2022-11-28 12:44:20 +01:00
Joey de l'Arago
8dcccd941b Add dataclass for ActiveQuality. Move some logic out of MachineManager into ActiveQuality.
CURA-9793
2022-11-28 12:40:35 +01:00
Casper Lamboo
f297909a82
Fix type signature of function
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-28 11:23:53 +01:00
Casper Lamboo
a645fa7d96
Use bracket to initialise list
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-28 11:22:53 +01:00
Joey de l'Arago
36fcc34bbd
Merge pull request #13888 from Ultimaker/CURA-9931_cache_product_id_table
[CURA-9931] Cache and genericize ID to Product table.
2022-11-28 11:02:33 +01:00
c.lamboo
4fa024cd31 Group intent and quality
Bit of an ugly hack. At later point in the code it is assumed the first element of the list is the main part and the remaining elements form the suffix. Intent and the profile form both the main part so these need to be grouped together.

Cura-9773
2022-11-25 16:48:06 +01:00
c.lamboo
76564f7bc4 Add dash between main, and suffix part of quality display name
Cura-9773
2022-11-25 16:46:21 +01:00
c.lamboo
ad3b2deb2a Merge remote-tracking branch 'origin/9773-add_quality_type_to_ufp_files' into 9773-add_quality_type_to_ufp_files 2022-11-25 16:12:49 +01:00
c.lamboo
1ae8f2da62 Add quality display name with ufp files
Cura-9773
2022-11-25 16:12:44 +01:00
c.lamboo
52ee149edc Unify activeQualityDisplayNameMap string creation
Generation quality display names in `CustomPrintSetup.qml` and `PrintSetupSelectorHeader.qml` were so similar that I decided to combine the logic.

Cura-9773
2022-11-25 16:09:55 +01:00
Remco Burema
6a126f4d6b
Merge pull request #13799 from NilsRo/master
disable lin. adv. if accidently enabled by earlier print
2022-11-25 12:41:24 +01:00
Joey de l'Arago
f6c8312403
Merge pull request #13847 from xommit/main
Translating Cura - Update fr_FR language
2022-11-25 10:47:11 +01:00
c.lamboo
c2ad41e10e Add quality type to ufp files
Cura-9773
2022-11-24 23:02:13 +01:00
c.lamboo
e8f6786e97 Revert "Add quality type to ufp files"
This reverts commit 7e84082aff.
2022-11-24 22:56:35 +01:00
Remco Burema
6dc0a24311 Cache and genericize ID to Product table.
part of CURA-9931
2022-11-24 15:33:39 +01:00
c.lamboo
7e84082aff Add quality type to ufp files
Cura-9773
2022-11-24 13:55:31 +01:00
jspijker
fb69cff511 fix typo 2022-11-18 13:04:38 +01:00
jspijker
87cea8f8f4 write directly to the env file 2022-11-18 13:02:04 +01:00
jspijker
be0b2b15c7 Use quotes for output to env files 2022-11-18 11:59:36 +01:00
jspijker
55040a7040 Use Env file for workflow output 2022-11-18 11:50:10 +01:00
jspijker
cc36da86b1 Fix channel when people use - instead of _ in their branch name 2022-11-18 11:45:07 +01:00
Joey de l'Arago
f60463a237 Add left padding
CURA-9424
2022-11-18 11:33:00 +01:00
jspijker
73ac7fa716 Fix get version form PR's 2022-11-18 11:27:41 +01:00
Remco Burema
3761f03cea Called workflow needs to inherit more information to run.
part of CURA-9880
2022-11-17 18:26:45 +01:00
Remco Burema
ccdc67712a Suddenly 'type' is required while previously it wasn't.
Also attempt to standardize the ordering somewhat (description, default, required, type).

part of CURA-9880
2022-11-17 18:04:25 +01:00
Remco Burema
6d810ccb9d Split up installer workflow per OS.
This requires a separate action to be run per OS, as there is no real way to have conditional lists within YML. The idea is that the installer can be build per OS (and also, another intent of this change is to make it so that people don't have to wait for all artifacts to be ready to download a single one).

part of CURA-9880
2022-11-17 17:52:48 +01:00
Casper Lamboo
ee75fa02aa
Merge pull request #13848 from Ultimaker/CURA-9424_workspace_dialog_fixes
[CURA-9424] Workspace dialog fixes
2022-11-17 17:15:34 +01:00
Joey de l'Arago
1d1800e440 Remove print statements
CURA-9424
2022-11-17 17:03:05 +01:00
Joey de l'Arago
dd510a5dfc Cleanup
CURA-9424
2022-11-17 16:58:16 +01:00
Joey de l'Arago
d286f50fe9 Check for translated string
CURA-9424
2022-11-17 16:39:59 +01:00
Joey de l'Arago
ff61097f13
Update resources/qml/RoundedRectangle.qml
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-11-17 16:37:14 +01:00
Joey de l'Arago
4d2f6b9655 Previously there would always be one item in the updateableMachinesModel ("Create new"). This was moved to a button instead of being part of the model.
This fixes new machines being incorrectly created when a machine already exists.

CURA-9424
2022-11-17 16:21:57 +01:00
xommit
663dcb8968
Update cura.po 2022-11-17 15:21:34 +01:00
xommit
fd546c347e
Update cura.po 2022-11-17 15:16:38 +01:00
Casper Lamboo
5a75678caf
Merge pull request #13762 from Ultimaker/CURA-9548_min_support_area_split
[CURA-9548] The engine now operates on the area _before_ the offset.
2022-11-17 14:47:30 +01:00
Joey de l'Arago
da71983891 Make combobox font and padding customizable.
Style WorkspaceDialog comboboxes similar to MachineSelector

CURA-9424
2022-11-17 14:41:14 +01:00
c.lamboo
9774349cb7 Make add printer component more responsive
For some displays/screen resolutions the cut is expended beyond the borders of the window. By making the component more responsive this should be fixed.

CURA-9894
2022-11-17 13:03:17 +01:00
Joey de l'Arago
70f7f68a51 Color icons in workspace dialog so they are themed correctly in dark mode.
Don't show name when defaulting to create new printer.

CURA-9424
2022-11-17 13:01:20 +01:00
Remco Burema
b0160b2d86 Revert "Specify to build installer per-OS."
This reverts commit 957c25973b.
2022-11-16 19:36:26 +01:00
Casper Lamboo
35094ff47d
Merge pull request #13837 from Ultimaker/CURA-9424_fix_loading_files
[CURA-9424] Fix loading files
2022-11-16 16:54:48 +01:00
Remco Burema
957c25973b Specify to build installer per-OS.
Exclusion happens _before_ additional includes unfortunaltely, so the matrix is back to being a plain list if OS's. This also means that, if we don't want to build each OS x OS_id, we have to put that information somewhere else. OS_id didn't really belong in the matrix anyway, since it's a derivative value. It's now replaced with a named environment variable.

The way to exclude and select the 'name' used in the filename for each OS seems a little cumbersome, but I didn't find any better way so far.

(should) implement the 'easy', 'lite' version  of CURA-9880
2022-11-16 16:39:14 +01:00
Joey de l'Arago
156004cb17 Move logic for deciding the initially selected printer that was inside WorkspaceDialog.qml before into WorkspaceDialog.py.
A block of code is run after dialog.show() and most of the dialog assignment. This is because dialog.show() resets the _result dictionary, we want to update the values in _result afterwards.

CURA-9424
2022-11-16 16:11:19 +01:00
Jelle Spijker
cc9a698f42
Merge pull request #13775 from Ultimaker/CURA-9350_support_interface_wall
[CURA-9350] support interface wall
2022-11-15 16:17:21 +01:00
Casper Lamboo
63b27d3ca8
Merge pull request #13774 from Ultimaker/CURA-9424_update_loading_projects_design
Cura 9424 update loading projects design
2022-11-15 15:38:15 +01:00
c.lamboo
dc65e801d0 Set machine isAbractMachine in workspace dialog initialisation 2022-11-15 15:35:16 +01:00