34820 Commits

Author SHA1 Message Date
c.lamboo
b3d3c4d00a Remove almost duplicate file
CURA-11800
2024-03-30 16:16:27 +01:00
HellAholic
a95418f072
Merge pull request #18745 from Ultimaker/CURA-11465-addprinter-window-jumps-to-cloud-printer
Implement syncing feature for Ultimaker account
2024-03-29 16:52:38 +01:00
c.lamboo
16ce5c8b6f Merge remote-tracking branch 'origin/5.7' into 5.7 2024-03-29 16:23:50 +01:00
c.lamboo
600f5cdaf6 Fix opening empty ucp files
CURA-11703
2024-03-29 16:23:38 +01:00
HellAholic
6d5966472c
Merge pull request #18754 from Ultimaker/CURA-11783-enum-instead-of-text-value
Cura 11783 enum instead of text value
2024-03-29 15:26:51 +01:00
c.lamboo
5301233322 Fix label in save ucp
CURA-11783
2024-03-29 14:13:06 +01:00
c.lamboo
0d01f7523e Also translate label
CURA-11783
2024-03-29 13:04:56 +01:00
c.lamboo
b2fea2c1b5 Point to correct catalog
CURA-11783
2024-03-29 12:52:31 +01:00
c.lamboo
b2c0767165 Add translations to enum values
CURA-11783
2024-03-29 11:52:09 +01:00
HellAholic
29c3c2f098
Merge pull request #18756 from Ultimaker/CURA-11703_fix_ucp_jump_coords
[CURA-11703] Reset entire scene around center for UCP.
2024-03-29 11:36:45 +01:00
Casper Lamboo
4c9b74edff
Remove unintuitive comment 2024-03-29 10:38:27 +01:00
HellAholic
0ce0a4c732
Merge pull request #18731 from Ultimaker/CURA-11772_fix_crash_on_open
[CURA-11772] Crash on opening certain project files
2024-03-29 10:31:57 +01:00
Erwan MATHIEU
5d42648e2a
Merge pull request #17166 from 0xDEAD/ender3v3se
Move nozzle clean to designated area
2024-03-29 10:13:05 +01:00
Erwan MATHIEU
54cae5b602
Merge branch '5.7' into ender3v3se 2024-03-29 10:12:52 +01:00
Remco Burema
0d585f367f Reset entire scene around center for UCP.
Since we can't rely on the build-volume --because we can't know on which printer we open-- the safest bet (and the thing alowed by 3mf if I recall) is to just center the entire scene on the buildplate for Universal Cura Project files.

CURA-11703
2024-03-28 23:51:35 +01:00
Saumya Jain
cf61a78fbf Added enumname while reading ucp
Added a connection in WorkspaceDialog.qml to call function whenever the 'exportedSettingModel' changes. This ensures that any changes in the model will now be reflected in the UI table. Furthermore, an added adjustment in SpecificSettingsModel.py now correctly handles the enum type settings, retrieving the correct value from the options list.

CURA-11783
2024-03-28 17:16:42 +01:00
Remco Burema
93861073d3 Fix another open-file resulting in a crash.
If the materials doesn't have the right key in it, just continue. It should be somewhere after all.

part of CURA-11772
2024-03-28 17:00:57 +01:00
Remco Burema
e85e50cce4 Merge remote-tracking branch 'origin/5.7' into CURA-11772_fix_crash_on_open 2024-03-28 14:58:13 +01:00
Saumya Jain
b34865e9c8 Changed setting value to enum value while saving ucp
CURA-11783
2024-03-28 11:54:54 +01:00
HellAholic
2435a5665f
Merge pull request #18734 from Ultimaker/CURA-11781-align-learn-more-button-in-ucp
learn more button alligned in UCP
2024-03-28 10:36:35 +01:00
HellAholic
55baebc5b1
Merge pull request #18744 from Ultimaker/CURA-8897_fix_revert_to_prev_project_name
[CURA-8897] Clear the last project name when the platform is empty.
2024-03-28 10:34:52 +01:00
HellAholic
2ce731fb83
Merge pull request #18737 from Ultimaker/CURA-11723-dont-show-anti-mesh-settings
Add visibility control for settings in 3MFWriter plugin
2024-03-28 10:18:43 +01:00
Saumya Jain
3e5edaa442
Merge branch '5.7' into CURA-11465-addprinter-window-jumps-to-cloud-printer 2024-03-28 10:06:48 +01:00
Saumya Jain
55d4cd44c4 Aligning the title horizontally
CURA-11781
2024-03-28 09:51:06 +01:00
HellAholic
ba10318a0e
Merge pull request #18592 from Ultimaker/CURA-11475_low_performance_multiple_nozzles
Cura 11475 low performance multiple nozzles
2024-03-28 09:07:29 +01:00
Remco Burema
cbe3afba94 Remove the name when there _isn't_ platform activity.
Not the other way around, doh.

