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

6141 Commits

Author SHA1 Message Date
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
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
df8d0e9b46 Make it easier to override how the settingComboBox updates a setting. 
CURA-9793
 2022-12-02 18:01:12 +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
Joey de l'Arago
f24e6b1961 Fix NumericTextFieldWithUnit not validating text 
CURA-9793
 2022-12-01 17:09:41 +01:00
Joey de l'Arago
73137a140a Inherit UM.TextField in Cura.TextField and remove redundant properties 
CURA-9793
 2022-12-01 17:09:19 +01:00
Joey de l'Arago
df6ea1ea74 Rename TextFieldWithUnit.qml -> TextField and put all base textfield styling in it. 
CURA-9793
 2022-12-01 17:08:46 +01:00
Joey de l'Arago
9c4716416e Add validators that match validators for SettingTextField. 
CURA-9793
 2022-12-01 16:58:29 +01:00
Joey de l'Arago
01ebee4aea Cleanup 
CURA-9793
 2022-12-01 15:27:54 +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
Remco Burema
8f65af61e5 Connect compare-and-safe profile dialog buttons to actions. 
Some rework was needed as to not get the entire Preferences window to show up, which previously came along with the add profile action.

part of CURA-9347
 2022-11-30 18:48:07 +01:00
Joey de l'Arago
574b1000f6 Add tooltips 
CURA-9793
 2022-11-30 17:44:58 +01:00
Joey de l'Arago
487bf41a7b Add validators to project. 
CURA-9793
 2022-11-30 16:55:04 +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
c.lamboo
8ce2af290c Conditionally add ctrl+, hotkey to open settings 
Only do this for mac, as it is not customary on other OSes

CURA-9939
 2022-11-30 15:10:15 +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
680a86c896 Add default height to combobox, not sure why this was never set before. 
CURA-9793
 2022-11-30 15:08:06 +01:00
Joey de l'Arago
0514c62b3e Remove bad height assignment to dynamic layout 
CURA-9793
 2022-11-30 14:51:45 +01:00
Joey de l'Arago
75721f467b Remove margins and padding and scale icon better. 
CURA-9793
 2022-11-30 14:41:19 +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
Joey de l'Arago
4f8943412f Remove unused anchors 
CURA-9793
 2022-11-30 12:10:50 +01:00
Joey de l'Arago
69af593d8c Make Slider generic component in UM. Make Infill slider into generic SingleSettinSlider which will work for any setting now. 
Change slider theme slighly.

CURA-9793
 2022-11-30 11:45:27 +01:00
Remco Burema
79629e477d Small stuff: Swap Icons. Tooltips. Remove reduntant entries. 
part of CURA-9347
 2022-11-29 23:39:24 +01:00
Remco Burema
40b7233125 Also add save/reset buttons to custom profile. 
part of CURA-9347
 2022-11-29 23:18:15 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself. 
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
 2022-11-29 22:54:30 +01:00
Joey de l'Arago
7ba0281136 Move required settingPropertyProvider into InfillSlider. 
Use new RecommendedSetting components for Strength section of recommended.

CURA-9793
 2022-11-29 17:50:40 +01:00
Joey de l'Arago
f99f1a4528 Stop logging spam by checking before setting property. 
CURA-9793
 2022-11-29 17:49:26 +01:00
Joey de l'Arago
1224f076c3 Fix switch alignment 
CURA-9793
 2022-11-29 17:20:34 +01:00
Joey de l'Arago
c356b9d46f Rename ExtruderSelectorBar -> SingleSettingExtruderSelectorBar to be inline with new single setting widgets. 
Move common functionality into SingleSettingExtruderSelectorBar

Add adhesion settings

CURA-9793
 2022-11-29 17:00:55 +01:00
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker 
CURA 9808 UltiMaker
 2022-11-29 16:36:07 +01:00
Joey de l'Arago
c240833868 Add Support type settings 
CURA-9793
 2022-11-29 16:23:49 +01:00
Joey de l'Arago
788ab7da1b Fix broken combobox 
CURA-9793
 2022-11-29 16:16:50 +01:00
Joey de l'Arago
b53c8aac54 Add single setting update ComboBox 
CURA-9793
 2022-11-29 16:16:50 +01:00
Casper Lamboo
f4edc3a5d6
Update translation string 
Cura-9808
 2022-11-29 15:28:13 +01:00
c.lamboo
b22fafadbe Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory" 
because these are brand names.

CURA-9793
 2022-11-29 15:26:51 +01:00