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

5908 Commits

Author SHA1 Message Date
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
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