GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,243 Commits 291 Branches 260 Tags
Commit Graph

332 Commits

Author SHA1 Message Date
Jaime van Kessel
cd3e45c7c4
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-12 15:34:54 +02:00
Jaime van Kessel
1c0be9c5ed
Also prevent warning spam if icon isn't set 2023-06-12 15:33:08 +02:00
Jaime van Kessel
7103b9b333
Prevent qml warning spam if custom_icon isn't set 2023-06-12 14:48:31 +02:00
Jelle Spijker
0f0d729549
Merge branch '5.4' 
# Conflicts:
#	conanfile.py
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
 2023-06-08 12:36:46 +02:00
c.lamboo
57bece831f Don't scroll beyond bounds in recommended menu 
CURA-10650
 2023-06-06 16:31:36 +02:00
c.lamboo
27cc89ff89 Allow for custom descriptions/icons in packaged intents 
CURA-9709
 2023-05-31 12:54:56 +02:00
c.lamboo
62812393b0 Fix typos in translations 
CURA-10369
 2023-03-07 10:29:37 +01:00
c.lamboo
c60c322b11 Add resize handle to recommended window 
CURA-10076
 2023-02-24 14:28:13 +01:00
c.lamboo
f6d18266e6 Give the default settings pannel a max-height 
CURA-9793
 2022-12-15 13:37:28 +01:00
c.lamboo
2c7bd7883a Make recommended mode-window scrollable 
CURA-9793
 2022-12-13 17:05:51 +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
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
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
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
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
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
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
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
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
Remco Burema
9fe261ff58
Apply suggestions from code review. 
part of CURA-9347

Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
 2022-12-02 19:07:41 +01:00
Joey de l'Arago
02572311bf Components were clickable when hidden. 
CURA-9793
 2022-12-02 16:19:29 +01:00
Joey de l'Arago
5b76e3dd7c Add component with icon generic component. 
Add print walls and print top/bottom settings to recommended menu

CURA-9793
 2022-12-02 12:41:04 +01:00
Joey de l'Arago
dfb6c04d00 Add SingleSettingTextField.qml 
Added a workaround for states of inheriting components. See comments for details.

CURA-9793
 2022-12-02 11:48:50 +01:00
Remco Burema
3bc955fe8f Fix review comments. 
- Text was cutoff instead of wrapped in Save Custom Profile (Rename Dialog).
- Make the placeholder into a proper placeholder text.
- Fix spelling (save -> safe).
- Link didn't work as a link.
- Slightly better tooltips.

part of CURA-9347
 2022-12-01 14:57:05 +01:00
Joey de l'Arago
62bae7df19 Collapse the setting section when the switch for the section is disabled. 
Add collapse animation for setting items and setting section.

Swap out ColumnLayout for Layout. Animating the Layouts does not seem to be possible.

I had to put spacer back into the Column but it is the lesser of two evils.

CURA-9793
 2022-12-01 14:03:11 +01:00
Remco Burema
6f651b922a Profile compare-and-save: Add (more) explanatory text(s). 
part of CURA-9347
 2022-11-30 19:54:41 +01:00
Joey de l'Arago
574b1000f6 Add tooltips 
CURA-9793
 2022-11-30 17:44:58 +01:00
Joey de l'Arago
522bf60e81 Adjust left margins 
CURA-9793
 2022-11-30 15:43:14 +01:00
Joey de l'Arago
d617566db4 Move show custom button next to setting section title. 
CURA-9793
 2022-11-30 15:36:15 +01:00
Joey de l'Arago
b356335f4f Correct spelling mistake 
CURA-9793
 2022-11-30 15:10:19 +01:00
Joey de l'Arago
dbf2ae4f60 Fix spacing vertical between Recommended sections and setting items. 
CURA-9793
 2022-11-30 15:09:05 +01:00
Joey de l'Arago
0514c62b3e Remove bad height assignment to dynamic layout 
CURA-9793
 2022-11-30 14:51:45 +01:00
Remco Burema
c13deba1ea Build correct states for safe profiles flow (except actual safe). 
Re-use Discard Or Keep dialogue, but have different buttons. (Safe to New/Override instead of Keep/Discard.) The actual safa action is still the old one though (for either new button, it still goes to the old 'make a new profile' action). Besides that, some cosmetics have to be done to the texts as well still.

part of CURA-9347
 2022-11-30 12:40:07 +01:00
Joey de l'Arago
dbf27a432f Change confusing naming of section enable switch. 
CURA-9793
 2022-11-30 12:12:41 +01:00