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

1035 Commits

Author SHA1 Message Date
jspijker
b1ec8599d2 Use UltiMaker for themes 
Contributes to CURA-9808
 2022-11-28 11:39:07 +01:00
jspijker
adf2c16360 Fixed printer buttons conform UX design 
Contributes to CURA-8689
 2022-11-09 11:13:40 +01:00
c.lamboo
975775b7a0 Add various dark-mode welcome-page assets 
contributes to CURA-8689
 2022-11-02 14:15:37 +01:00
c.lamboo
1ebc0b487e Add various assets welcome-page assets 
contributes to CURA-8689
 2022-11-02 13:54:00 +01:00
Lorenzo Romagnoli
6e6b5cbbc4
Update logo.svg 2022-10-27 12:22:31 +02:00
c.lamboo
60a670f2ed Update light-mode cura_connected_printers svg 
Old one was not displaying on my machine

CURA-9422
 2022-08-31 15:56:02 +02:00
Remco Burema
4ea437ba28 Make send to DF in monitor for abstract printer work (again-ish). 
Already moslty implemented, but a new approach of the base feature (abstract cloud printers) made a more? elegant and functioning implementation possible.

(re)implements CURA-9422
 2022-08-31 14:13:47 +02:00
c.lamboo
426a5c3cc5 Add correct image in monitor page 
CURA-9422
 2022-08-29 10:40:35 +02:00
joeydelarago
90f53bbdc1 Adjust large button size 
CURA-9514
 2022-08-23 16:01:30 +02:00
joeydelarago
b18080c332 Rename AbstractStacksModel.py -> MachineListModel.py since this model includes both abstract machine stacks and regular machines 
Add machineCount for displaying the number of machines of a type.

MachineSelectorButton is in use in other places, swapped it out for a new Component MachineListButton.

CURA-9514
 2022-08-23 14:29:05 +02:00
Ghostkeeper
00cfa5dc4c
Remove fill colours from some icons 
The icons cannot be recoloured if they already have a colour.

Contributes to issue CURA-9465.
 2022-07-11 17:32:14 +02:00
Ghostkeeper
fdd96b30a7
Fix dark theme primary colour 
The dark theme was overriding the primary colour with the wrong Ultimaker Blue colour. There is a newer blue, and it was applied as 'accent_1'. The dark theme had its own version of that one too. But the old Primary colour was still the wrong one.

Contributes to issue CURA-9465.
 2022-07-11 17:18:01 +02:00
Jaime van Kessel
796f80c9b9 Remove fill from settings icon 
Otherwise we can't use it in UM.ColorImage

CURA-9465
 2022-07-11 16:38:37 +02:00
Jaime van Kessel
461165ea39 Set the correct color for inactive text 
It used to be all back, which is just unreadable...

CURA-9465
 2022-07-11 16:16:08 +02:00
j.delarago
6f8470167f Suggested changes 
CURA-8849
 2022-06-15 17:40:07 +02:00
j.delarago
8362d4c967 Switch to column layout in RecommendedPrintSetup.qml so that left margins can be put on infill selector and items below it. 
Add warning and reset button when custom profile is select and/or settings have been changed

CURA-8849
 2022-06-15 10:48:04 +02:00
j.delarago
40d473c243 Add circle with letter inside for non default intents 
CURA-8849
 2022-06-14 15:44:11 +02:00
j.delarago
a87695cd8d Added new intent selection buttons and resolution drop down to replace the matrix. 
We are now selecting intents first and then quality, however the container hierarchy quality -> intents. This is the reason for the new functions inside machine manager.

CURA-8849
 2022-06-14 11:41:38 +02:00
j.delarago
6f88adab8e Add new theme colors from figma 
CURA-8849
 2022-06-14 11:27:50 +02:00
j.delarago
e7d4038461 Add new icons for intents 
CURA-8849
 2022-06-14 09:59:52 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state 
Contributes to issue CURA-9217.
 2022-05-10 16:03:55 +02:00
Ghostkeeper
7fda81b678
Show a border around text fields and drop-downs when hovering 
And when they are focused.
This applies to the setting text fields, extruder selectors and drop-downs as well as to the machine settings.

