GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 16:24:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,880 Commits 291 Branches 260 Tags
Commit Graph

5780 Commits

Author SHA1 Message Date
Jaime van Kessel
5a62278097 Fix display of username 
CURA-9146
 2022-04-15 10:16:00 +02:00
Jelle Spijker
981df9f928
Update resources/qml/TableView.qml 
Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-04-14 14:49:42 +02:00
Jaime van Kessel
25839c6d97 Fix direction of pointing rectangle 
Turns out that using anchors doesn't quite work anymore due to qt6 upgrade. Oh well!
CURA-9137
 2022-04-13 17:36:47 +02:00
Jaime van Kessel
a6db27dd55 Prevent tootltip from showing during "processing" of slice button 
CURA-9150
 2022-04-13 16:29:25 +02:00
j.spijker@ultimaker.com
cb9b5961c3
Removed last remnants of RecolorImage 
This was still being used in the MaterialBrandsMenu and the SimpleButton
Probably why the X es were missing from the info messages. CURA-9110

Contributes to CURA-8640
 2022-04-13 12:40:54 +02:00
Ghostkeeper
6f83927ec3
Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash 2022-04-12 14:11:36 +02:00
j.delarago
3674af01b7 selectExisting is replaced with using fileMode:FileDialog.OpenFile in QT6. This forces selecting an existing file. 
This is also the default value in QT6 so this line can be removed without changing the functionality
 2022-04-12 10:21:34 +02:00
j.delarago
94e5a4e1db Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image. 
CURA-9104
 2022-04-11 14:10:27 +02:00
j.delarago
c4baece3ac Remove reference to nonexistent property source size in UM.ColorImage which was causing add printer page to be empty 
CURA-9098
 2022-04-11 09:52:33 +02:00
Ghostkeeper
90a3b4cde6
Use 250ms delay everywhere 
This looks like it's consistent with the normal menus. And it fixes the issue where multiple menus can be shown at once because it would hide slower than show the next one.

Contributes to issue CURA-8640.
 2022-04-08 17:02:52 +02:00
Ghostkeeper
af33073b29
Properly limit width of text in subsubmenu 
Getting rid of the layout makes a lot of things simpler here.

Contributes to issue CURA-8640.
 2022-04-08 17:02:52 +02:00
j.delarago
d46679c19f Fix popups closing on selecting a material bug 
CURA-8640
 2022-04-08 16:44:13 +02:00
Ghostkeeper
e7de7bb3cc
Add a checkmark to indicate the selected material 
As it used to have.

Contributes to issue CURA-8640.
 2022-04-08 16:35:54 +02:00
Ghostkeeper
5a76cd1615
Select material from menu when user clicks on it 
The main function of the menu, after all.

Contributes to issue CURA-8640.
 2022-04-08 16:35:54 +02:00
j.delarago
5df5d6c37d Fix popup alignment 
CURA-8640
 2022-04-08 16:34:59 +02:00
j.delarago
938ff691c4 Add arrows in submenus 
CURA-8640
 2022-04-08 16:29:24 +02:00
Jaime van Kessel
d94ef39cba Fix warnings for extruder icon 2022-04-08 16:08:24 +02:00
Ghostkeeper
7aafd95429
Implement sub-submenus for material selection 
Getting a bit complex with the timers there and which pop-ups need to stay open. But it seems to be working reliably now.

Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
Ghostkeeper
b40900e146
Fix layout of subitems 
Contributes to issue CURA-8640.
 2022-04-08 15:57:42 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage 
CURA-8640
 2022-04-08 15:55:34 +02:00
Ghostkeeper
3de824e1a4
Show submenu with material types 
It's quite a hassle to get it to keep displaying...

Contributes to issue CURA-8640.
 2022-04-08 14:58:39 +02:00
Ghostkeeper
11b557b3d9
Replace material sub-menus with custom Popup 
The sub-menus were giving segfaults for some reason. We couldn't figure out how to circumvent that. So now we're at a last resort: Implement the whole thing ourselves, but with Popup instead of Menu.

Contributes to issue CURA-8640.
 2022-04-08 11:57:19 +02:00
j.delarago
6bb4f52b27 Fix crash on slicing. 
A Component with 0 width and height does not load values from registered Objects correctly.

This 0 width/height was caused by a binding loop for height in the contentItem.

CURA-8640
 2022-04-06 17:22:17 +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
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
fd07de9b11 Update DiscardOrKeepProfileChangesDialog.qml TableModel 
CURA-8640
 2022-04-05 15:53:56 +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
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
Jaime van Kessel
3a1862f15f Fix deprecation warning on recentfilesmenu 2022-04-01 13:47:21 +02:00
Jaime van Kessel
e0ec64ee0e Fix deleting item with backspace 2022-04-01 13:40:29 +02:00