GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 03:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,500 Commits 295 Branches 268 Tags
Commit Graph

28500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
c.lamboo
c6d62c9d83 Update font weights 
In qt6 the font weights are defined in the range 0..1000 where the weights in qt6 were defined in the range 10..100

CURA-8640
 2022-04-01 14:56:43 +02:00
j.delarago
748606e5b5 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 11:12:40 +02:00
j.delarago
3dc67f387f Height based on implicitHeight/implicitWidth now. 
Removed redundant code.

CURA-8640
 2022-04-01 11:12:30 +02:00
Jaime van Kessel
1279ba9e82 Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-01 09:46:41 +02:00
Jaime van Kessel
19d82a770c Fix loading of files 2022-04-01 09:46:20 +02:00
j.delarago
804a607b75 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-01 09:31:47 +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
814b706641 Re-add header background 2022-03-31 16:59:15 +02:00
Jaime van Kessel
2c09c83896 Fix crash when opening marketplace 2022-03-31 14:21:29 +02:00
Jaime van Kessel
124602d2ad Return account widget to it's former glory 2022-03-31 14:19:41 +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
1df9ca55c8 Use correct default button for package install dialog 2022-03-31 14:04:49 +02:00
Jaime van Kessel
b4b7e6a2b9 Fix warnings that "instanceContainer" is not a recognised type 2022-03-31 14:03:04 +02:00
Jaime van Kessel
96444dbc09 Use correct keyboard enums 2022-03-31 13:54:24 +02:00
Jaime van Kessel
f176924c2a Renable MainWindow header by disabling account widget 
The account widget is still causing issues, but at least thats less
 2022-03-31 13:34:41 +02:00
Jaime van Kessel
9f735a192e Bump up qtQuick version 2022-03-30 17:39:43 +02:00
Jaime van Kessel
5aceec6209 Use right enum 2022-03-30 17:33:43 +02:00
Jaime van Kessel
d240feb78a Removing shit until works. 2022-03-30 17:08:59 +02:00
c.lamboo
4f70d34631 wip qt changes 2022-03-30 16:55:56 +02:00
c.lamboo
1acf96dfa1 Update file dialog properties 
Due to API change

CURA-8640
 2022-03-30 15:13:34 +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
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
Remco Burema
cba956be19
Merge pull request #11345 from Ultimaker/scale_fan_speed 
Add 'Scale Fan Speed From 0 to 1' Setting.
 2022-03-25 15:58:16 +01:00
Joey de l'Arago
b3eb5270f9
Merge pull request #11706 from Ultimaker/CURA-7810_remove_deprecated_functions 
Remove deprecated functions
 2022-03-25 14:42:20 +00:00
Remco Burema
d8738867f8 Merge branch 'master' into scale_fan_speed 2022-03-25 15:37:19 +01:00
Jaime van Kessel
efdb60e153 Remove area_deviation from ultimaker.def.json 
CURA-9036
 2022-03-25 14:41:56 +01:00
Jaime van Kessel
835bdf8a08 Merge branch 'CURA-9036_fix_average_width_simplify' of github.com:Ultimaker/Cura 2022-03-25 13:53:28 +01:00
Jaime van Kessel
894615914a Merge branch 'new-splashscreen' of github.com:Ultimaker/Cura 2022-03-25 10:49:16 +01:00
10r3n20
32153b0e57 removed wrong enterprise image 2022-03-25 10:44:50 +01:00
Jaime van Kessel
4f98025acc Remove unrecognised properties from fdmprinter 
No idea how they got there, but it caused a warning spam
 2022-03-25 10:31:50 +01:00
Jaime van Kessel
f043750f70 Fix errors in workspace dialog 2022-03-25 10:29:36 +01:00
10r3n20
fa3aa696fb updated payoff 2022-03-25 10:22:46 +01:00
Remco Burema
5ea08ad66e Revert "Set the default value of the Maximum Extrusion Area Deviation to 50.000um2 and remove the warning levels." 
This reverts commit 3c4c91947e4eed82babe58550316789ffcde2444.
 2022-03-24 17:56:06 +01:00
j.spijker@ultimaker.com
c3c59ef67a
fixed install dir 
Contributes to CURA-8640
 2022-03-24 16:24:41 +01:00
j.spijker@ultimaker.com
4c837cd53a
Allow installing to a local sitelib 
Such as a virtual environment

Contributes to CURA-8640
 2022-03-24 15:03:21 +01:00
j.spijker@ultimaker.com
bde680f353
Use modern >=3.12 cmake find_package Python logic 
This should also install cura and UM in the site-packages in a uniform
OS agnotisc path. I also removed the renaming of cura_app.py to cura
on Linux. Because this seemed to confuse pyinstaller.

Contribute to CURA-8640
 2022-03-24 14:44:07 +01:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack 
CURA-7810
 2022-03-24 14:26:03 +01:00
Jaime van Kessel
58a63aed02 Remove "cornerSide", "shadowColor" and "shadowEnabled" from ActionButton 
CURA-7810
 2022-03-24 13:56:14 +01:00
Jaime van Kessel
74eac8f4b9 Remove printeroutput model 
CURA-7810
 2022-03-24 13:41:10 +01:00
Jaime van Kessel
e925f07aad Remove old arranger code 
Major vesion upgrade, time to clean some stuff up!

CURA-7810
 2022-03-24 13:37:29 +01:00
Jaime van Kessel
4d02894582 Remove cura.PrinterOutputDevice 
Since we are moving up a major version, time to clean up deprecation warnings

CURA-7810
 2022-03-24 13:27:27 +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