3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28113 commits 307 branches 272 tags 787 MiB
Commit graph

5234 commits

Author SHA1 Message Date
Jaime van Kessel
96751a0cc0 Merge branch 'CURA-8980_fix_monitor_buttons' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 15:22:15 +01:00
j.delarago
61beb963c2 Swap flat buttons for Cura Styled buttons. 
These "buttons" function like radiobuttons so a bit of extra styling needed to be added to swap appearance.

Removed fixed width as it breaks centering with Cura buttons

CURA-8980
 2022-02-24 14:58:07 +01:00
Evangelos Trantos
a2ce010ec1
Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes 
Menu visual fixes
 2022-02-24 13:22:56 +01:00
j.delarago
41e04f2e9d Progress bar causing crash due to incorrect min max value variable names. 
Give buttons fixed leftMargin in monitor page so icons are center aligned.

CURA-8980
 2022-02-24 11:34:48 +01:00
Jaime van Kessel
5d28994b87 Use cura styled combobox 2022-02-22 14:47:27 +01:00
Jaime van Kessel
2c6ba3cd5d Update some USB printing items to controls 2 2022-02-22 11:58:14 +01:00
Jaime van Kessel
f347c6aedf Remove number of unused styles imports 2022-02-22 11:42:41 +01:00
Jaime van Kessel
53331f4757 Remove unused imports 2022-02-22 11:39:00 +01:00
Jaime van Kessel
25d2ed14dd Ensure contentWidth is calculated correctly 
CURA-8948
 2022-02-22 11:31:46 +01:00
Jaime van Kessel
a14c160d86 Expose flickable direction for TableView 
CURA-8948
 2022-02-22 11:28:33 +01:00
Jaime van Kessel
8cf9fe7941 Add noWrap to all labels in configurationMenu 
CURA-8941
 2022-02-22 10:55:22 +01:00
Joey de l'Arago
9acf35936b
Merge pull request #11506 from Ultimaker/CURA-8949_preferences_styling 
Styling of preferences screens
 2022-02-22 10:10:21 +01:00
Jaime van Kessel
ba6c0438a1 Fix size of signed out account screen 
CURA-8940
 2022-02-21 15:27:27 +01:00
Jaime van Kessel
6e8c708f35 Change genericMaterials menu to customized menu 
CURA-8928
 2022-02-21 13:26:14 +01:00
Jaime van Kessel
85926c6f7a Add padding to menu 
CURA-8928
 2022-02-21 13:25:00 +01:00
Jaime van Kessel
b0d944f92d Change all unstyled menuseperators to styled ones 
CURA-8928
 2022-02-21 13:21:51 +01:00
Jaime van Kessel
b79c77cb33 Add left & right padding for MenuSeperator 
CURA-8928
 2022-02-21 13:20:04 +01:00
Jaime van Kessel
c3745b42b6 Switch contextMenu to Cura.Menu 
This fixes all the styling issues that it still had

CURA-8928
 2022-02-21 13:15:09 +01:00
Jaime van Kessel
58d04420ed Ensure that edit & help menu have the right styling 
They were still using the default Qt Menu instead of Cura.Menu

CURA-8928
 2022-02-21 13:13:27 +01:00
Jaime van Kessel
390d12495e Update highlight color of menu 
CURA-8928
 2022-02-21 13:08:53 +01:00
Jaime van Kessel
beae4f28f7 Change default sizes of menu 
CURA-8928
 2022-02-21 11:58:21 +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
2b220c627f Disable wordwrap in combobox 
CURA-8949
 2022-02-18 11:06:33 +01:00
Jaime van Kessel
3e5a51503e Change font of the headings in general page 
CURA-8949
 2022-02-18 10:59:23 +01:00
casper
d88f7d4267 Replace Cura.Checkbox with UM.CheckBox 2022-02-18 10:54:11 +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
b5136ba70c Fix merge conflics 2022-02-17 15:07:48 +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
c528616d12 Set selection color of textfields 
CURA-8947
 2022-02-17 14:39:11 +01:00
Jaime van Kessel
821581bc65 Remove ProgressBar style and use UM.ProgressBar instead 
CURA-8685
 2022-02-15 17:07:22 +01:00