GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 10:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,476 Commits 294 Branches 267 Tags
Commit Graph

28476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
5725f3d57f Fix height of syncMaterialCards 
CURA-8688
 2022-02-28 15:46:04 +01:00
Jaime van Kessel
4099655004
Merge pull request #11571 from Ultimaker/CURA-7924_sip_cmake_build 
Cura 7924 sip cmake build
 2022-02-28 15:29:36 +01:00
Jaime van Kessel
24463fbd45 Merge branch 'CURA-8688_qt6_cleanup' of github.com:Ultimaker/Cura into CURA-8688_qt6_cleanup 2022-02-28 15:24:40 +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
62f6643a49 Add checkbox disabled color to darktheme 
CURA-8688
 2022-02-28 14:08:26 +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
c6e2561dbb Fix styling for Machine Settings 
CURA-8688
 2022-02-28 13:19:56 +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
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog 
CURA-8688
 2022-02-28 12:20:46 +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
casper
7f859651dd Merge remote-tracking branch 'origin/CURA-8688_qt6_cleanup' into CURA-8688_qt6_cleanup 2022-02-28 11:50:08 +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
casper
0a214b2c47 Fix dark mode issues Post processing plugin 
Also revamped the post-processing list a bit.

CURA-8688
 2022-02-28 11:41:21 +01:00
Jaime van Kessel
7fd6601b1a Apply theming to perObjectCategory 
CURA-8688
 2022-02-28 11:37:51 +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.spijker@ultimaker.com
ca430c80be
Change imported namespace pySavitar to Savitar 
Because we had to rename our Python bindings module from Savitar to
pySavitar we also changed our import downstream (Cura and Uranium). But
in order to limit the changes on our existing code we decided during the
review that we should just import pySavitar as Savitar.

Contributes to CURA-7924
 2022-02-28 10:44:16 +01:00
j.spijker@ultimaker.com
47588393e8
Use Arcus as namespace 
Because we had to rename our Python bindings module from Arcus to pyArcus
we also changed our import downstream (Cura and Uranium). But in order
to limit the changes on our existing code we decided during the review
that we should just import pyArcus as Arcus.

Contributes to CURA-7924
 2022-02-28 10:41:24 +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
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
Remco Burema
7511ac843e Changes needed wrt how we build Savitar with Sip 6. 
part of CURA-7924
 2022-02-25 14:31:51 +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
Remco Burema
08c49c6c13 Changes needed wrt how we build Arcus with Sip 6. 
part of CURA-7924
 2022-02-25 14:27:06 +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
Remco Burema
99449dbc34 Get rid of some errors first. 
Was using Qt5 still, even though we're dumping that. Need a bit of a level playing field for an update to the way we handle libArcus and libSavitar.

part of CURA-7924
 2022-02-25 13:25:35 +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