3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
28571 commits 313 branches 275 tags 719 MiB
Commit graph

28571 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
1158856f80 Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-06 11:21:01 +02:00
Jaime van Kessel
b2eec5f0d9 Fix height for swatch in extruder settings 2022-04-06 11:19:20 +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
62c1e37e04 Fix button heights 
CURA-8640
 2022-04-05 17:25:19 +02:00
j.delarago
53efb78cf6 Fix combobox and label heights in general page 
CURA-8640
 2022-04-05 17:22:57 +02:00
j.delarago
f57c30fb42 Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-05 16:10:51 +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
Jaime van Kessel
fa2ebf3e38 Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-05 16:03:58 +02:00
Jaime van Kessel
9812dade44 Fix drag & drop 2022-04-05 16:03:47 +02:00
j.delarago
aa190024d4 Update enum, this fixes connecting to printers 
CURA-8640
 2022-04-05 16:01:17 +02:00
j.delarago
6d2293db08 Remove unused Table in DigitalLibary Plugin 
CURA-8640
 2022-04-05 15:55:45 +02:00
j.delarago
fd07de9b11 Update DiscardOrKeepProfileChangesDialog.qml TableModel 
CURA-8640
 2022-04-05 15:53:56 +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
b60156e3b7 Remove unused import 
CURA-8640
 2022-04-05 15:04:35 +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
359bcc1bee Textfield was in incorrect style 
CURA-8640
 2022-04-04 11:09:50 +02:00
j.delarago
e2e0a5cdee Inheriting components don't have full access to the context of their parent in QT6 (I assume?) 
The buttonRow in Dialog must be exposed through an alias now (buttonArea).

This fixes minimumHeight failing to evaluate buttonRow.height

CURA-8640
 2022-04-04 11:08:29 +02:00
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick 
CURA-8640
 2022-04-04 10:45:00 +02:00
j.delarago
e593322b43 When getting active focus textinput value was being cleared. However if text was inputted then this would stay between active focus states. 
This commit forces the value to be assigned the value in the textInput when active focus is given.

CURA-8640
 2022-04-04 10:38:09 +02:00
j.delarago
e20ded248f Fix spinbox height being almost 0 and padding being missing between buttons and text input. 
CURA-8640
 2022-04-04 09:25:22 +02:00
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
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