GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,980 Commits 291 Branches 265 Tags
Commit Graph

305 Commits

Author SHA1 Message Date
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
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
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
Joey de l'Arago
c240833868 Add Support type settings 
CURA-9793
 2022-11-29 16:23:49 +01:00
Joey de l'Arago
b53c8aac54 Add single setting update ComboBox 
CURA-9793
 2022-11-29 16:16:50 +01:00
c.lamboo
0fc4773db3 Round possible fractional positional values 
CURA-9793
 2022-11-29 14:56:15 +01:00
c.lamboo
a470a6c333 Add indicator arrow to slider 
CURA-9793
 2022-11-29 14:37:45 +01:00
c.lamboo
f4e7829e0b Remove infill icon changing density on change slider 
Suggestion from @lorenzoromagnoli

CURA-9793
 2022-11-29 13:12:11 +01:00
c.lamboo
261adf06e7 Place InfillSlider in sperate file 
CURA-9793
 2022-11-29 10:32:47 +01:00
Joey de l'Arago
d9a2a3f5b7 cleanup 
CURA-9793
 2022-11-29 09:19:56 +01:00
Joey de l'Arago
5d5915e49e Make support selector functional 
CURA-9793
 2022-11-29 09:19:56 +01:00
c.lamboo
84988a57e5 Update styling of infill slider 
CURA-9793
 2022-11-28 22:01:28 +01:00
Joey de l'Arago
631d6a15b0 Add extruder button bar that shows icons for each extruder in a horizontal row 💪 
Make ExtruderButton more generic by moving functionality out.

Remove background color from ToolbarButton and add that background color to the Toolbar.qml.

Fix Toolbar border being created by overlapping rectangles instead of using border

Add scaling options for ToolBarButtons icon

CURA-9793
 2022-11-28 15:55:55 +01:00
c.lamboo
8e8437eab0 Split of getStringParts function 
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.

Cura-9773
 2022-11-28 13:10:52 +01:00
Joey de l'Arago
30d886cfcd Adjust setting first column width to match designs. 
CURA-9793
 2022-11-28 13:06:03 +01:00
Joey de l'Arago
4a59607d05 Switch to ColumnLayout 
Update part of Support selector to new layout.

CURA-9793
 2022-11-28 10:49:53 +01:00
Joey de l'Arago
ba958e1186 Changes by c.lamboo 2022-11-25 17:42:55 +01:00
Joey de l'Arago
eb13ac7f6b Getting setting section sized properly 
CURA-9793
 2022-11-25 17:42:50 +01:00
c.lamboo
76564f7bc4 Add dash between main, and suffix part of quality display name 
Cura-9773
 2022-11-25 16:46:21 +01:00
c.lamboo
52ee149edc Unify activeQualityDisplayNameMap string creation 
Generation quality display names in `CustomPrintSetup.qml` and `PrintSetupSelectorHeader.qml` were so similar that I decided to combine the logic.

Cura-9773
 2022-11-25 16:09:55 +01:00
Joey de l'Arago
ac2e733ea6 Add Section Header and Section Setting item components. 
Upgrade Adhesion to use new components

CURA-9793
 2022-11-24 17:24:28 +01:00
Joey de l'Arago
a7dc1b24bc Rename RecommendedInfillDensitySelector.qml since it will now be a more generic Strength selector 
CURA-9793
 2022-11-24 16:42:46 +01:00
c.lamboo
e25048d88a Add width to intent tool tips 
CURA-9746
 2022-10-12 15:29:08 +02:00