GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 291 Branches 260 Tags
Commit Graph

6082 Commits

Author SHA1 Message Date
c.lamboo
564fefa1c7 Fix updating value with "," instead of "." in reccomended mode 
Fixed by correctly parsing dot in `SingleSettingTextField`.

CURA-9793
 2022-12-13 11:46:06 +01:00
Casper Lamboo
e558752ed0
Merge pull request #13972 from Ultimaker/CURA-9793_extend_recommended_print_settings 
[CURA-9793] Extend recommended print settings
 2022-12-12 14:38:46 +01:00
Joey de l'Arago
e05c70ae38 Refactor ComponentWithIcon to use contents instead of loader. 
CURA-9793
 2022-12-12 14:22:38 +01:00
Joey de l'Arago
8780a2c4a0 Move validators to top of file. 
CURA-9793
 2022-12-12 14:12:32 +01:00
Joey de l'Arago
c6cc9ee6ec Update validators for SettingTextField to use strings from our validators. You can't access the components directly from javascript without instantiating them so they are instantiated here first. 
CURA-9793
 2022-12-12 14:06:45 +01:00
c.lamboo
7e8eca3b03 Fix size of ColorDialog 
CURA-9997
 2022-12-12 11:58:22 +01:00
Joey de l'Arago
1e6184448c
Apply suggestions from code review 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-12-12 11:44:21 +01:00
c.lamboo
e03b4e07f9 Simplify rounding 
Use sliders stepSize and snapMode properties

CURA-9793
 2022-12-08 17:11:04 +01:00
c.lamboo
aaab633912 Move labels into Slider component 
CURA-9793
 2022-12-08 16:23:05 +01:00
Joey de l'Arago
4f4d2431fa The third nested popup will now always try to stay withen the vertical space of the root materials popup. 
See CURA-9522 for diagrams and more information.

CURA-9522
 2022-12-08 16:18:58 +01:00
Joey de l'Arago
e6f4055df5 Remove part of hack for fixing extrudersCHanged signal at the wrong time. 
Other things rely on the extruders changed signal so it is better to just emit it again at the correct time.

CURA-9793
 2022-12-08 13:11:14 +01:00
Joey de l'Arago
82fd34f168 Fix same property value check. 
CURA-9793
 2022-12-08 09:56:36 +01:00
Joey de l'Arago
435c67f97a revert changes to functions 
CURA-9793
 2022-12-08 09:53:06 +01:00
Joey de l'Arago
9a03094bfd Stop the text field from updating if the text has not changed. This was causing the custom mode text boxes to be updated instantly. 
0.0 -delete-> 0. -instant update -> 0.0

 This is because the recommended mode text fields would update to "0." see that as a change from "0.0" and update the property. This triggered an update in the Custom mode textfield.

CURA-9793
 2022-12-08 09:34:32 +01:00
Jelle Spijker
91170e0aef
Apply suggestions from code review 2022-12-08 07:43:57 +01:00
Joey de l'Arago
bcdfa808a8 Switch to checking enabled extruder count for showing print with Component. This is because we want the SingleSettingExtruderBar to be hidden when there are 1 or less extruders, but also when there are 1 or less enabled extruders. 
CURA-9793
 2022-12-07 17:33:13 +01:00
Joey de l'Arago
ca0cd5069b Remove leftover print statements 
CURA-9793
 2022-12-07 17:30:12 +01:00
Joey de l'Arago
8012cb5360 Signal are being emmitted before settings are updated. This is causing the combobox to update with the previous value. Only when using infill_pattern setting though. No idea what is causing this. This is a workaround for now. 
CURA-9793
 2022-12-07 17:16:26 +01:00
Joey de l'Arago
443252ae10 Use globalStackExtruderIds instead of extruderIds. extruderIds notifys change before the extruders change when doing a machine swap. Fixing this will take a long time so this is a workaround. If you are reading this 🙏 good luck fixing it 🙏 
CURA-9793
 2022-12-07 16:57:35 +01:00
Joey de l'Arago
f601229390 Move Validators to UM, so they can be used in UM components. 
Update all TextFieldWithUnit to use our FloatValidator. This component now has proper styling when the input is invalid. The DoubleValidator was flagging numbers with a "." in them as an incorrect input (I assume this is because the region was set to europe on the OS where "," is common). The workaround is to use our FloatValidator which validates both "." and ","

CURA-9793
 2022-12-07 16:27:42 +01:00
Joey de l'Arago
0e5ad96207 Fix bad call to keys function on string. 
Also fix assigning currentIndex to correct Component.

CURA-9793
 2022-12-07 16:15:09 +01:00
Joey de l'Arago
396057a56f Correct typo in name 
CURA-9793
 2022-12-07 16:14:17 +01:00
jspijker
0bdb04ccf6 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-07 10:16:17 +01: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
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
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
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
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
Joey de l'Arago
c495f0de3f Hide extruder selector when there is only one extruder. 
CURA-9793
 2022-12-05 17:11:05 +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
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
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
Joey de l'Arago
6d474dfe40 Remove comments 
CURA-9793
 2022-12-05 11:56:22 +01: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
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
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
Remco Burema
c74e7be602 Appease reviewers. 
- Ditch state in favour of enum.
- Comment explaining 'extraInfo'.

part of CURA-9347
 2022-12-02 19:52:37 +01:00