487 Commits

Author SHA1 Message Date
j.delarago
d5511a078c Dialog was immediately being destroyed because a reference to it was not being stored in memory. Added a missingPackageDialog variable to WorkspaceDialog to fix this.
Swapped the loading order of Marketplace extensions so SyncOrchestractor is not fetched by PluginRegistry.getInstance().getPluginObject("Marketplace") in WorkspaceDialog.

CURA-8610
2022-06-08 12:19:36 +02:00
Ghostkeeper
0f12b012cf
Create InstallMissingPackageDialog with newly-exposed function from Marketplace
This adds a new function to the API of the Marketplace plug-in.
It's not pretty, but it's going to be how it is for a while.

Done to fix a critical build issue. The 'import plugins' thing works from source but not on the build.
2022-06-08 10:19:51 +02:00
Ghostkeeper
de8a58f0d7
Fix imports, especially not using plugins folder as module
When running from source, 'import plugins' works since it's working from the directory where the plug-ins directory is located. However in a build this doesn't work since the source code is in a different location there.
2022-06-08 09:50:44 +02:00
c.lamboo
76180eee01 Show warning on-close of the install missing packaged dialog
CURA-6990
2022-06-06 22:49:49 +02:00
c.lamboo
bee4da6368 Re-use Marketplace Component in the InstallMissingPackagesDialog
CURA-6990
2022-06-06 22:27:31 +02:00
c.lamboo
781723fbbc Fix typing
CURA-6990
2022-06-06 21:27:32 +02:00
c.lamboo
eccef62dc7 Add typing
CURA-6990
2022-06-03 15:22:29 +02:00
c.lamboo
2230269ab3 Simplify variable assignment
CURA-6990
2022-06-03 15:17:32 +02:00
c.lamboo
8d3b3ae411 Use themed border width
CURA-6990
2022-06-03 11:13:19 +02:00
c.lamboo
4492e3fba2 Add warning border to PackageCard if information is missing
CURA-6990
2022-06-03 10:39:01 +02:00
c.lamboo
70c36fc80f Use correct status icon
CURA-6990
2022-06-03 10:13:29 +02:00
j.delarago
277a6a38b2 Update campaign link
CURA-6990
2022-06-02 17:40:14 +02:00
j.delarago
4c2be68c7b Add pyqtSignal no get rid of annoying errors
CURA-6990
2022-06-02 17:39:41 +02:00
j.delarago
a0fd5afbe7 Add missing warning badge
CURA-6990
2022-06-02 17:38:50 +02:00
j.delarago
511b10c084 Display package cards in the package list for packages that can't be found on the marketplace api.
When the final page of results is fetched, the list of all package_ids retrieved from the api will be compared with the ones we were searching for. Any that are missing have cards displayed with only basic information (name and version).

CURA-6990
2022-06-02 16:54:08 +02:00
c.lamboo
9c02f6500d Use API endpoint for requesting package_ids
Use new api endpoint for requesting specific package_ids so we don't have to filter ourselves.

CURA-6990
2022-06-02 15:19:00 +02:00
j.delarago
b015617e13 Marketplace plugin registry is None on initialization, and is loaded after running show().
This makes a check that the window is open before continuing through checkIfRestartNeeded

CURA-6990
2022-06-01 16:56:02 +02:00
j.delarago
0df21e6073 Refactor missing packages dialog into model (MissingPackageList) and controller (InstallMissingPackagesDialog.qml)
Rename classes and files to have unified naming.

CURA-6990
2022-06-01 16:50:53 +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
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
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
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
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
j.delarago
16bb9952c7 Fix marketplace external link button being tiny.
CURA-9194
2022-04-26 15:55:08 +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
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
c.lamboo
7a3af720a8 Resolve urls through qml
CURA-9146
2022-04-21 11:32:46 +02:00
c.lamboo
d0a35bad3d Use updated type definitions
CURA-9146
2022-04-21 11:29:42 +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
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
5bec905cb9 Remove fill from multiple SVG's 2022-04-11 11:40:04 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jaime van Kessel
c88ed076a1 Fix resolving of URL's 2022-04-06 09:57:45 +02:00
Jaime van Kessel
605280255f Use right enum for alignment 2022-04-06 09:53:48 +02:00
Jaime van Kessel
3c6412d5d7 FIx deprecation warning 2022-04-06 09:53:27 +02:00
Jaime van Kessel
2c09c83896 Fix crash when opening marketplace 2022-03-31 14:21:29 +02:00