j.delarago
0f84fc3abe
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash
2022-04-01 17:26:28 +02:00
j.delarago
bac9a0da87
Fix textField vertical alignment
...
CURA-8640
2022-04-01 17:26:18 +02:00
Jaime van Kessel
c9b9a41bb8
Fix injection of parameters in signals
2022-04-01 17:17:28 +02:00
Jaime van Kessel
5f71518f9d
Use correct enum values for materialsview
2022-04-01 16:25:11 +02:00
Jaime van Kessel
d34d6f739a
Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash
2022-04-01 16:22:18 +02:00
Jaime van Kessel
402c53c5f1
Fix warning about Duration
2022-04-01 16:19:35 +02:00
c.lamboo
0c90d2ee81
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash
2022-04-01 16:13:45 +02:00
c.lamboo
baa1d9b87d
Use weights from figma
...
Checked with @Lorenzo
CURA-8640
2022-04-01 16:13:31 +02:00
j.delarago
02e4f869b6
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash
2022-04-01 16:09:05 +02:00
j.delarago
f327c2479b
Update Dialog imports to remove version
...
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder
CURA-8640
2022-04-01 16:08:35 +02:00
Jaime van Kessel
2c09943bd6
Remove opacity from menuItem
2022-04-01 16:05:54 +02:00
c.lamboo
90f03befc8
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash
2022-04-01 14:56:52 +02:00
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
Jaime van Kessel
3a1862f15f
Fix deprecation warning on recentfilesmenu
2022-04-01 13:47:21 +02:00
Jaime van Kessel
4520fc15f9
Fix display of UM monitor page
2022-04-01 13:45:11 +02:00
Jaime van Kessel
e0ec64ee0e
Fix deleting item with backspace
2022-04-01 13:40:29 +02:00
Jaime van Kessel
a92a9dd4c0
Fix context menu settings
2022-04-01 13:22:53 +02:00
Jaime van Kessel
eb4e27dd30
Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash
2022-04-01 13:16:46 +02:00
Jaime van Kessel
0ab8f278b2
Add hack to get mouse handling working again
2022-04-01 13:16:14 +02:00
p.kuiper
733447a2dd
Removed the settings: "material_shrinkage_percentage" and update code that was using this parameter.
...
material_shrinkage_percentage_xy and material_shrinkage_percentage_z cannot depend on material_shrinkage_percentage otherwise their resolve function will not execute properly.
I noticed that the shrinkage factors do not get the correct value if a wrong nozzle is chosen for a material. However, in that case the slicer will also not slice, so in practice this is not an issue
Relates to PP-77
2022-04-01 13:00:41 +02:00
j.delarago
e40a219b53
Add back code for resizing contentContainer.
...
This makes sure that the background get smaller when the setting container is resized.
CURA-8640
2022-04-01 11:36:22 +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
p.kuiper
4bb79654d4
Updated the S3 and S5 PLA, T-PLA and PETG profiles to include the determined shrinkage compensation factor.
...
PLA xy 100.2% z 100.1%
TPLA xy 100.3% z 100.1%
PETG xy 100.5% z 100.1%
Relates to PP-77
2022-03-31 16:32:41 +02:00
p.kuiper
d6d4644a31
Set visibility of shrinkage settings to true. Enable visibility in advanced (xyz shrinkage only) and the expert display mode.
...
New calculations to determine the average shrinkage when two materials are used. By default the material shrinkage is set to null (None). In that case the shrinkage of that material is not taken into account in the new averaging formula. Support materials such as PVA, BAM, Aquasys etc. should keep this setting to null. When two materials are used with a shrinkage percentage the average of these two materials will be used.
Relates to PP-77
2022-03-31 16:07:17 +02:00
Ghostkeeper
2d1b9c5409
Set Top Surface Layers to 0 and adjust flow to compensate
...
It doesn't really work well with the monotonic order here.
Contributes to issue CURA-9065.
2022-03-31 15:24:56 +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
Remco Burema
657890158e
Should be false by default.
...
Otherwise it'll mess up for most existing printers.
part of CURA-9078
2022-03-31 14:06:54 +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
Ghostkeeper
af454600a2
Merge branch 'PP-104_respect-maximum-flow-AA08'
2022-03-30 13:44:45 +02:00
Ghostkeeper
775d85b420
Merge branch 'PP-93_improve-top-bottom-flow'
2022-03-30 12:00:59 +02:00
Jaime van Kessel
820734aad7
Merge branch 'CURA-8466_version_upgrade_50' of github.com:Ultimaker/Cura
2022-03-30 10:52:07 +02:00
Jaime van Kessel
42b97d0d73
Prevent crash on setConnectionState when no global stack is set
2022-03-30 09:46:17 +02:00
