GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 18:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 290 Branches 260 Tags
Commit Graph

9382 Commits

Author SHA1 Message Date
c.lamboo
cd18bfb893 Set warning only if there are missing materials 
CURA-6990
 2022-06-01 10:09:23 +02:00
Remco Burema
aa83c68387 This error is not about materials, not uninstalling. 2022-05-31 17:20:51 +02:00
c.lamboo
84f19458c5 Display error when opening 3mf files 
CURA-6990
 2022-05-31 16:49:47 +02:00
j.delarago
29b6450704 Add some more information for the unhappy route and a message to inform the user. 
CURA-6990
 2022-05-31 16:30:11 +02:00
Joey de l'Arago
094c781b02
Update plugins/XmlMaterialProfile/XmlMaterialProfile.py 
Co-authored-by: Remco Burema <41987080+rburema@users.noreply.github.com>
 2022-05-31 15:49:57 +02:00
j.delarago
5c1b7470a7 Add pyqt access to missing package metadata. 
CURA-6990
 2022-05-31 15:26:56 +02:00
j.delarago
ce0623664a Include all missing package metadata instead of just ids so we have something to display before searching the package on the marketplace. This is also important so we can show something if we can't find the package on the marketplace. 
CURA-6990
 2022-05-31 15:21:11 +02:00
j.delarago
4572d53e11 Read package.json required package information. Put package_ids for packages we don't have installed inside the WorkspaceDialog 
CURA-6990
 2022-05-31 15:12:52 +02:00
j.delarago
ca9955c730 Remove metadata exporting to ufp 
CURA-8610
 2022-05-31 12:43:52 +02:00
j.delarago
ec60325a3f Move metadata exporting to 3mf 
CURA-8610
 2022-05-31 12:39:00 +02:00
j.delarago
64478fb17d Fix typo fetching sdk version 
CURA-8610
 2022-05-31 10:04:23 +02:00
j.delarago
cdc08b5d54 Improve GUID check by parsing xml and getting GUID specifically inside the metadata tag. 
Remove exporting materials from disabled extruders

CURA-8610
 2022-05-31 10:00:25 +02:00
j.delarago
21d59e9349 Write active material metadata to ufp when saving. 
Add function to fetch package_id using only information from XmlMaterialProfile material container.
The only piece of information associating the material container and the package together is the file_name. To find the package that owns a material we have to search each of the material package paths.

