3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28088 commits 313 branches 275 tags 718 MiB
Commit graph

28088 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6f27199bb9 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-23 14:09: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
j.delarago
c3abfec535 Combobox height/width was being resized by RowLayout causing it to be squished. Assigned a implicit width/height which is used instead of height/width. 
CURA-8688
 2022-02-23 12:00:11 +01:00
j.delarago
9f75b870a7 Swap "+" and "-" made from Rectangle elements for icons. 
CURA-8688
 2022-02-22 16:18:01 +01:00
j.delarago
e75993e7f3 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 
# Conflicts:
#	resources/qml/Preferences/MachinesPage.qml
 2022-02-22 10:41:25 +01:00
j.delarago
d40e91cc08 Remove unneccesary opacity assignment. 
Change padding to styled width

CURA-8688
 2022-02-22 10:37:13 +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
j.delarago
bc4222c34f Remove comments 
CURA-8688
 2022-02-22 09:16:50 +01:00
j.delarago
0b581c0e32 Update buttons in firmware page. 
CURA-8688
 2022-02-21 16:18:44 +01:00
j.delarago
30ca9ab469 Update spinbox to new design. Add reusable UnderlineBackground Component for background of newly designed elements. 
CURA-8688
 2022-02-21 15:44:16 +01:00
Jaime van Kessel
1632527651 Prevent crash when switching extruder in profiles page 2022-02-21 15:40:08 +01:00
Jaime van Kessel
ba6c0438a1 Fix size of signed out account screen 
CURA-8940
 2022-02-21 15:27:27 +01:00
j.delarago
ab21dcdfd4 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 14:19:49 +01:00
casper
16325229af Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 12:02:36 +01:00
j.delarago
26434f3db9 SettingPickDialog was very wide due to the screen factor scaling being removed. This gives it a fixed width the same as other dialogs. 
CURA-8688
 2022-02-21 11:19:14 +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
j.delarago
104a34d05a Vertically center aligns "Material", "PrintCore" and dropdowns in extruder configuration menu. 
CURA-8688
 2022-02-21 10:46:39 +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
j.delarago
c00eb5b432 Align checkbox with category icon in per object visibility settings dialog and preferences visibility settings. 
Move "Information" icon to the right of checkboxes in settings visibilty preferences page. This allows clean aligning of checkboxes with category icon.

CURA-8688
 2022-02-18 18:15:48 +01:00
j.delarago
d333b4639c Align per object settings visibility checkbox with icon 
CURA-8688
 2022-02-18 17:20:49 +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
j.delarago
7c9038b43c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 16:11:34 +01:00
casper
84fe432239 Use cura-styled button in machines page 
CURA-8688
 2022-02-18 16:11:25 +01:00
j.delarago
2ed1894a27 Set Dialog margin as it was in 4.13 
CURA-8688
 2022-02-18 16:11:18 +01:00
casper
ec186f140b Use cura-styled button in about page 
CURA-8688
 2022-02-18 16:01:51 +01:00
casper
7be54a47ec Use cura-styled button in settings pick dialog 
CURA-8688
 2022-02-18 16:00:03 +01:00
Jaime van Kessel
a458155258 Update look of the profilesPage 
CURA-8949
 2022-02-18 15:09:57 +01:00
casper
26470440f0 Update buttons in work space dialog 
Use Cura-styled buttons
Use dialog accecpt-reject handlers

CURA-8688
 2022-02-18 14:21:37 +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
casper
67c80e8a37 Update image loader dialog 
- Changed the slider to a Cura.Spinbox
- Use Cura-styled buttons

CURA-8688
 2022-02-18 14:02:09 +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
5134a071b1 Merge branch 'replace_controls_1_for_controls_2' into CURA-8688_qt6_cleanup 2022-02-18 10:55:09 +01:00
casper
d88f7d4267 Replace Cura.Checkbox with UM.CheckBox 2022-02-18 10:54:11 +01:00
j.delarago
e60b8ac30c Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-18 10:32:21 +01:00
j.delarago
9b05dbdb85 MenuItem height has to be set to 0 when visible: false otherwise there is white space in place of the MenuItem. 
This functionality is included in UM and was being overwritten in Cura.MenuItem.

CURA-8688
 2022-02-18 10:29:55 +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