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

5707 Commits

Author SHA1 Message Date
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
Casper Lamboo
f33aaa529b
Merge pull request #12007 from Ultimaker/CURA-9214_export_profile_doesnt_work 
[CURA-9214] Can't export profiles, also fixes exporting materials
 2022-04-29 10:37:50 +02:00
Casper Lamboo
784cd2c99b
Apply suggestions from code review 2022-04-29 10:30:11 +02:00
Joey de l'Arago
d12703289b
Merge pull request #11906 from fieldOfView/fix_single_copy_multiply 
[5.0b1] Fix creating a single copy of a model
 2022-04-29 08:14:03 +01:00
Jaime van Kessel
6b9cc3f1c7 Use the correct function parameters when removing objects in menu 
It turns out that the order of these functions matters. So when we created a
function with only one param, it would actually give it the index. Removing
with the index didn't work, so the object would still be there. The Qt objects
would already be deleted which caused segfaults

CURA-9222
 2022-04-28 17:03:41 +02:00
j.delarago
8bb1b0bee8 selectedNameFilter is now an object instead of a string. The nameFilter has to be manually pulled out using the index in selectedNameFilter. 
If only one filter is supplied to nameFilters, the index will always be -1. I assume this is because we are not selecting the file type in the Dialog, it just defaults to the only item.

This code should still work if the behaviour is changed in the future.

FileDialog now uses currentFolder instead of folder.

CURA-9214
 2022-04-28 14:29:44 +02:00
Jaime van Kessel
8af6b46708 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-04-28 13:26:56 +02:00
Jaime van Kessel
2ecec1fa37 Prevent last line of popup to be cut off 
We didn't take the y offset into account

CURA-9112
 2022-04-28 13:23:41 +02:00