GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 20:58:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,481 Commits 290 Branches 260 Tags
Commit Graph

28481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
049d8c0d35
Merge pull request #11589 from Ultimaker/spiralize_bottom_fix 
disable 100% infill bottom layers trick for spiralize
 2022-03-23 16:22:48 +01:00
Jaime van Kessel
2cd5b2d46d Add security policy 
As suggested by artem-smotrakov
 2022-03-23 09:51:36 +01:00
Jaime van Kessel
43da68c898 Merge branch 'fix_scrollview_scrollbars' of https://github.com/fieldOfView/Cura 2022-03-22 16:13:46 +01:00
Jaime van Kessel
fa1554a62e Merge branch 'fix_disallowed_brim_gap_distance' of github.com:Ultimaker/Cura 2022-03-22 15:23:32 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
Tim Kuipers
10b3747287
Fix Transitioning angle description with what it's actually for (#11335) 
* Fix Transitioning angle description with what it's actually for

* Transitioning Angle Spelling and grammar.

--author=Ruben

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>

* Simpler description for Wall Transitioning Threshold Angle

* lil typo

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-03-22 14:34:30 +01:00
casper
5d3b22f45a Don't check on type equality to check if material is set 
As suggested by code review

CURA-9044
 2022-03-22 13:46:31 +01:00
casper
1e15197d44 Show active material in italics 
behaviour is not perfect; only one (of the possible multiple if you have
multiple materials) active material is shown in italics. However, this
behavior is similar as the behavior in cura v4.13

see
https://github.com/Ultimaker/Cura/pull/11668/files#diff-ba2e4797d4d21e847be25e2c272d6a7a45e3bab97def420bed7643d762be8cfaL54

CURA-9044
 2022-03-22 12:00:56 +01:00
casper
d7cf7ee97d Re-implement showing active profile as italic 
This went got removed during a merge conflict

see
https://github.com/Ultimaker/Cura/pull/11696
https://github.com/Ultimaker/Uranium/pull/798

CURA-9044
 2022-03-22 11:43:36 +01:00
Casper Lamboo
a7aa92427e
Merge pull request #11668 from Ultimaker/CURA-8979_Materials_Preference_Page 
Materials preference page
 2022-03-21 14:10:07 +01:00
casper
a8e63005f1 Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 14:06:59 +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
adccc5fd19 Use correct font and line height for the category btn in materials list 
CURA-8979
 2022-03-21 13:50:10 +01:00
casper
bfa8118c9f Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/ColorDialog.qml
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 13:39:16 +01:00
Jaime van Kessel
a9bad453a6
Merge pull request #11696 from Ultimaker/CURA-9044_show_italic_for_active_profile 
Remove reference to Cura in UM component
 2022-03-21 13:33:18 +01:00
casper
10339555f4 Simplify materials preference page by wrapping scroll items in ListView 
CURA-8979
 2022-03-21 13:20: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
casper
a4f1907b12 Show Yes and No buttons in abort dialog 
CURA-8980
 2022-03-21 10:23:05 +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