Commit graph

31861 commits

Author SHA1 Message Date
Casper Lamboo
b4ccd690ea
Merge pull request #12161 from Ultimaker/CURA-9106_color_image_weird_scaling
[CURA-9106] Make parent item of ExtruderIcons handle all scaling.
2022-05-11 17:30:55 +02:00
c.lamboo
482d21c642 Fix for tooltip
Problem was that the mouse events were not properly propagated to the underlying mouse area. Fixed by placing the MouseArea on top of the content (instead of under) and allowing the mouse events to propagate through the mouse area.

CURA-9219
2022-05-11 17:23:54 +02:00
Remco Burema
f0d3686ee7 Fix alignment.
CURA-9106

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-05-11 15:36:44 +02:00
Casper Lamboo
e541eedde9
Merge pull request #12162 from Ultimaker/CURA-9147_double_resource_paths
Remove extra resource path from Python file
2022-05-11 10:12:13 +02:00
Remco Burema
16eb78a5a7 Properly align center.
CURA-9106
2022-05-10 19:12:52 +02:00
Ghostkeeper
4fd0d34b1c
Remove extra resource path from Python file
This was recently added. However it appears that we have the same path multiple times in the resources, leading to the resources being found twice. This would normally get removed by virtue of being a set, but not this time since it's a different way of writing the same path.
For the themes, it finds the following paths (in my unpacked directory): {'/home/trin/tempy/cura5/UM/../share/uranium/resources/themes', '/home/trin/tempy/cura5/cura/../share/cura/resources/themes', '/home/trin/tempy/cura5/share/cura/resources/themes', '/home/trin/.local/share/cura/5.0/themes', '/home/trin/tempy/cura5/share/uranium/resources/themes'} For both Cura and Uranium, this points to /home/trin/tempy/cura5/curanium/resources/themes twice. So let's remove this one.

Contributes to issue CURA-9147.
2022-05-10 18:10:32 +02:00
Remco Burema
5479479596 Make parent item of ExtruderIcons handle all scaling.
CURA-9106
2022-05-10 17:48:05 +02:00
Jaime van Kessel
f05e067f39 Merge branch '9145_fonts_look_ticker' of github.com:Ultimaker/Cura into 5.0 2022-05-10 16:24:40 +02:00
Jaime van Kessel
c1a5ca2288 Add Barbarian plugin to gitignore 2022-05-10 16:19:30 +02:00
Ghostkeeper
fb8f50e6ef
Merge branch '5.0' 2022-05-10 16:04:06 +02:00
Ghostkeeper
97e2d6a432
Use border only on active state
Contributes to issue CURA-9217.
2022-05-10 16:03:55 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
Remco Burema
c4f9669887 Move 'zh_TW' translation to incomplete status for 5.0.0
The volunteer translator who'd normally do this never replied to our email. Hopefully this can be rectified in the next version.
2022-05-10 13:31:37 +02:00
Jaime van Kessel
0ac4fa20fd Fix injection warning for hamburger menu 2022-05-10 13:30:24 +02:00
Jaime van Kessel
5c7423e007 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-10 13:23:28 +02:00
Jaime van Kessel
4819b2484e Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0 2022-05-10 13:11:05 +02:00
Jaime van Kessel
44a616addd Fix storing the "dont show this again" of the project saving 2022-05-10 10:26:39 +02:00
Ghostkeeper
12901e351e
Merge branch '5.0' 2022-05-09 17:48:50 +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
Ghostkeeper
a6698bcc4a
Merge branch '5.0' 2022-05-09 17:12:32 +02:00
Ghostkeeper
efdb21b7a1
Don't override size of extruder icons
Just let them be the default size of Cura.ExtruderIcon, which is the only correct size. It is already properly centred in the tab, too.

Contributes to issue CURA-9180.
2022-05-09 17:12:16 +02:00
Ghostkeeper
815a0b4014 Make buttons in account fill the whole width
That makes them easier to click.
The text of these buttons was going outside of the buttons themselves. That could be a problem, but it's not visible since the button has no background.

Contributes to issue CURA-9143.
2022-05-09 14:22:44 +02:00
Ghostkeeper
f483f04763 Set the width of model loading drop-down to the max of all elements
Then set the elements to be equal to that width, so they fill the complete width of the drop-down.

