GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 13:09:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,025 Commits 290 Branches 260 Tags
Commit Graph

31025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joey de l'Arago
d8cf234a17 Use different signal for triggering update to extrduderIds. **This is a hack**. Actually fixing this problem could take days. 
CURA-9793
 2022-12-07 12:25:33 +01:00
jspijker
0bdb04ccf6 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-07 10:16:17 +01:00
jspijker
333f0e8282 Show OS in run-name 2022-12-07 10:09:42 +01:00
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
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
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
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
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
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