part of CURA-8897
2024-03-28 08:49:13 +01:00
HellAholic
264fd95e5f
Merge pull request #18743 from Ultimaker/CURA-11776-update-from-global-setting-for-support-type
Update support extruder settings behavior
2024-03-27 17:01:08 +01:00
HellAholic
f1228b719b
Merge pull request #18577 from Ultimaker/PP-446-Update-bundled-packages
PP-446 update bundled packages
2024-03-27 16:44:08 +01:00
Saumya Jain
c3b0fa5bd3 Implement syncing feature for Ultimaker account
Updated account syncing functionality for logged-in and non-logged-in sessions in Ultimaker. More specifically, syncing is now engaged when the UI becomes visible and stopped when adding a machine action is triggered. The modifications also include fallback to login if the user is not logged in.

CURA-11465
2024-03-27 16:42:45 +01:00
Erwan MATHIEU
228c490e0e
Merge branch '5.7' into CURA-8897_fix_revert_to_prev_project_name 2024-03-27 15:34:57 +01:00
Remco Burema
3011a17925 Clear last project name when platform empty.
This should fix the reverting of project name to the previous one when the current project was not saved as a project (yet).

CURA-8897
2024-03-27 13:45:21 +01:00
Saumya Jain
d857183df5
Merge branch '5.7' into PP-446-Update-bundled-packages 2024-03-27 13:43:26 +01:00
Paul Kuiper
07f9bffaf8 Fixed CPE plus links.
PP-446
2024-03-27 13:36:40 +01:00
Paul Kuiper
8d34b259b9
Apply suggestions from code review
Added new printing guideline link for method materials

Co-authored-by: Saumya Jain <70144862+saumyaj3@users.noreply.github.com>
2024-03-27 13:35:31 +01:00
HellAholic
f89d4ddb4c
Merge pull request #18741 from Ultimaker/CURA-11786_cloud_plugin_cleanup
[CURA-11786] [PP-452] Clean up the CloudAPIClient
2024-03-27 13:21:01 +01:00
Saumya Jain
72a217096d
Merge branch '5.7' into PP-446-Update-bundled-packages 2024-03-27 12:35:07 +01:00
Saumya Jain
9310fff06f Aligning with 5.7 2024-03-27 12:32:14 +01:00
HellAholic
ae929d9193
Merge pull request #18614 from Ultimaker/5.7-translations
Updated translations
2024-03-27 12:10:09 +01:00
Saumya Jain
f2b2048b51 Update support extruder settings behavior
Changed the settings in RecommendedSupportSelector.qml so that now all extruders will not be updated by default. However, when a user changes the selected index, a temporary update to all extruders will be triggered. This allows for specific user-directed changes to propagate correctly across all extruders.

CURA-11776
2024-03-27 11:58:55 +01:00
Frederic Meeuwissen
f665281a6a Only load machine_id_to_name.json when it's needed for the first time 2024-03-27 11:19:59 +01:00
Frederic Meeuwissen
484cc6d42f Clean up CloudApiClient.py 2024-03-27 11:19:48 +01:00
Frederic Meeuwissen
8012df6518 Convert str.format to f-string 2024-03-27 11:19:36 +01:00
Frederic Meeuwissen
1bc8b90b56 Move definition ID to cloud name map to json file 2024-03-27 11:19:22 +01:00
Saumya Jain
f4c15c47ce
Update plugins/3MFWriter/SettingsExportGroup.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-27 11:18:02 +01:00
Saumya Jain
646d4e5f85
Update plugins/3MFWriter/SettingsExportModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-27 11:17:46 +01:00
Saumya Jain
3d0337ed3d
Merge branch '5.7' into PP-446-Update-bundled-packages 2024-03-27 10:21:56 +01:00
Matthias
caa1fc8c67 Move nozzle clean to designated area 2024-03-27 09:13:37 +01:00
Erwan MATHIEU
a19ebc638b Apply suggested fix by @GMagician 2024-03-27 08:53:50 +01:00
Saumya Jain
6ddd96f914 Add visibility control for settings in 3MFWriter plugin
Introduced a new property 'show_in_menu' to control the visibility of individual settings in 3MFWriter plugin. Modified 'SettingExport' class constructor to store this visibility status. Also, updated the 'SettingsExportGroup' model to filter the settings based on visibility before presenting them in the GUI.

CURA-11723
2024-03-26 20:37:43 +01:00
Nathan Rooy
5a0fe793ec
Merge branch 'main' into main 2024-03-26 15:16:32 -04:00