GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 288 Branches 260 Tags
Commit Graph

1054 Commits

Author SHA1 Message Date
c.lamboo
dd7e16d258 Revert "Apply suggestions from code review" 
This reverts commit cbdd5e434b5c29de1ea57e0dfda79a36ab4f1340.
 2023-05-23 15:21:45 +02:00
Casper Lamboo
cbdd5e434b
Apply suggestions from code review 2023-05-23 15:17:23 +02:00
MariMakes
4d32e4d75b Improve readability of printjob name in Darkmode 2023-05-15 16:28:22 +02:00
Joey de l'Arago
bec02cf312 Fix extruder icon text scaling. I've added a new font size here since there is not any real way I can see to scale the font based on the component size. This is because we do some magic with the font numbers before passing them to the QML. 
CURA-9793
 2022-12-06 12:08:00 +01:00
Joey de l'Arago
ea5d4a8211 Make tickmarks bigger to avoid issues with pixel rounding errors causing the tickmarks to appear above or below the background line. 
CURA-9793
 2022-12-06 10:38:49 +01:00
Joey de l'Arago
5a415b8324 Remove black fill from icons. This fill prevents themeing 
CURA-9793
 2022-12-05 16:55:48 +01:00
jspijker
8058c16f00 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 16:45:33 +01:00
Joey de l'Arago
80e9f64c85 Fix overwritten theme name for slider 
Add property for background ticks.

CURA-9793
 2022-12-05 15:30:51 +01:00
Joey de l'Arago
f034c115be Rename slider theme items 
CURA-9793
 2022-12-05 15:11:48 +01:00
Joey de l'Arago
0738f996d0 Merge branch 'main' into CURA-9793_extend_recommended_print_settings 2022-12-05 11:39:51 +01:00
Joey de l'Arago
5b76e3dd7c Add component with icon generic component. 
Add print walls and print top/bottom settings to recommended menu

CURA-9793
 2022-12-02 12:41:04 +01:00
Joey de l'Arago
6338085999 Remove unused fill 
CURA-9793
 2022-11-30 15:11:45 +01:00
Joey de l'Arago
dbf2ae4f60 Fix spacing vertical between Recommended sections and setting items. 
CURA-9793
 2022-11-30 15:09:05 +01:00
Joey de l'Arago
e8ba3695b3 Swap out svg for clean export 
CURA-9793
 2022-11-30 14:41:35 +01:00
Joey de l'Arago
69af593d8c Make Slider generic component in UM. Make Infill slider into generic SingleSettinSlider which will work for any setting now. 
Change slider theme slighly.

CURA-9793
 2022-11-30 11:45:27 +01:00
Remco Burema
0ea2830108 Add the 'safe to profile' button itself. 
Currently only works for creating a new profile from current changes (when on top of a built-in profile). Only does the compare (not the safe yet) in the other circumstance. Also already anticipate the next commits by being able to hide the text and icon (because this will be added to the custom mode view as well).

part of CURA-9347
 2022-11-29 22:54:30 +01:00
Joey de l'Arago
7ba0281136 Move required settingPropertyProvider into InfillSlider. 
Use new RecommendedSetting components for Strength section of recommended.

CURA-9793
 2022-11-29 17:50:40 +01:00
jspijker
3682918efa Add basic styling to Switch 
Contributes to CURA-9793
 2022-11-29 08:42:14 +01:00
c.lamboo
84988a57e5 Update styling of infill slider 
CURA-9793
 2022-11-28 22:01:28 +01:00
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