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

28654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
345f0ea41c
Fix copyright headers and code style a bit 
Contributes to issue CURA-9146.
 2022-04-21 13:18:03 +02:00
c.lamboo
9a3d089bd9 Properly add and remove menu items 
Not really part of the ticket but logging was complaining

CURA-9146
 2022-04-21 11:34:16 +02:00
c.lamboo
7a3af720a8 Resolve urls through qml 
CURA-9146
 2022-04-21 11:32:46 +02:00
c.lamboo
66fde9100c Use QML defined enum in sync state 
These are the enums from cura/API/account.py
somehow exposing these enums from python to QML doesn't work properly anymore
A better solution should be found in the very near future

CURA-9146
 2022-04-21 11:32:03 +02:00
c.lamboo
d0a35bad3d Use updated type definitions 
CURA-9146
 2022-04-21 11:29:42 +02:00
Jaime van Kessel
773ff5fa7e Remove unneeded renderType 
CURA-9146
 2022-04-19 11:21:12 +02:00
Jaime van Kessel
3aff3d5825 Fix "read more" not being translated 
Yeah, i know, this breaks the stringfreeze. But this wasn't translated in the
first place. So the actual effect here is zero (but at least it will be translated
in the next round!)

CURA-9146
 2022-04-19 11:19:58 +02:00
Jaime van Kessel
05263b9a58 Fix layout of dialog 
CURA-9146
 2022-04-19 11:17:38 +02:00
Jaime van Kessel
3ed182cd74 Rename MarketplaceLicenseDialog to MultipleLicenceDialog 
CURA-9146
 2022-04-19 11:08:54 +02:00
Jaime van Kessel
5ce5ce769e Re-add the CloudSync functionality 
It got removed in the marketplace upgrade.

CURA-9146
 2022-04-15 13:12:06 +02:00
Jaime van Kessel
5a62278097 Fix display of username 
CURA-9146
 2022-04-15 10:16:00 +02:00
Ghostkeeper
1e1b4f3dac
Merge pull request #11792 from Ultimaker/qt6_beyond_the_splash 
Cura 8640 PyQt6 upgrade
 2022-04-14 14:52:32 +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
Jelle Spijker
02a2d9c012
Update plugins/ModelChecker/ModelChecker.qml 
Looks like a left over

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-04-14 14:49:35 +02:00
j.spijker@ultimaker.com
52a6da2d8f
Use minus sign for extra version info 
Contributes to CURA-8640
 2022-04-14 10:01:37 +02:00
j.spijker@ultimaker.com
aef483018c
Fix version on splash screen 
Contributes to CURA-8640
 2022-04-14 09:38:42 +02:00
Jelle Spijker
b3cd1fee09
Merge remote-tracking branch 'origin/qt6_beyond_the_splash' into qt6_beyond_the_splash 2022-04-14 08:32:53 +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
ddb3ed1693 Fix crash in image reader and ensure it actually works 
CURA-9125
 2022-04-13 16:58:37 +02:00
Jaime van Kessel
50954552d2 Fix thumbnail creation 
CURA-9120
 2022-04-13 16:53:11 +02:00
Jaime van Kessel
204eeaf272 Add extra warnings if it failed to create snapshot 
CURA-9120
 2022-04-13 16:47:07 +02:00
Jaime van Kessel
c9e625767b Use right enum for message dialog 2022-04-13 16:40:14 +02:00
Jaime van Kessel
111d335743 Give text more room on splashscreen 
CURA-9151
 2022-04-13 16:36:23 +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
Jaime van Kessel
dd037fa946 Make "create new" button visible 
CURA-9126
 2022-04-13 16:25:24 +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
Ghostkeeper
d1d45b4f41
Fix enum to FormDataType 
Stupid enum change...

Contributes to issue CURA-9119.
 2022-04-11 13:23:03 +02:00
Ghostkeeper
70fdffb1c9
Allow redirects when talking with printer API 
Because newer firmware will redirect this API call.

Contributes to issue CURA-9119.
 2022-04-11 13:23:03 +02:00
Jaime van Kessel
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
j.delarago
e076779293 Remove fill from Check.svg which was overriding attempts to recolor image. 
CURA-9101
 2022-04-11 10:56:17 +02:00
Jaime van Kessel
279719099d Also remove fill from default extruderCOlor icon 2022-04-11 10:39:48 +02:00
Jaime van Kessel
17e7c263df Remove fill from extruderColor icon 2022-04-11 10:37:15 +02:00
Ghostkeeper
0deac84ec2
NetworkError is an enum, no longer comparable as int 
With the Qt6 upgrade, we have to treat enums as full enums, within their normal class namespace and such. They are no longer just integer-globals static in the QtCore.Qt class. They are no longer treated as integers by PyQt.
Other places that checked for such errors were already doing it like this.

Contributes to issue CURA-9100.
 2022-04-11 10:00:32 +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
Jelle Spijker
fb22a04d4d Add search path for the pyinstaller locations 
Contributes to CURA-8640
 2022-04-08 20:34:42 +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