Contributes to issue CURA-9217.
 2022-05-09 17:48:38 +02:00
Remco Burema
76d5f92975 Align colors disabled settings textfield (5 min fix). 
CURA-9252
 2022-05-05 17:54:06 +02:00
j.delarago
94e5a4e1db Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image. 
CURA-9104
 2022-04-11 14:10:27 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
j.delarago
e076779293 Remove fill from Check.svg which was overriding attempts to recolor image. 
CURA-9101
 2022-04-11 10:56:17 +02:00
Jaime van Kessel
279719099d Also remove fill from default extruderCOlor icon 2022-04-11 10:39:48 +02:00
Jaime van Kessel
17e7c263df Remove fill from extruderColor icon 2022-04-11 10:37:15 +02:00
c.lamboo
baa1d9b87d Use weights from figma 
Checked with @Lorenzo

CURA-8640
 2022-04-01 16:13:31 +02:00
c.lamboo
c6d62c9d83 Update font weights 
In qt6 the font weights are defined in the range 0..1000 where the weights in qt6 were defined in the range 10..100

CURA-8640
 2022-04-01 14:56:43 +02:00
casper
bfa8118c9f Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/ColorDialog.qml
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 13:39:16 +01:00
Jaime van Kessel
97124bf5a9 Fix various QML warnings 
CURA-8979
 2022-03-15 10:32:44 +01:00
Jaime van Kessel
f760ca146d Fix sizing of materialBrandSelection 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
 2022-03-15 10:25:56 +01:00
j.delarago
0ba4dbacc4 Make combobox_wide much wider and swap out existing uses of combobox_wide for combobox. 
CURA-8890
 2022-03-14 13:13:30 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00
casper
912db08b23 Let height of preferences_page_list themes value set height of list item 
CURA-9008
 2022-03-08 09:11:49 +01:00
10r3n20
4f2e7116b7 minor fix to align setting visibility with settings 2022-03-07 16:25:14 +01:00
j.delarago
37a4986406 Reduce width of preferences dialog page selection buttons. 
Reduce width of profiles list and printers list.

CURA-9008
 2022-03-07 16:17:03 +01:00
10r3n20
5499a4cc4c tiny improvements 2022-03-07 16:11:33 +01:00
j.delarago
016cc4e48f Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-07 13:37:58 +01:00
j.delarago
06a30a702c Update Settings view category items to new style 
Removed the fixed height from the SettingView list so that the SettingItems can have a larger height than the SettingCategory

CURA-9005
 2022-03-04 17:23:36 +01:00
j.delarago
719257bb63 Update validation colors to match new designs 
CURA-8991
 2022-03-04 15:05:30 +01:00
j.delarago
1eb16c0ec5 Update SettingTextField to match TextField 
CURA-8991
 2022-03-04 13:53:59 +01:00
j.delarago
7dabcfafb0 Add checkbox square coloring back. 
CURA-8991
 2022-03-04 13:48:01 +01:00
j.delarago
fb42679d08 Update TextField to match designs when disabled. 
CURA-8991
 2022-03-04 13:39:50 +01:00
j.delarago
b3e8c7190e Align radio buttons with new designs. 
Fix radiobutton looking the same checked and unchecked when disabled

CURA-8991
 2022-03-04 13:18:00 +01:00
j.delarago
a26b54f6e2 Fix checkboxes not showing check marks when disabled. 
Update checkboxes to align with new designs.

Update SettingCheckBox to match checkbox styling.

Remove duplicated styling inside cura-dark/theme.json

CURA-8991
 2022-03-04 11:28:11 +01:00
Jaime van Kessel
06eddc3419 Set border_main for darktheme to be darker 
CURA-8975
 2022-03-03 14:01:41 +01:00
j.delarago
b2bed4efdd Fix setting visibility styling working in one theme and not the other. 
CURA-8688
 2022-03-02 09:06:47 +01:00
j.delarago
1b6c3516bd Set default overlay background to background_1 
CURA-8688
 2022-03-01 14:37:48 +01:00