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

28163 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
17cab9946d Dark theming 
CURA-8688
 2022-02-25 18:18:43 +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
7bbea62558 Add base_colors to theme 
If the value of a color is a string, there will be an attempt to fetch this color from base_colors.

CURA-8688
 2022-02-25 14:56:24 +01:00
Jaime van Kessel
c356d37e06 Remove monitor_icon_size from theme 2022-02-25 14:32:34 +01:00
Jaime van Kessel
75ec6f508c Remove unneeded fixed line hight properties 
No idea why this was even done, but there just isnt' a reason to use these.
 2022-02-25 14:27:47 +01:00
Jaime van Kessel
3f4f7f0fcf Remove some extra unneeded theme stuff for monitor page 2022-02-25 14:12:25 +01:00
Jaime van Kessel
1589475dd4 Remove a slew of unusued colors in the theme 2022-02-25 13:54:50 +01:00
Jaime van Kessel
ff0b64a56a Purge bunch of unused sizes from theme 2022-02-25 13:33:32 +01:00
j.delarago
aba025b5b6 Unify dialog background coloring. 
CURA-8988
 2022-02-25 13:32:02 +01:00
Jaime van Kessel
5f638ed6c6 Generalize the size of the licence window 
No need to have a seperate size of the licence window. Just use
the default modal one
 2022-02-25 13:22:55 +01:00
Jaime van Kessel
b3d3f5546c Remove objectlist items from theme 
THey weren't used anyway, so time to clean up!
 2022-02-25 13:19:59 +01:00
Jaime van Kessel
9d202b9e61 Remove unused monitor items from theme 2022-02-25 13:18:45 +01:00
Jaime van Kessel
2327a71642 Remove monitor margin 
No idea why it was even there as it's own size.
 2022-02-25 13:16:59 +01:00
casper
2d4a389825 Fix dark mode issues for about dialog 
CURA-8688
 2022-02-25 12:12:57 +01:00
casper
4a71278d7c Fix monitor page 
CURA-8688
 2022-02-25 10:54:03 +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
Jaime van Kessel
f9e6135fca Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-02-24 13:44:21 +01:00
Casper Lamboo
9fa6698da3
Merge pull request #11536 from Ultimaker/CURA-8834_marketplace_packages_install_status_in_list 
Show install, uninstall & disable buttons in packages list
 2022-02-24 13:39:49 +01:00
Casper Lamboo
08466d426d
Merge pull request #11531 from Ultimaker/CURA-8762_marketplace_cleanup 
Marketplace cleanup
 2022-02-24 13:37:01 +01:00
Jaime van Kessel
26c027cbdf Remove unneeded properties from package card 
As per review.

CURA-8762
 2022-02-24 13:30:25 +01:00
Jaime van Kessel
0d2c8777c5 Add clarifying comment to a small hack 
CURA-8762
 2022-02-24 13:28:39 +01:00
Jaime van Kessel
19e43e8b66
Apply suggestions from code review 
CURA-8762

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-02-24 13:26:28 +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
095b8dc5dd Show install, uninstall & disable buttons in packages list 
This splits up the single show controls property into three seperate ones
and no longer hides installed packages from the plugin & materials list

CURA-8834
 2022-02-23 16:51:26 +01:00
j.delarago
7a2b609b32 Left Margin for Listview items was doubled. Remove margin to left align text with "Add a script" button. 
Swap default buttons for Cura.Primary/Cura.Secondary Buttons

CURA-8688
 2022-02-23 15:28:38 +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
Jaime van Kessel
6cbcf09580 Merge branch 'PP-96_update-(un)retract-speeds' of github.com:Ultimaker/Cura 2022-02-23 10:30:00 +01:00
Jaime van Kessel
df9d2d85c4 Add help links to banners 
CURA-8762
 2022-02-23 10:12:21 +01:00
Jaime van Kessel
35f1ad4097 Remove read more button on packagecard 
CURA-8762
 2022-02-23 09:59:12 +01:00
Jaime van Kessel
3b801e9f18 Change top external button to point to marketplace website 
CURA-8762
 2022-02-23 09:57:04 +01:00
Jaime van Kessel
d29b00b4be Let readmore point towards marketplace URL 
CURA-8762
 2022-02-22 16:38:47 +01:00
Jaime van Kessel
7926a2bbdc Add placeholders for material & plugin icons 
CURA-8762
 2022-02-22 16:33:52 +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
0d85b2be7f Ensure that scrollbar is centered 
CURA-8762
 2022-02-22 16:07:11 +01:00
Jaime van Kessel
a36fedabe5 Remove unused fontMetrics objects 
CURA-8762
 2022-02-22 15:53:07 +01:00
Jaime van Kessel
ac6375d17b Don't nest all content in background rect 
This way we don't have an extra identation depth, makes it a bit easier to read

CURA-8726
 2022-02-22 15:47:48 +01:00
Jaime van Kessel
a05650f64c Fix margins for OnboardBanner 
Re-usable components shouldn't really be setting layout themselves.
This should be done by whomever creates them.

The actual fix is that the banner no longe sets all margins, only left & right

CURA-8726
 2022-02-22 15:44:30 +01:00
Casper Lamboo
e8c4888f93
Merge pull request #11334 from Ultimaker/variable_walls_stitching 
Variable walls stitching
 2022-02-22 15:32:28 +01:00
Tim Kuipers
5d0454c180 Revert "reenable alternate_walls" 
This reverts commit 9b43ab3ad7.

The material_alternate_walls setting was supposed to be disabled.
Something to do with hardware.
See CURA- 8079
 2022-02-22 15:29:08 +01:00
Jaime van Kessel
0b39fb1c91 Hide download count in manage page 
CURA-8726
 2022-02-22 15:18:49 +01:00
Jaime van Kessel
adfb78e38a Fix spacing 
CURA-8762
 2022-02-22 15:11:11 +01:00
Jaime van Kessel
80f99b0a59 Fix positioning of marketplace searchbar 
CURA-8762
 2022-02-22 15:03:57 +01:00