GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 289 Branches 260 Tags
Commit Graph

9061 Commits

Author SHA1 Message Date
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
j.delarago
e86f860a2c Update TableView and TableModel in DigitalLibrary plugin. 
This is not backwards compatible with Cura < 5.0 due to the removal of Qt.labs

CURA-8640
 2022-04-05 15:47:08 +02:00
j.delarago
184f4b808e Bump QtQuick version to fix RegularExpressionValidator import 
CURA-8640
 2022-04-05 15:11:07 +02:00
j.delarago
4ec2edec67 Add replacement for QT.labs.models.TableModel 
Implementation is intended to function the same as before.

CURA-8640
 2022-04-05 15:03:45 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
Jaime van Kessel
4520fc15f9 Fix display of UM monitor page 2022-04-01 13:45:11 +02:00
j.delarago
cfad991120 Popup will now resize based on the implicitWidth/implicitHeight of it's children. 
This causes a binding loop when using layouts like Column.

To resolve this the height/width of the popup in ExpandablePopup can now be set explicitly with contentWidth and contentHeight

For ExpandablePopups with contentItems that are not Layouts the implicitWidth/implicitHeight can be set directly in the contentItem.

CURA-8640
 2022-04-01 09:31:27 +02:00
Jaime van Kessel
2c09c83896 Fix crash when opening marketplace 2022-03-31 14:21:29 +02:00
Jaime van Kessel
af712785c8 No longer inject parameters into function handling in qml 2022-03-31 14:16:57 +02:00
Jaime van Kessel
96444dbc09 Use correct keyboard enums 2022-03-31 13:54:24 +02:00
Jaime van Kessel
5aceec6209 Use right enum 2022-03-30 17:33:43 +02:00
c.lamboo
4f70d34631 wip qt changes 2022-03-30 16:55:56 +02:00
c.lamboo
337e2aa4bb Update set deamon logic 
`setDaemon(True)` has been deprecated

CURA-8640
 2022-03-30 15:12:44 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator 
Due to Qt6 API change

CURA-8640
 2022-03-30 15:10:37 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6 
Update imports to use correct version number.

CURA-8640
 2022-03-29 16:04:02 +02:00
Ghostkeeper
c658ad6d3a
Correct new preferences version 
Apparently this was also incremented since we made the original version of this upgrade for 4.9. Works now.

Contributes to issue CURA-8466.
 2022-03-29 15:11:51 +02:00
Ghostkeeper
0eed64a2ea
Upgrade 19 to 20, not 17 to 19 
I was mixing up the versions there. The new version needs to be 20, since 19 was already used for 4.13. We can't use 18 since that was reserved by the betas from which we can never upgrade.

Contributes to issue CURA-8466.
 2022-03-29 14:53:50 +02:00
Ghostkeeper
764e18d62c
Don't disable fuzzy skin any more 
It's added back in for the stable release.

Contributes to issue CURA-8466.
 2022-03-29 14:13:30 +02:00
Ghostkeeper
60b1876a24
Replace Equalize Filament Flow with equivalent setting 
Instead of removing it, let's replace it with something that performs the same sort of functionality.

Contributes to issue CURA-8466.
 2022-03-29 14:12:52 +02:00
Ghostkeeper
f2ea7718cb
Remove Filter Out Tiny Gaps setting 
It is no longer used since we've removed the Fill Gaps Between Walls setting. This setting is no longer referred to from CuraEngine.

Contributes to issue CURA-8466.
 2022-03-29 13:54:39 +02:00
Ghostkeeper
8db3e04e58
Upgrade correct setting_versions 
Also removed this mistake from Arachne Beta 1. Cura 4.13 already had stack version 5, so it's no longer necessary to have both.

Contributes to issue CURA-8466.
 2022-03-29 13:46:44 +02:00
Ghostkeeper
8a546bb6ef
Rename VersionUpgrade49to50 to VersionUpgrade413to50 
It's going to upgrade from 4.13 to 5.0. We will not support an upgrade path from the alpha/preview-betas to the stable release.

Contributes to issue CURA-8466.
 2022-03-29 10:34:21 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects 
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
 2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects 
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
 2022-03-28 15:33:43 +02:00
Jelle Spijker
12ee57e4ad
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/UI/CuraSplashScreen.py
 2022-03-28 15:02:18 +02:00
Jaime van Kessel
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +01:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
c.lamboo
0dda27094e Fix textfield height for entering project name in DL 
from eccb @fvrmr
 2022-03-24 10:31:10 +01:00
j.spijker@ultimaker.com
34d6a2ba29
Credits given where credits due 
The Update copyright feature of Pycharm automatically removed the
mentioning of one of our main contributors in this license header.
Added it manually again, unchecked the Update Copyright check box from
the commit window (on the second attempt) and order is restored to the
universe.

Mea Culpa @fieldOfView, Mea Maxima Culpa
 2022-03-23 16:42:26 +01:00
j.spijker@ultimaker.com
54ccc12649
Drop support for CTM files 
Open CTM has been used 5 times on million of slices
the past year. Since OpenCTM seems to be abounded
since 2012 we have decided to drop support. There
are plenty of conversion tools for this file type
available.

See ultimaker/cura-build-environment#333456c068944ff6b3e7afb2f02a243f0f488371

Contributes to CURA-8640
 2022-03-23 16:28:58 +01:00
Casper Lamboo
d45c70142f
Merge pull request #11695 from Ultimaker/8980_Fix_buttons_in_USB_monitoring_ 
CURA-8980 fix buttons in usb monitoring
 2022-03-21 14:04:41 +01:00
casper
9b19eaf84f Add scroll bar to print monitor if content is overflowing 
Fixes https://github.com/Ultimaker/Cura/issues/11629

CURA-8980
 2022-03-21 11:27:47 +01:00
Ghostkeeper
e715017545
Adjust description of Change Retraction for rel. extrusion 
A patch-up until we have a real solution, as suggested in #11487.
 2022-03-20 19:49:12 +01:00
j.delarago
067cdda401 Add missing UM import 
CURA-9005
 2022-03-15 09:05:38 +01:00
Casper Lamboo
60f7b2dccb
Merge branch 'master' into CURA-9005_restyle_print_setting_category 2022-03-11 13:43:33 +01:00