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

5396 Commits

Author SHA1 Message Date
casper
7ebc5eaac4 Use Cura.TextField in the spinbox component 
CURA-8688
 2022-03-01 09:30:02 +01:00
casper
8dde0f4fd2 remove debugging code 
beepboop

CURA-8688
 2022-02-28 16:51:34 +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
38b947f0fb Fix width in multiply dialog 
CURA-8688
 2022-02-28 15:57:36 +01:00
Jaime van Kessel
5725f3d57f Fix height of syncMaterialCards 
CURA-8688
 2022-02-28 15:46:04 +01:00
j.delarago
97f1b75870 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 14:56:27 +01:00
j.delarago
ce86e025d9 New style highlighting on borders 
CURA-8688
 2022-02-28 14:56:07 +01:00
Jaime van Kessel
79ee9ffc91 Fix warning spam in MainWindowHeader 
CURA-8688
 2022-02-28 13:48:30 +01:00
Jaime van Kessel
ea588d85fb Remove unneeded anchor from workspace summary dialog 
CURA-8688
 2022-02-28 13:47:27 +01:00
Jaime van Kessel
bb1a2a9988 Fix QML warning 
CURA-8688
 2022-02-28 13:46:29 +01:00
Jaime van Kessel
cc29e2398b Set correct text highlight color for TextField 
CURA-8688
 2022-02-28 13:35:56 +01:00
Jaime van Kessel
1f39a1b87f Add CuraStyled rename dialog 
CURA-8688
 2022-02-28 13:30:14 +01:00
Jaime van Kessel
f7852e4f9d Use correct menu type for setting contet menu 
CURA-8688
 2022-02-28 13:22:19 +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
83661ebd7f Remove duplicate color for primary button. 
Adjust secondary button colors to account for different colors being used between light and dark themes.

CURA-8688
 2022-02-28 12:02:51 +01:00
Jaime van Kessel
89345fcbbc Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:47:47 +01:00
Jaime van Kessel
8d3a5ac7e4 Ensure AskOpenAsProjectOrModel dialog uses cura styling 
CURA-8688
 2022-02-28 11:47:10 +01:00
j.delarago
4871c98451 Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 11:44:24 +01:00
j.delarago
7da5903ce3 Update RadioButton to new style 
CURA-8688
 2022-02-28 11:43:59 +01:00
Jaime van Kessel
78c19559d2 Ensure that Cura styling is applied to the workspace summary dialog 
CURA-8688
 2022-02-28 11:41:56 +01:00
Jaime van Kessel
b03fbc0d6d Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:26:58 +01:00
Jaime van Kessel
f82c0fe525 Merge branch 'replace_controls_1_for_controls_2' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 11:26:47 +01:00
Jaime van Kessel
26262e3cac Fix marketplace opening 2022-02-28 11:26:18 +01:00
j.delarago
440d6fa525 Update style of TextFIeld and ComboxBox to match new designs. Remove borders and radius on corners. 
Update Prefereces title to be bold and centered with button

Make prefereces pages selection buttons correct height.

CURA-8688
 2022-02-28 11:20:31 +01:00
j.delarago
b4edb89eb8 Align menubar colors with new designs. 
CURA-8688
 2022-02-28 10:21:16 +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
j.delarago
7ea0167486 Remove border highlight on hover over menu items, as per new designs 
CURA-8688
 2022-02-25 15:54:51 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring. 
CURA-8988
 2022-02-25 13:32:02 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog 
CURA-8688
 2022-02-25 12:12:57 +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
casper
2761aed455 Make number of columns configurable in color dialog 
CURA-8938
 2022-02-24 15:45:10 +01:00
casper
7dbe5c0f7c Change some margins 
CURA-8938
 2022-02-24 15:44:46 +01:00
casper
9b06849955 Let the content of the color dialog determine the size of the dialog 
CURA-8938
 2022-02-24 15:43:22 +01:00
casper
301d68ebf2 Update swatches on swatch color property changed 
CURA-8938
 2022-02-24 15:42:27 +01:00
Jaime van Kessel
6e59cd23bb Fix hide / show all in setting visibility page 
CURA-8978
 2022-02-24 15:32:39 +01:00
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
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