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

894 Commits

Author SHA1 Message Date
Jaime van Kessel
efea7c9bed Clean up ordering of properties in profiles page 
Boyscouting; It was a bit of a mess

CURA-8982
 2022-03-03 14:25:33 +01:00
Jaime van Kessel
e569346750 Move scrollview caption over two lines 
CURA-8982
 2022-03-03 14:19:21 +01:00
Jaime van Kessel
950fc6f3da Hide hamburger menu if no item is selected 
CURA-8982
 2022-03-03 14:18:58 +01:00
Jaime van Kessel
802a80b702 Fix visibility of create new button in profiles page 
CURA-8982
 2022-03-03 14:12:55 +01:00
Jaime van Kessel
165172f919 Re-add Duplicate button in profiles page 
CURA-8982
 2022-03-03 14:08:47 +01:00
Jaime van Kessel
6b9e66cfb7 Add title to profiles page 
CURA-8982
 2022-03-03 14:06:27 +01:00
Remco Burema
901dc55733
Merge pull request #11535 from Ultimaker/CURA-8688_qt6_cleanup 
[CURA-8688] QT6 cleanup
 2022-03-02 16:49:53 +01:00
j.delarago
5dfc5971e3 Dialogs inheriting from incorrect Component, causing the buttons to be styled incorrectly 
CURA-8688
 2022-03-01 14:53:51 +01:00
casper
862525bc90 Remove obsolete uses of system palette 
CURA-8688
 2022-03-01 12:29:09 +01:00
casper
2949c0fcb3 Color icon in preference page according to theme color 
CURA-8688
 2022-02-28 16:13:36 +01:00
Jaime van Kessel
5725f3d57f Fix height of syncMaterialCards 
CURA-8688
 2022-02-28 15:46:04 +01:00
Jaime van Kessel
bb1a2a9988 Fix QML warning 
CURA-8688
 2022-02-28 13:46:29 +01:00
Jaime van Kessel
1f39a1b87f Add CuraStyled rename dialog 
CURA-8688
 2022-02-28 13:30:14 +01:00
Jaime van Kessel
6713056a49 Ensure that setting visibility filter is styled 
CURA-8688
 2022-02-28 13:15:39 +01:00
Jaime van Kessel
14b0f66c99 Remove hardcoded value for visibility preset selector 
CURA-8688
 2022-02-28 13:14:23 +01:00
j.delarago
e2fe50baf1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Widgets/Menu.qml
#	resources/qml/Widgets/MenuItem.qml
#	resources/themes/cura-dark/theme.json
#	resources/themes/cura-light/theme.json
 2022-02-28 08:51:42 +01:00
Jaime van Kessel
93a5c44e6c
Fix codestyle 
CURA-8978

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 17:22:10 +01:00
Jaime van Kessel
6e59cd23bb Fix hide / show all in setting visibility page 
CURA-8978
 2022-02-24 15:32:39 +01:00
j.delarago
b14e29d214 Make general menu combox wider 
CURA-8688
 2022-02-23 15:13:36 +01:00
j.delarago
111c095f32 Swap RadioButton for styled Cura.RadioButton 
CURA-8688
 2022-02-23 15:04:58 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog 
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
 2022-02-23 14:09:38 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Jaime van Kessel
1343d7bdf9 Change font of camera rendering label 
CURA-8949
 2022-02-21 11:15:30 +01:00
Jaime van Kessel
b2494f4d2e Change the moreInfo button for slice statistics 
CURA-8949
 2022-02-21 11:07:47 +01:00
Jaime van Kessel
ec407a81d3 Change ordering of some items in general page 
As per design

CURA-8949
 2022-02-21 10:19:02 +01:00
Jaime van Kessel
8b987d9537 Remove id left over from copy paste 
CURA-8949
 2022-02-21 10:05:09 +01:00
Jaime van Kessel
8e55dda3cc Switch old checkbox over to styled variant 
CURA-8949
 2022-02-21 10:03:44 +01:00
Jaime van Kessel
af99b87bef Remove close button 
No idea why it was there in the first place. The dialog itself can be closed...

CURA-8949
 2022-02-18 16:28:10 +01:00
Jaime van Kessel
d6b2b951f2 Hide background if no item is selected 
CURA-8949
 2022-02-18 16:15:43 +01:00
Jaime van Kessel
3a1d5a29fa Add background to profiles page 
CURA-8949
 2022-02-18 16:12:23 +01:00
Jaime van Kessel
a458155258 Update look of the profilesPage 
CURA-8949
 2022-02-18 15:09:57 +01:00
Jaime van Kessel
9df7ccd5cc Let profiles page use ManagementPage 
No idea why it didn't in the first place. This caused a lot of code duplication.

CURA-8949
 2022-02-18 14:20:16 +01:00
Jaime van Kessel
742f0b7dbb Add defaults button to setting visibility page 
CURA-8949
 2022-02-18 12:49:59 +01:00
Jaime van Kessel
5aed6bb3c8 Move reset to defaults button for general page 
CURA-8949
 2022-02-18 12:33:07 +01:00
Jaime van Kessel
2d0ce01ff5 Add menu to react on the hamburger menu 
CURA-8949
 2022-02-18 12:28:03 +01:00
Jaime van Kessel
8feaa32769 Codestyle cleanups 
Mostly just removing ;'s from QML

CURA-8949
 2022-02-18 11:28:40 +01:00
Jaime van Kessel
46e7217646 Layout tweaks for general page 
CURA-8949
 2022-02-18 11:22:19 +01:00
Jaime van Kessel
3e5a51503e Change font of the headings in general page 
CURA-8949
 2022-02-18 10:59:23 +01:00
Jaime van Kessel
ee7bcc3f5f Use UM checkbox 
CURA-8949
 2022-02-18 10:27:08 +01:00
Jaime van Kessel
48fa6cddf0 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8949_preferences_styling 2022-02-18 10:24:06 +01:00
Jaime van Kessel
6e5e5152be Change machine actions buttons to secondaryButtons 
CURA-8949
 2022-02-18 10:14:47 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars 
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
 2022-02-18 09:07:25 +01:00
casper
9f7581d4e8 Remove ReadOnlyTextField 
and use a
```
UM.TextField
{
   enabled: false
}
```
instead

CURA-8688
 2022-02-18 08:57:38 +01:00
Jaime van Kessel
5f9e916f29 Merge branch 'Ok_button_dialog' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:21:15 +01:00
Jaime van Kessel
f7dc2fc2d1 Merge branch 'materials_sync' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:13:15 +01:00
Jaime van Kessel
f682f56923 Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-17 15:02:03 +01:00
Jaime van Kessel
13227249b5 Remove catalog from Textfield 
The creation of the catalog is rather slow, so it's better not to create it for every component
 2022-02-15 16:28:29 +01:00
Jaime van Kessel
eb7ab657fe Use Cura.Textfield in readonlyTextfield 
Less code duplication, which is always good

CURA-8685
 2022-02-15 16:26:58 +01:00
Jaime van Kessel
d7758c0ee9 Swap out the GeneralPage items to use the themed ones 
CURA-8685
 2022-02-15 16:11:06 +01:00
Jaime van Kessel
6be75c75f8 Simpify Readonly textarea 
CURA-8685
 2022-02-15 15:18:04 +01:00