It would be great to find a cleaner solution (preferable one that doesn't require invalidating the cached containers).

CURA-8610
 2022-05-30 17:29:59 +02:00
Ghostkeeper
b5e3479c1c
Catch UnicodeDecodeErrors when parsing error messages from server 
Stupid recursive errors.

Fixes Sentry issue CURA-3VB.
 2022-05-20 12:55:59 +02:00
Ghostkeeper
64b29779ca
Fix crash when server sends invalid JSON data 
If readJSON fails, it puts an entry in the log and then returns None. This then crashes with a TypeError because you can't check for things to be in None.

Fixes Sentry issue CURA-3V5.
 2022-05-19 11:36:16 +02:00
c.lamboo
13a75827ce Fix "view user manuals online" link 2022-05-16 21:49:09 +02:00
Ghostkeeper
fc4585e098
Merge branch '5.0' 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
 2022-05-16 15:11:39 +02:00
Ghostkeeper
94fc3981a3
Fix import for file dialog 
Without this, the page fails to load, showing nothing, because the FileDialog element doesn't exist.
I don't know why this is necessary for Qt6, but we had to do this for all other FileDialog uses too.

Done as a 5-minute fix.
 2022-05-16 15:10:26 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX" 
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
 2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX 
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
 2022-05-10 15:36:50 +02:00
Ghostkeeper
f483f04763 Set the width of model loading drop-down to the max of all elements 
Then set the elements to be equal to that width, so they fill the complete width of the drop-down.

Contributes to issue CURA-9143.
 2022-05-09 14:22:38 +02:00
Jaime van Kessel
325bf058e0 Merge branch 'CURA-9143_dropdown_item_width' of github.com:Ultimaker/Cura 2022-05-09 14:21:17 +02:00
Ghostkeeper
3c2c2219ac
Merge branch '5.0' 2022-05-09 14:01:40 +02:00
Ghostkeeper
763b40b8ec
Give icon of onboarding banner a colour 
It had no colour, so it was defaulting to black.
I'm making it the same as the text colour and the colour of the X button.

Fixes issue CURA-9248.
 2022-05-09 14:01:06 +02:00
Ghostkeeper
f1d75fe827
Set the width of model loading drop-down to the max of all elements 
Then set the elements to be equal to that width, so they fill the complete width of the drop-down.

Contributes to issue CURA-9143.
 2022-05-09 11:54:28 +02:00
Jelle Spijker
6f7145bb12
Merge remote-tracking branch 'origin/5.0' 2022-05-09 11:05:47 +02:00
Jelle Spijker
334fca6691
Merge remote-tracking branch 'origin/gracefully_fail_cloud_printer' into 5.0 2022-05-09 10:54:07 +02:00
Bruno Henrique
5c4669316d Adding option: "Add prefix 'Printing'" 2022-05-07 15:14:05 -03:00
Jaime van Kessel
02a2facb86 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-04 11:39:32 +02:00
Jaime van Kessel
0c98ce2384 Use correct role for standardbutton 
Otherwise the no won't register...

CURA-9229
 2022-05-04 11:09:49 +02:00
Jaime van Kessel
7265509054 Merge branch '5.0' of github.com:Ultimaker/Cura 2022-05-03 13:48:31 +02:00
j.delarago
c11ff2ebf6 Add context to "By" string, lots of questions from the translators about this one. 2022-05-02 15:11:51 +02:00
Jaime van Kessel
81a170fb7b
Merge pull request #11981 from Ultimaker/CURA-9194_tiny_marketplace_icon 
[CURA-9194] Tiny marketplace icon
 2022-05-02 10:22:34 +02:00
Jaime van Kessel
6b9cc3f1c7 Use the correct function parameters when removing objects in menu 
It turns out that the order of these functions matters. So when we created a
function with only one param, it would actually give it the index. Removing
with the index didn't work, so the object would still be there. The Qt objects
would already be deleted which caused segfaults

CURA-9222
 2022-04-28 17:03:41 +02:00
Remco Burema
854921c002 Fix typo in property. Not sure why this didn't crash tbh. 
done while investigating CURA-9196
 2022-04-26 16:52:23 +02:00
Jaime van Kessel
c4ec9142db Merge branch 'fix_missing_icons' of https://github.com/fieldOfView/Cura into 5.0 2022-04-26 15:55:10 +02:00
j.delarago
16bb9952c7 Fix marketplace external link button being tiny. 
CURA-9194
 2022-04-26 15:55:08 +02:00
Jaime van Kessel
698adc45db Fix crash if 3mf writer could not be imported 
Fixes CURA-3NM (Sentry)
 2022-04-25 13:45:05 +02:00
Aldo Hoeben
2af1d0a514
Reenable script(s) active indicator icon 2022-04-23 10:16:14 +02:00
fieldOfView
b622738ae3 Fix missing icons since move to PyQt6 2022-04-22 22:33:14 +02:00
Remco Burema
5d859ffacc
Merge pull request #11876 from Ultimaker/CURA-9146_missing_placeholder_images 
CURA-9146 missing placeholder images for Marketplace
 2022-04-22 13:38:19 +02:00
j.delarago
68de54c803 Path for placeholder image was one to many folders up. 
CURA-9146
 2022-04-22 11:01:26 +02:00
Jaime van Kessel
d53a40a923 Merge branch '5.0' of github.com:Ultimaker/Cura into 5.0 2022-04-22 11:01:17 +02:00
Jaime van Kessel
86534e78a0 Prevent error message when no further pages in marketplace could be loaded 
Contributes to #11858
 2022-04-22 11:00:45 +02:00
j.delarago
c294680022 Fix scrollbar filling space by replacing custom implementation with generic UM.ScrollBar 
CURA-9144
 2022-04-21 15:52:15 +02:00
Ghostkeeper
9389a6f4e8
Merge branch 'CURA-9146_account_sync' into 5.0 2022-04-21 14:04:27 +02:00
Ghostkeeper
1e7cf21f46
Merge branch '5.0' into CURA-9146_account_sync 2022-04-21 13:18:49 +02:00
Ghostkeeper
345f0ea41c
Fix copyright headers and code style a bit 
Contributes to issue CURA-9146.
 2022-04-21 13:18:03 +02:00
Jelle Spijker
81df26e4d9
Merge pull request #11833 from Ultimaker/CURA-9149_object_settings_ovelap 
CURA-9149 Fix PerObjectSettings remove button layout
 2022-04-21 12:48:48 +02:00