3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
32784 commits 306 branches 270 tags 779 MiB
Commit graph

32784 commits

This branch
This branch
All branches
Author SHA1 Message Date
jspijker
d876317df6 Show OS in run-name 2022-12-07 10:08:24 +01:00
jspijker
e9136f654d Show OS in run-name 2022-12-07 10:06:45 +01:00
Remco Burema
71fb23516e
Merge pull request #13983 from Ultimaker/CURA-9347_part_2b 
[CURA-9347] part 2b: last changes(?) [reset and save buttons]
 2022-12-07 09:16:04 +01:00
whoseyoung
8b5d254017 update geeetech_GiantArmD200.def.json 2022-12-07 10:26:02 +08:00
whoseyoung
6801e3aab2
Merge branch 'Ultimaker:main' into main 2022-12-07 09:46:01 +08:00
Joey de l'Arago
03fac1bc7f Make the width of the ProfileWarningREset 0 when it is hidden. 
Expand the profile selection dropdown when the ProfileWarningReset is hidden in the custom menu.
CURA-9793
 2022-12-06 18:11:15 +01:00
Remco Burema
4ecc0a98bb Don't show reset for only custom profile when in custom mode. 
part of CURA-9347
 2022-12-06 17:07:29 +01:00
Remco Burema
067a40dbe8 Don't just disable the reset/safe buttons, hide them. 
part of CURA-9347
 2022-12-06 17:00:06 +01:00
Joeydelarago
a079c78f76 Applied printer-linter format 2022-12-06 15:17:31 +00:00
Joey de l'Arago
87c1f3338e
Merge pull request #13648 from ckvsoft/main 
Update vzbot_base.def.json
 2022-12-06 16:16:23 +01:00
Joey de l'Arago
4e8e5c2bf0 Merge remote-tracking branch 'origin/CURA-9622_unable_to_scroll_long_materials_list' into CURA-9622_unable_to_scroll_long_materials_list 2022-12-06 15:37:21 +01:00
Joey de l'Arago
3dff780215 Adjust location of popups so they align with their parent popup. 
CURA-9793
 2022-12-06 15:36:55 +01:00
Joey de l'Arago
e5baa6e2bf
Update resources/qml/Menus/MaterialBrandMenu.qml 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-12-06 15:18:32 +01:00
Joey de l'Arago
0610078d87
Merge pull request #13982 from Ultimaker/CURA-9347_part_II 
[CURA-9347] part deux: always warn & better outline buttons
 2022-12-06 15:09:49 +01:00
Joey de l'Arago
493f82620e Center Manage Profiles button 
CURA-9793
 2022-12-06 14:57:54 +01:00
Joey de l'Arago
491c501d8c Adjust margins and correctly vertical center buttons. 
CURA-9793
 2022-12-06 14:48:50 +01:00
Remco Burema
591fbb2034 Outline reset/save buttons properly. 
part of CURA-9347
 2022-12-06 12:37:34 +01:00
Joey de l'Arago
bec02cf312 Fix extruder icon text scaling. I've added a new font size here since there is not any real way I can see to scale the font based on the component size. This is because we do some magic with the font numbers before passing them to the QML. 
CURA-9793
 2022-12-06 12:08:00 +01:00
Joey de l'Arago
93d1f05aec Remove ignored changes list. All changes will now trigger the reset setting button to appear 
CURA-9793
 2022-12-06 12:07:07 +01:00
Remco Burema
358ca13fd8 Also show 'warning' when only recommended settings changed. 
part of CURA-9347
 2022-12-06 12:03:31 +01:00
Joey de l'Arago
362877dee1 Add new recommended mode tooltips and remove extra margin at the bottom of tooltips. 
CURA-9793
 2022-12-06 10:50:04 +01:00
Joey de l'Arago
ea5d4a8211 Make tickmarks bigger to avoid issues with pixel rounding errors causing the tickmarks to appear above or below the background line. 
CURA-9793
 2022-12-06 10:38:49 +01:00
Joey de l'Arago
3ddebe7a84 The extrudersCHanged signal was incorrectly being emitted before the global stack had updated. This was causing the extruderIds to always return the old extruderIds to connected qml components. 
The setting slider was incorrectly setting the slider value when updating the model.

CURA-9793
 2022-12-06 10:37:06 +01:00