Contributes to issue CURA-9143.
2022-05-09 14:22:38 +02:00
Jaime van Kessel
325bf058e0 Merge branch 'CURA-9143_dropdown_item_width' of github.com:Ultimaker/Cura 2022-05-09 14:21:17 +02:00
Ghostkeeper
3c2c2219ac
Merge branch '5.0' 2022-05-09 14:01:40 +02:00
Ghostkeeper
763b40b8ec
Give icon of onboarding banner a colour
It had no colour, so it was defaulting to black.
I'm making it the same as the text colour and the colour of the X button.

Fixes issue CURA-9248.
2022-05-09 14:01:06 +02:00
Ghostkeeper
06c15f08aa
Make buttons in account fill the whole width
That makes them easier to click.
The text of these buttons was going outside of the buttons themselves. That could be a problem, but it's not visible since the button has no background.

Contributes to issue CURA-9143.
2022-05-09 11:59:00 +02:00
Ghostkeeper
f1d75fe827
Set the width of model loading drop-down to the max of all elements
Then set the elements to be equal to that width, so they fill the complete width of the drop-down.

Contributes to issue CURA-9143.
2022-05-09 11:54:28 +02:00
Jelle Spijker
6f7145bb12
Merge remote-tracking branch 'origin/5.0' 2022-05-09 11:05:47 +02:00
Jelle Spijker
334fca6691
Merge remote-tracking branch 'origin/gracefully_fail_cloud_printer' into 5.0 2022-05-09 10:54:07 +02:00
Bruno Henrique
5c4669316d Adding option: "Add prefix 'Printing'" 2022-05-07 15:14:05 -03:00
Remco Burema
ec5e22846e
Merge pull request #11278 from Eryone/master
Add eryone_thinker_directdrive profile
2022-05-06 19:12:00 +02:00
Remco Burema
9847286615 Update newly merged 3rd party printer settings version to current one. 2022-05-06 19:02:13 +02:00
Remco Burema
75a87005b2
Merge pull request #11255 from Toylerrr/master
Elegoo Neptune 2 Printer Configuration
2022-05-06 18:49:30 +02:00
Remco Burema
078b2613a5 Merge branch '5.0' 2022-05-06 18:31:54 +02:00
Casper Lamboo
d79921c964
Merge pull request #12114 from Ultimaker/CURA-9141_translate_5.0
Cura 9141 translate 5.0
2022-05-06 13:50:30 +02:00
fieldOfView
81c6ade445 Fix setting values 2022-05-06 13:25:48 +02:00
fieldOfView
8aa08944f2 Disable "Print Settings" fields for read-only materials 2022-05-06 13:11:49 +02:00
Mehmet Sutaş
897fc3997a Update rigid3d_base.def.json 2022-05-06 07:10:38 +03:00
Remco Burema
76d5f92975 Align colors disabled settings textfield (5 min fix).
CURA-9252
2022-05-05 17:54:06 +02:00
j.delarago
ba3913395c Add catalog to files that weren't translating
CURA-9141
2022-05-05 16:42:01 +02:00
Jaime van Kessel
f81176f243 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-05 13:40:21 +02:00
Jaime van Kessel
509b7d65d5 Fix error checking never setting state to "hasError"
CURA-9249

Fixes #12082
2022-05-05 13:39:30 +02:00
Remco Burema
d33bdf1099 Merge branch 'Patola-5.0-beta' into CURA-9141_translate_5.0 2022-05-05 13:37:01 +02:00
Remco Burema
b129f356a6 Merge branch '5.0-beta' of https://github.com/Patola/Cura into Patola-5.0-beta 2022-05-05 13:36:25 +02:00
Remco Burema
dca4fbd54e
Merge pull request #12049 from sustmi/czech-translations-v5.0
Czech translations v5.0
2022-05-05 13:34:09 +02:00
j.delarago
e2a63ec823 Add 11 language translations from Smartling
CURA-9141
2022-05-05 13:14:56 +02:00
j.delarago
8d627c2770 Merge branch '5.0' into CURA-9141_translate_5.0 2022-05-05 11:46:59 +02:00