3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
29423 commits 305 branches 270 tags 779 MiB
Commit graph

29423 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Joey de l'Arago
d518c3a0ca
Merge pull request #12009 from Ultimaker/CURA-9222_crash_for_multiple_extruders 
Use the correct function parameters when removing objects in menu
 2022-04-29 08:06:29 +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
Remco Burema
a2d721b6ac Always return int's. 
The problem was probably 'max', but cast the others just to be sure. (This would cause the C++ part of Qt to think it wasbeing given a float from Pyton somehow.)

should fix CURA-9196
 2022-04-26 16:54:46 +02:00
Remco Burema
854921c002 Fix typo in property. Not sure why this didn't crash tbh. 
done while investigating CURA-9196
 2022-04-26 16:52:23 +02:00
Jaime van Kessel
c4ec9142db Merge branch 'fix_missing_icons' of https://github.com/fieldOfView/Cura into 5.0 2022-04-26 15:55:10 +02:00
j.delarago
16bb9952c7 Fix marketplace external link button being tiny. 
CURA-9194
 2022-04-26 15:55:08 +02:00
Jaime van Kessel
a57c358a04
Merge pull request #11979 from Ultimaker/CURA-9203_infill_percentages_not_lining_up 
[CURA-9203] Infill selector misaligned
 2022-04-26 15:36:20 +02:00
Jaime van Kessel
15d1ded365 Change selectedTextColor for textfield 
CURA-9199
 2022-04-26 15:11:19 +02:00
j.delarago
049ab09119 I've changed the dot radius so they are circles again. 
I've simplified the dot spacing logic a bit.

For some reason the background does not line up perfectly with the slider. So when it is set to 0 there is still a slight offset on the slider handle.

CURA-9203
 2022-04-26 14:59:24 +02:00
Jaime van Kessel
3ecad03aee Use screenscale factor for maximumFlickVelocity 
Not sure if it fixes it for all OSes, but the documentation says that this
is a platform specific setting and it increases it by 1.25 for me. Since
the velocity is in pixels/s, it makes sense to have it depend on the screenscale
factor

CURA-9182
 2022-04-26 13:21:36 +02:00
j.delarago
45642486fa Fix popup going off the bottom of the screen by having popup push up instead of down when they are below halfway down the list. 
CURA-9185
 2022-04-26 12:02:43 +02:00
Jaime van Kessel
0213a3833c Fix the tooltip not re-sizing 
I'm not entirely sure if this fixes it on windows, but it does at least fix things on Linux.

There are a few important changes to note here:
1. Increased the time of the fade timer to 200ms
2. Removed the mousearea, instead using the hover of scrollview

So why are these important? Nr 1 seems to be because updates seem to be faster? If I set it to 100
I could get it to work reasonably well on qt5, but in qt6, it's about 50% of the times that i'm too slow.
So we need the extra time.

As for the mouse area, it seems that the scrollview was eating up all the hover / containsMouse events.
As scrollview has the same properties that we need, we can just get rid of the mouseArea

CURA-9112
 2022-04-26 10:50:29 +02:00
Jaime van Kessel
698adc45db Fix crash if 3mf writer could not be imported 
Fixes CURA-3NM (Sentry)
 2022-04-25 13:45:05 +02:00
Ghostkeeper
5b6a6aa497
Update dependencies used by Cura 
Took a while, but this should be an up-to-date list.

Contributes to issue CURA-9121.
 2022-04-25 12:18:19 +02:00
Ghostkeeper
3b24caed4f
Merge branch '5.0' 2022-04-25 11:14:24 +02:00
Ghostkeeper
6ce6412580
Update list of projects that can be updated without string freeze break 
Just this one, I'm afraid.

Contributes to issue CURA-9121.
 2022-04-25 11:14:13 +02:00
fieldOfView
fcad2101f4 Fix creating a single copy of a model 
Fixes #11897
 2022-04-23 10:50:27 +02:00
Aldo Hoeben
2af1d0a514
Reenable script(s) active indicator icon 2022-04-23 10:16:14 +02:00
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
Remco Burema
5d859ffacc
Merge pull request #11876 from Ultimaker/CURA-9146_missing_placeholder_images 
CURA-9146 missing placeholder images for Marketplace
 2022-04-22 13:38:19 +02:00
Jaime van Kessel
5330e53ae6 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-04-22 11:01:44 +02:00
j.delarago
68de54c803 Path for placeholder image was one to many folders up. 
CURA-9146
 2022-04-22 11:01:26 +02:00
Jaime van Kessel
d53a40a923 Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0 2022-04-22 11:01:17 +02:00
Jaime van Kessel
86534e78a0 Prevent error message when no further pages in marketplace could be loaded 
Contributes to #11858
 2022-04-22 11:00:45 +02:00
Casper Lamboo
f8bfd0ef28
Merge pull request #11839 from Ultimaker/CURA-9144_scrollbar_in_marketplace_libary_wrong 
CURA-9144 Scrollbar in Marketplace and Digital Library are acting up
 2022-04-22 10:36:57 +02:00
Jaime van Kessel
c1ed7b97f9 Use right enums for single instance 
CURA-9183
 2022-04-22 09:36:46 +02:00
Remco Burema
e1ec9d68f8
Merge pull request #11838 from Ultimaker/CURA-9134_misalinged_machine_label 
CURA-9134 Misaligned machine label
 2022-04-22 09:25:11 +02:00
j.delarago
c294680022 Fix scrollbar filling space by replacing custom implementation with generic UM.ScrollBar 
CURA-9144
 2022-04-21 15:52:15 +02:00
j.delarago
e5c2f5702c Subtract previously unused rightMargin from MachineSelectorButton width. 
CURA-9143
 2022-04-21 15:04:52 +02:00