GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 00:34:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,744 Commits 291 Branches 260 Tags
Commit Graph

8996 Commits

Author SHA1 Message Date
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
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
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
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
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
698adc45db Fix crash if 3mf writer could not be imported 
Fixes CURA-3NM (Sentry)
 2022-04-25 13:45:05 +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
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
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
Ghostkeeper
9389a6f4e8
Merge branch 'CURA-9146_account_sync' into 5.0 2022-04-21 14:04:27 +02:00
Ghostkeeper
1e7cf21f46
Merge branch '5.0' into CURA-9146_account_sync 2022-04-21 13:18:49 +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
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
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
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
c.lamboo
7a3af720a8 Resolve urls through qml 
CURA-9146
 2022-04-21 11:32:46 +02:00
c.lamboo
d0a35bad3d Use updated type definitions 
CURA-9146
 2022-04-21 11:29:42 +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
15b16e3e45 Remove overlap in perobject setting panel 
CURA-9149
 2022-04-19 17:27: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
773ff5fa7e Remove unneeded renderType 
CURA-9146
 2022-04-19 11:21:12 +02:00
Jaime van Kessel
3aff3d5825 Fix "read more" not being translated 
Yeah, i know, this breaks the stringfreeze. But this wasn't translated in the
first place. So the actual effect here is zero (but at least it will be translated
in the next round!)

CURA-9146
 2022-04-19 11:19:58 +02:00
Jaime van Kessel
05263b9a58 Fix layout of dialog 
CURA-9146
 2022-04-19 11:17:38 +02:00
Jaime van Kessel
3ed182cd74 Rename MarketplaceLicenseDialog to MultipleLicenceDialog 
CURA-9146
 2022-04-19 11:08:54 +02:00
Jaime van Kessel
5ce5ce769e Re-add the CloudSync functionality 
It got removed in the marketplace upgrade.

CURA-9146
 2022-04-15 13:12:06 +02:00
Jelle Spijker
02a2d9c012
Update plugins/ModelChecker/ModelChecker.qml 
Looks like a left over

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-04-14 14:49:35 +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
ddb3ed1693 Fix crash in image reader and ensure it actually works 
CURA-9125
 2022-04-13 16:58:37 +02:00
Jaime van Kessel
50954552d2 Fix thumbnail creation 
CURA-9120
 2022-04-13 16:53:11 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Jaime van Kessel
dd037fa946 Make "create new" button visible 
CURA-9126
 2022-04-13 16:25:24 +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
Ghostkeeper
70fdffb1c9
Allow redirects when talking with printer API 
Because newer firmware will redirect this API call.

Contributes to issue CURA-9119.
 2022-04-11 13:23:03 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
Ghostkeeper
0deac84ec2
NetworkError is an enum, no longer comparable as int 
With the Qt6 upgrade, we have to treat enums as full enums, within their normal class namespace and such. They are no longer just integer-globals static in the QtCore.Qt class. They are no longer treated as integers by PyQt.
Other places that checked for such errors were already doing it like this.

Contributes to issue CURA-9100.
 2022-04-11 10:00:32 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
j.delarago
b2b1961b57 Merge branch 'master' into qt6_beyond_the_splash 
# Conflicts:
#	cura/PrinterOutput/PrinterOutputDevice.py
 2022-04-06 15:24:30 +02:00
Jaime van Kessel
ef6f76fc98 Fix parameter injection deprecation warning 2022-04-06 11:24:17 +02:00
j.delarago
00c7c37b34 LinearGradient is not available for 2d shapes in QT6 
Replace LinearGradient with Gradient in preview color scheme drop down

CURA-8640
 2022-04-06 10:50:33 +02:00
Jaime van Kessel
c88ed076a1 Fix resolving of URL's 2022-04-06 09:57:45 +02:00
Jaime van Kessel
605280255f Use right enum for alignment 2022-04-06 09:53:48 +02:00
Jaime van Kessel
3c6412d5d7 FIx deprecation warning 2022-04-06 09:53:27 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick 
CURA-8640
 2022-04-05 16:10:39 +02:00
j.delarago
6d2293db08 Remove unused Table in DigitalLibary Plugin 
CURA-8640
 2022-04-05 15:55:45 +02:00