whoseyoung
55a1a16e44
Merge branch 'Ultimaker:main' into main 2022-12-06 13:49:20 +08:00
Christian Kvasny
3acda6a7da
Merge branch 'Ultimaker:main' into main 2022-12-05 23:29:33 +01:00
Joey de l'Arago
c495f0de3f Hide extruder selector when there is only one extruder. 
CURA-9793
 2022-12-05 17:11:05 +01:00
Joey de l'Arago
5a415b8324 Remove black fill from icons. This fill prevents themeing 
CURA-9793
 2022-12-05 16:55:48 +01:00
jspijker
8058c16f00 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 16:45:33 +01:00
Joey de l'Arago
d2ff62485d Fix popups not maxing height at top of parent 
CURA-9793
 2022-12-05 16:18:03 +01:00
Modix-Lazar
13dab34ad2 Removed pre-defined values from the files 2022-12-05 15:55:28 +01:00
Joey de l'Arago
7185b898a3 remove comments 
CURA-9793
 2022-12-05 15:44:27 +01:00
Joey de l'Arago
bfb2b044bb nested popups will always try to take up the same vertical area as it's parent. If the popup is small than it's parent it won't go below or above the parent. If it is longer than the parent, the bottom will extend past the parent. 
CURA-9793
 2022-12-05 15:43:05 +01:00
Jelle Spijker
b8b433ed5c
Merge pull request #13938 from Ultimaker/CURA-9347_safe_to_profile_button 
[CURA-9347] Easier 'compare-and-safe' for (new or custom) profiles
 2022-12-05 15:34:57 +01:00
Joey de l'Arago
80e9f64c85 Fix overwritten theme name for slider 
Add property for background ticks.

CURA-9793
 2022-12-05 15:30:51 +01:00
Joey de l'Arago
f034c115be Rename slider theme items 
CURA-9793
 2022-12-05 15:11:48 +01:00
Joey de l'Arago
ce5691c12d
Apply suggestions from code review 
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-12-05 14:42:35 +01:00
Joey de l'Arago
741a112282 Remove recommended adhesion selector. 
CURA-9793
 2022-12-05 14:05:22 +01:00
Christian Kvasny
c4621cbb1a
Update resources/definitions/vzbot_base.def.json 
removed

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2022-12-05 13:24:32 +01:00
Christian Kvasny
fc6db7b020
Update vzbot_base.def.json 
remove retraction_hop_enabled false
 2022-12-05 13:14:31 +01:00
Christian Kvasny
8d46640441
Merge branch 'Ultimaker:main' into main 2022-12-05 12:59:49 +01:00
Joey de l'Arago
6d474dfe40 Remove comments 
CURA-9793
 2022-12-05 11:56:22 +01:00
whoseyoung
33b815dec5 add Geeetech 24 machine profiles 2022-12-05 18:45:09 +08:00
Joey de l'Arago
0738f996d0 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 11:39:51 +01:00
Joey de l'Arago
29172014ad Add all new recommended items to ignored custom settings keys. This stops the reset setting button from appearing even though we have changed these settings. 
CURA-9793
 2022-12-05 11:37:18 +01:00
Joey de l'Arago
d7e1aa08ac Update the single setting components to optionally update all extruders when a setting is settable per extruder or limited to extruder. 
This forces all extruders to have their settings updated but only displays the value from a single extruder.

CURA-9793
 2022-12-05 11:32:24 +01:00
whoseyoung
6de976f1e0
Merge branch 'Ultimaker:main' into main 2022-12-05 18:32:11 +08:00
Jelle Spijker
e91d5df3a3
Apply suggestions from code review 2022-12-05 10:39:20 +01:00
Joey de l'Arago
540d810293 The slider was not forcing its setting value to stay the same when changes were made in the "Advanced" menu. This is because the slider updating and setting updating functions were intertwined. I've seperated them so that the slider no longer interferes with changes to the setting. 
The Shell thickness settings were not being read or set correctly. I fixed this by setting the value to all extruders and reading from extruder 1. This setting is not set per machine but for all extruders. Not sure why.

CURA-9793
 2022-12-05 10:23:40 +01:00
Luis Gabriel Gomez
358f20a94e
printer-linter: exit on invalid definition file paths 
This PR prevents silent failure with empty diagnostics if an invalid file path was provided
 2022-12-04 19:45:25 -03:00
Luis Gabriel Gomez
651e56ca9d
Clarify linter steps for running locally 2022-12-04 19:33:48 -03:00