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

5460 Commits

Author SHA1 Message Date
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
j.delarago
4510a8b06e Down spinbox button highlighting up spinbox button when clicked. 
CURA-8688
 2022-02-23 15:15:46 +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
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
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
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
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
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
casper
16325229af Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-21 12:02:36 +01:00
Jaime van Kessel
beae4f28f7 Change default sizes of menu 
CURA-8928
 2022-02-21 11:58:21 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade 
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
 2022-02-21 11:52:28 +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
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
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