125 Commits

Author SHA1 Message Date
c.lamboo
27cc89ff89 Allow for custom descriptions/icons in packaged intents
CURA-9709
2023-05-31 12:54:56 +02:00
j.spijker@ultimaker.com
d1e8ae1ca7 Fix curapackage intent and intents mappings
Contributes to SD-3871 and CURA-7667
2022-08-01 11:16:48 +02:00
c.lamboo
3dad5d564d Only unquote once in getMaterialFilePackageId 2022-07-19 14:12:35 +02:00
c.lamboo
1e9e3a8cfb Fix saving materials with spaces 2022-07-19 13:54:32 +02:00
Ghostkeeper
83bad98ea3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1 2022-06-30 17:48:38 +02:00
Jaime van Kessel
7685540709 Ensure that intents and variants are also copied from packages
Although we only really need the intents, it doesn't hurt to also include the variants.
No idea if we will ever need or use it, but we might as well add it now.

CURA-7667
2022-06-23 14:14:22 +02:00
Jelle Spijker
b8a4243e26 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 10:48:41 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials.
CURA-8610
2022-06-15 15:47:17 +02:00
j.delarago
4e80d170d1 Add logs for debugging
CURA-8610
2022-06-15 14:09:05 +02:00
j.delarago
5d0e4238d5 Use os.path.join instead of appending a "/" since this is os specific.
Remove possible bad conversion to str for path.
2022-06-15 13:26:29 +02:00
j.delarago
f7bc55db15 Revert "temu extra logging for debugging"
This reverts commit febb7f1205451546ad543505d2104bd5fdb0d92e.
2022-06-15 12:53:42 +02:00
j.delarago
febb7f1205 temu extra logging for debugging 2022-06-15 11:55:53 +02:00
j.delarago
a548e13db3 add bundled paths log 2022-06-15 11:25:47 +02:00
j.delarago
ddb49ddba4 Add comment
CURA-8610
2022-06-08 11:20:51 +02:00
j.delarago
71a817697b Before this change packages were only being checked if they were bundled after loading the package_id. However only installed packages were being loaded so this would always be false.
The solution here is to check first if a material file is inside "secure_paths" (these are install directory resource paths). If it is, it must be a bundled material.

CURA-8610
2022-06-08 10:22:24 +02:00
j.delarago
efeb29c734 Fix call to plugin that was causing errors when building
CURA-8610
2022-06-07 13:41:54 +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
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
3dec025cb8 Update comment to clarify function usage.
CURA-8610
2022-05-31 08:54:08 +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
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Jaime van Kessel
6dac500f18 Simplify getAllLocalPackages
CURA-8587
2021-12-20 10:34:37 +01:00
Jaime van Kessel
477f62916c Further simplify the data being sent over to the package manager
CURA-8587
2021-12-16 23:21:44 +01:00
Jelle Spijker
0ffaafc8c0
Revert "Simplify CuraPackageManager"
This reverts commit 33f1bd8c5d2126e0f3045d9c71514dd23788f9c9.
2021-12-15 16:39:02 +01:00
Jelle Spijker
9e1e98bdbd
Revert "Show install button after package has been uninstalled"
This reverts commit c66e17dd9e52987ff75b708557e9037f4d9d66f2.
2021-12-15 16:38:54 +01:00
casper
c66e17dd9e Show install button after package has been uninstalled
CURA-8587
2021-12-15 15:13:38 +01:00
casper
33f1bd8c5d Simplify CuraPackageManager
CURA-8587
2021-12-15 14:18:40 +01:00
Jaime van Kessel
eb11e92637 Rename local_packages_id to local_packages_ids
CURA-8587
2021-12-13 11:54:13 +01:00
Jelle Spijker
9874b0c8ba
removed redundant dunders from helper class
Contributes to: CURA-8587
2021-12-09 15:14:20 +01:00
Jelle Spijker
51a77f683d
Moved stateManageButton logic out of the packageModel
Contributes to: CURA-8587
2021-12-09 09:56:41 +01:00
Jelle Spijker
f6966c25fb
Some final tweaks and added missing documentation
Contributes to: CURA-8587
2021-12-07 09:48:48 +01:00
Ghostkeeper
e525770332
Cast result to list after _updateLocalPackages
Because the _updateLocalPackages function guarantees it to be a list now, not None any more.

Contributes to issue CURA-8587.
2021-12-06 17:14:02 +01:00
Jelle Spijker
a51b29cdf6
Fixed double items in getAllLocalPackages
Contributes to: CURA-8587
2021-12-05 16:28:21 +01:00
Jelle Spijker
305fb4ab09
renamed locally_installed property
Contributes to: CURA-8587
2021-12-05 16:23:23 +01:00
Jelle Spijker
09709ede8b
Fix duplicate packages in get AlllocalPackages
The helper class is needed because dict's aren't hashable
which complicates the `in` check.

Contributes to: CURA-8587
2021-12-05 15:11:35 +01:00
Jelle Spijker
8400459e21
Use Python syntax to check if item is in collection
Als removed the check on the first loop, because we know for certain these
will already be unique values.

Contributes to: CURA-8587
2021-12-03 17:41:29 +01:00
casper
4c570c87e9 Make sure recently installed packages only appear once in package list
Some packages might be added to both `getPackagesToInstall` and
`getAllInstalledPackagesInfo`

cura 8587
2021-12-03 17:19:18 +01:00
Jelle Spijker
00acfe9d72
Added uninstall functionality
Get it in a sharable state

Contributes to: CURA-8587
2021-12-03 13:27:30 +01:00
Jelle Spijker
3b3d986058
Groundwork for installing/updating packages
Contributes to: CURA-8587
2021-12-03 13:27:26 +01:00
Jelle Spijker
02e2e0a1c6
Filter already installed packages from the install listviews
Contributes to: CURA-8587
2021-12-03 13:25:46 +01:00
Jelle Spijker
66e52294b5
Get the locally installed packages
Contributes to: CURA-8587
2021-12-03 13:25:45 +01:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Ghostkeeper
0482371fc6
Don't use deprecated extruders() slot
It's been replaced by extruderList.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
2020-05-15 15:02:07 +02:00
Jelle Spijker
6aedab78dc
Converted comments in dir Cura/cura to rst style
Converted doxygen style comments to reStructuredText style in the files found in Cura/cura directory using the script dox_2_rst.py (provided in the Uranium repo). Comments were manually checked and changed if needed.
2020-04-21 16:58:45 +02:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Jaime van Kessel
81b33b8649
Add some missing typing 2020-01-10 14:58:53 +01:00
Jack Ha
2bd8350141 Added error checking, added typing, renamed function. CURA-5389 2018-07-12 14:06:34 +02:00
Lipu Fei
76417b7fb2 Hide materials belong to a to-be-removed package 2018-07-11 10:57:57 +02:00
Lipu Fei
cc5f35dd91 Rename some functions and variables 2018-07-10 14:57:01 +02:00