5714 Commits

Author SHA1 Message Date
c.lamboo
2f22002fd5 Add header and footer components to Dialog
This provides control over how the header (the header is newly introduced in this commit) and footer components are rendered. The footer is the area where the `leftButtoons` and `rightButtons` are rendered. Having control over how this is rendered introduces for instance the possibility to render the buttons within a warning area (an example of this can bee seen in the WorkspaceDialog).

CURA-6990
2022-06-06 21:45:48 +02:00
Ghostkeeper
979c436b6c
Make text area selection use theme colours
Also fix the highlight colour of the border. The highlight colour was changed in a later design but it was not changed here yet.
Without a theme colour it's going to use the system colours for the highlighting of text, which may be a very light grey that matches the background, making it impossible to see what part of the text is selected.

Hopefully fixes issue #12286.
2022-06-03 10:30:17 +02:00
Jaime van Kessel
8b02b4161b Merge branch 'fix_tall_toolbar' of https://github.com/fieldOfView/Cura 2022-05-18 13:29:42 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0'
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
2022-05-16 15:11:39 +02:00
Jaime van Kessel
fc7e0907f7 Merge branch 'CURA-9216_ToolTip' of github.com:Ultimaker/Cura into 5.0 2022-05-13 15:36:16 +02:00
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
Remco Burema
16eb78a5a7 Properly align center.
CURA-9106
2022-05-10 19:12:52 +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
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 f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
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
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
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
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
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
Ghostkeeper
f436d2f791
Merge branch '5.0' 2022-05-04 15:44:51 +02:00
Ghostkeeper
eae5f4d57a
Set colour of placeholder text from theme
Otherwise it defaults to black which is not readable in dark mode.

Done as a 5 minute fix.
2022-05-04 15:44:42 +02:00
Jaime van Kessel
02a2facb86 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-04 11:39:32 +02:00
Jaime van Kessel
76672528ee
Merge pull request #11977 from Ultimaker/CURA-9185_material_menu_cut_off
[CURA-9185] Material menu cut off in menu
2022-05-04 11:29:03 +02:00
Jaime van Kessel
7265509054 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-03 13:48:31 +02:00
Jaime van Kessel
c3918da6a5 Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0 2022-05-03 13:46:49 +02:00
Jaime van Kessel
f13ec6526b Disable the running property of the action button by default
This would cause scene updates to be drawn all the time, causing
constant cpu drain.
2022-05-03 13:45:56 +02:00
c.lamboo
cb4f1a8ab5 Replace SpinBox with NumericTextFieldWithUnit
CURA-9146
2022-05-02 17:07:52 +02:00
c.lamboo
4bb72cdd1a Set stepSize property on SpinBox that reflects its decimals
CURA-9201
2022-05-02 16:51:07 +02:00
Jaime van Kessel
cb359cdfe1 Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0 2022-05-02 14:59:48 +02:00
Jaime van Kessel
f1761a17d0 Fix size of setting extruder swatch 2022-05-02 14:59:28 +02:00
Jaime van Kessel
0d4abf9aa4
Merge pull request #12059 from fieldOfView/fix_phantom_menu
[5.0b1] Remove "phantom menu" when there is only a single FileProvider
2022-05-02 14:49:26 +02:00
j.delarago
6f7fbbecf7 Simplify enabled behaviour
CURA-9232
2022-05-02 13:17:36 +02:00
fieldOfView
28f609cbe2 Remove "phantom menu" when there is only a single FileProvider 2022-05-02 12:17:56 +02:00
j.delarago
1accb30408 The PrintSetupTooltip was catching events while invisible on the top left of the screen. This was causing the menubar not to be clickable.
I've disabled PrintSetupTooltip when not visible so that it does not catch events.

CURA-9232
2022-05-02 11:35:32 +02:00
fieldOfView
d1e52e5b76 Fix toolbar positioning when the toolbar is taller than its parent
Fixes #11990
2022-05-02 11:05:56 +02:00