Commit graph

13021 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
j.delarago
e5c2f5702c Subtract previously unused rightMargin from MachineSelectorButton width.
CURA-9143
2022-04-21 15:04:52 +02:00
Ghostkeeper
9389a6f4e8
Merge branch 'CURA-9146_account_sync' into 5.0 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
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
fvrmr
6b2a6b0a20 Update change_log.txt
Fixed a typo
2022-04-21 12:41:43 +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
66fde9100c Use QML defined enum in sync state
These are the enums from cura/API/account.py
somehow exposing these enums from python to QML doesn't work properly anymore
A better solution should be found in the very near future

CURA-9146
2022-04-21 11:32:03 +02:00
Ghostkeeper
3f9c7c55dc
Fix search field losing focus when scrolling the setting list
When scrolling the setting list, it was clearing the focus in order to close the pop-ups in the setting list. If pop-ups like for the infill pattern or extruder selection settings are not closed, the pop-up part is still rendered even if the user scrolls those settings out of view, causing the pop-up to appear somewhere on top of completely unrelated interface elements. It scrolls all the way to the top of the screen, effectively.

I couldn't find a way to cause pop-ups to be clipped with the rest of the contents of the ListView. They are always rendered on top due to the nature of the pop-up. I could find a way to trigger pop-ups to close upon changing the scrolled position without changing the focus, but that method was fairly complex with a bunch of `Connection`s and an extra signal. This is by far the simplest solution.

Contributes to issue CURA-9070.
2022-04-21 11:17:13 +02:00
Remco Burema
c002a52b50 Remove animations from custom settings view.
They never properly worked anyway, and now they cause the items to overlap.

CURA-9160
2022-04-21 11:11:28 +02:00
Casper Lamboo
1b228ecc07
Merge pull request #11824 from Ultimaker/upgrade_sdk_to_800
Upgrade SDK version to 8.0.0 for Cura 5.0
2022-04-20 12:16:02 +02:00
Jaime van Kessel
271868eafd Fix export material to usb
CURA-9122
2022-04-20 11:23:35 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
Jaime van Kessel
f070a695b1 Change standardbutton.yes & no to dialog.yes & no 2022-04-19 17:10:51 +02:00
Jaime van Kessel
1ce84fec69 Fix all import dialogs
Fixes CURA-9129
2022-04-19 17:09:02 +02:00
Jaime van Kessel
965ecb744d Fix size of print setup selector
CURA-9139
2022-04-19 16:42:43 +02:00
Jaime van Kessel
fc03d6dfd8 No longer inject close argument
Fixes warning in the log
2022-04-19 15:08:45 +02:00
Jaime van Kessel
5a62278097 Fix display of username
CURA-9146
2022-04-15 10:16:00 +02:00
Jelle Spijker
981df9f928
Update resources/qml/TableView.qml
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2022-04-14 14:49:42 +02:00
Jaime van Kessel
25839c6d97 Fix direction of pointing rectangle
Turns out that using anchors doesn't quite work anymore due to qt6 upgrade. Oh well!
CURA-9137
2022-04-13 17:36:47 +02:00
Jaime van Kessel
a6db27dd55 Prevent tootltip from showing during "processing" of slice button
CURA-9150
2022-04-13 16:29:25 +02:00
j.spijker@ultimaker.com
cb9b5961c3
Removed last remnants of RecolorImage
This was still being used in the MaterialBrandsMenu and the SimpleButton
Probably why the X es were missing from the info messages. CURA-9110

Contributes to CURA-8640
2022-04-13 12:40:54 +02:00
Ghostkeeper
6f83927ec3
Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-12 14:11:36 +02:00
j.delarago
3674af01b7 selectExisting is replaced with using fileMode:FileDialog.OpenFile in QT6. This forces selecting an existing file.
This is also the default value in QT6 so this line can be removed without changing the functionality
2022-04-12 10:21:34 +02:00
j.delarago
94e5a4e1db Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image.
CURA-9104
2022-04-11 14:10:27 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
j.delarago
e076779293 Remove fill from Check.svg which was overriding attempts to recolor image.
CURA-9101
2022-04-11 10:56:17 +02:00
Jaime van Kessel
279719099d Also remove fill from default extruderCOlor icon 2022-04-11 10:39:48 +02:00
Jaime van Kessel
17e7c263df Remove fill from extruderColor icon 2022-04-11 10:37:15 +02:00
j.delarago
c4baece3ac Remove reference to nonexistent property source size in UM.ColorImage which was causing add printer page to be empty
CURA-9098
2022-04-11 09:52:33 +02:00