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

29155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ghostkeeper
ae9b0e11bb
Merge branch 'master' of https://github.com/wanders78746/Cura into wanders78746-master 2022-05-04 16:39:39 +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
0c98ce2384 Use correct role for standardbutton 
Otherwise the no won't register...

CURA-9229
 2022-05-04 11:09:49 +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
Miroslav Sustek
4facaf4acb Finish Czech translation of v5.0 2022-05-02 23:07:29 +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
j.delarago
c11ff2ebf6 Add context to "By" string, lots of questions from the translators about this one. 2022-05-02 15:11:51 +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
Jaime van Kessel
15a480e7a9
Merge pull request #12055 from Ultimaker/CURA-9232_fix_menubar_not_catching_events 
[CURA-9232] Fix menubar not catching events
 2022-05-02 13:50:02 +02:00
j.delarago
6f7fbbecf7 Simplify enabled behaviour 
CURA-9232
 2022-05-02 13:17:36 +02:00
Cláudio 'Patola' Sampaio
956d85248f Updated pt_BR strings for Cura 5.0 2022-05-02 12:33:11 +02:00
Cláudio 'Patola' Sampaio
867e091bbf Updated pt_BR strings for Cura 5.0 beta 2022-05-02 12:25:08 +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
Jaime van Kessel
81a170fb7b
Merge pull request #11981 from Ultimaker/CURA-9194_tiny_marketplace_icon 
[CURA-9194] Tiny marketplace icon
 2022-05-02 10:22:34 +02:00
Miroslav Sustek
5c753632ff Almost finished Czech translation of v5.0 2022-05-02 00:20:08 +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
Ghostkeeper
0993e486f1
Fix JSON syntax error 
JSON doesn't support the extra comma at the end there. It's marked as a syntax error.

Contributes to issue CURA-9226.
 2022-04-29 10:01:23 +02:00
Ghostkeeper
f82660a630
Merge branch 'master' of https://github.com/MatiGabaglio/Cura into MatiGabaglio-master 2022-04-29 09:54:16 +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