29052 Commits

Author SHA1 Message Date
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
Ghostkeeper
bb56a999ec
Merge branch '5.0' 2022-04-21 14:17:56 +02:00
Ghostkeeper
9389a6f4e8
Merge branch 'CURA-9146_account_sync' into 5.0 5.0-beta 2022-04-21 14:04:27 +02:00
Remco Burema
38d62b73c5 Mostly? fix scrollbars in settings-tooltips.
CURA-9112
2022-04-21 14:02:29 +02:00
Jelle Spijker
cab56bf48e
Merge pull request #11835 from Ultimaker/Changelog
Update change_log.txt
2022-04-21 13:25:25 +02:00
Ghostkeeper
1e7cf21f46
Merge branch '5.0' into CURA-9146_account_sync 2022-04-21 13:18:49 +02:00
fvrmr
4ca1235c26 Update change_log.txt
Removed @ from the contributors
2022-04-21 13:18:32 +02:00
Ghostkeeper
345f0ea41c
Fix copyright headers and code style a bit
Contributes to issue CURA-9146.
2022-04-21 13:18:03 +02:00
Jaime van Kessel
8383983ff4 Merge branch 'CURA-9070_dont_lose_focus_search_field' of github.com:Ultimaker/Cura into 5.0 2022-04-21 13:11:50 +02:00
Remco Burema
950a8cc3e6
Merge pull request #11831 from Ultimaker/Changelog
Update change_log.txt
2022-04-21 12:53:18 +02:00
fvrmr
b1d98e0e9f Update change_log.txt
Made some changes, discussed with @rburema
2022-04-21 12:52:19 +02:00
Jelle Spijker
81df26e4d9
Merge pull request #11833 from Ultimaker/CURA-9149_object_settings_ovelap
CURA-9149 Fix PerObjectSettings remove button layout
2022-04-21 12:48:48 +02:00
fvrmr
6b2a6b0a20 Update change_log.txt
Fixed a typo
2022-04-21 12:41:43 +02:00
j.delarago
9a0f693ef7 Wrapping Retrieval in DFRetrieval does not seem to work in QT6, the object returned only undefined for all enum values.
Fixed by creating and registering the enum inside DigitalFactoryController.py

CURA-9126
2022-04-21 12:02:06 +02:00
Casper Lamboo
a0ab13a0f5
Merge pull request #11832 from Ultimaker/CURA-9126_create_library_project
CURA-9126 Window not closing on creating new library project
2022-04-21 11:57:32 +02:00
j.delarago
5a8343ce25 Center remove button in row by giving it the same height as the input.
Adjust width of rows when scrollbar is present so they don't overlap.

CURA-9149
2022-04-21 11:56:17 +02:00
Remco Burema
8afb06f7ae Fix infill to 0% on upgrade to Cura 5.0.
This is a weird one, fortunately Jaime had the idea that it had to do with a spurious update to the visual element of the slider.

CURA-9127
2022-04-21 11:55:42 +02:00
fvrmr
1051b258cf Update change_log.txt
Updated the changelog
2022-04-21 11:37:05 +02:00
c.lamboo
9a3d089bd9 Properly add and remove menu items
Not really part of the ticket but logging was complaining

CURA-9146
2022-04-21 11:34:16 +02:00
c.lamboo
7a3af720a8 Resolve urls through qml
CURA-9146
2022-04-21 11:32:46 +02:00