GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,535 Commits 293 Branches 266 Tags
Commit Graph

28535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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