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

29052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
j.delarago
cf52d384dd Wrapping Retrieval in DFRetrieval does not seem to work in QT6, the object returned only undefined for all enum values. 
Fixed by creating and registering the enum inside DigitalFactoryController.py

CURA-9126
 2022-04-21 11:22:07 +02:00
Ghostkeeper
3f9c7c55dc
Fix search field losing focus when scrolling the setting list 
When scrolling the setting list, it was clearing the focus in order to close the pop-ups in the setting list. If pop-ups like for the infill pattern or extruder selection settings are not closed, the pop-up part is still rendered even if the user scrolls those settings out of view, causing the pop-up to appear somewhere on top of completely unrelated interface elements. It scrolls all the way to the top of the screen, effectively.

I couldn't find a way to cause pop-ups to be clipped with the rest of the contents of the ListView. They are always rendered on top due to the nature of the pop-up. I could find a way to trigger pop-ups to close upon changing the scrolled position without changing the focus, but that method was fairly complex with a bunch of `Connection`s and an extra signal. This is by far the simplest solution.

Contributes to issue CURA-9070.
 2022-04-21 11:17:13 +02:00
Remco Burema
c002a52b50 Remove animations from custom settings view. 
They never properly worked anyway, and now they cause the items to overlap.

CURA-9160
 2022-04-21 11:11:28 +02:00
Jelle Spijker
16d0a81911 Merge remote-tracking branch 'origin/fix_wait_for_first_slice' into 5.0 2022-04-21 09:26:48 +02:00
Casper Lamboo
1b228ecc07
Merge pull request #11824 from Ultimaker/upgrade_sdk_to_800 
Upgrade SDK version to 8.0.0 for Cura 5.0
 2022-04-20 12:16:02 +02:00
Jaime van Kessel
271868eafd Fix export material to usb 
CURA-9122
 2022-04-20 11:23:35 +02:00
Remco Burema
0232b4f639 Upgrade SDK version to 8.0.0 for Cura 5.0 2022-04-20 10:57:38 +02:00
Jaime van Kessel
15b16e3e45 Remove overlap in perobject setting panel 
CURA-9149
 2022-04-19 17:27:38 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
Jaime van Kessel
f070a695b1 Change standardbutton.yes & no to dialog.yes & no 2022-04-19 17:10:51 +02:00
Jaime van Kessel
1ce84fec69 Fix all import dialogs 
Fixes CURA-9129
 2022-04-19 17:09:02 +02:00
Jaime van Kessel
ffa0106937 Check multiple settings per update of event loop 
It seems that in Qt5, the update loop was triggered a lot more often than in qt6.
Since we used that to handle the error checking, this made it so that you sometimes had to wait
for quite some time untill the slicing would start (as that is blocked by the error checker)
 2022-04-19 17:00:06 +02:00
Jaime van Kessel
965ecb744d Fix size of print setup selector 
CURA-9139
 2022-04-19 16:42:43 +02:00
Jaime van Kessel
e4e993a44e Fail gracefully when adding unknown cloud printer 2022-04-19 15:43:31 +02:00
Jaime van Kessel
fc03d6dfd8 No longer inject close argument 
Fixes warning in the log
 2022-04-19 15:08:45 +02:00
Jaime van Kessel
3bfd2679ab
Merge pull request #11818 from Ultimaker/CURA-9155_cant_stop_wont_stop 
[CURA-9155] Fix Cura not closing properly on Windows.
 2022-04-19 15:07:00 +02:00
Remco Burema
5a43e5945c Fix Cura not closing properly on Windows. 
May be a bit crude, but simple and readable, and we're supposed to have handled everything anyway at the point the event comes in.

CURA-9155
 2022-04-19 14:28:41 +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
Remco Burema
ef591713e8 Update translation templates for 5.0. 
part of CURA-9141
 2022-04-13 11:33:44 +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