507 Commits

Author SHA1 Message Date
Dmitry Gribenchuk
8116df6c21
cleanup unused import and fix comment space 2023-12-13 20:10:28 +02:00
Jelle Spijker
c6fb3fe59c
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 09:05:15 +02:00
Remco Burema
b1100cb4c5 Relevant comment specifically requests not to call closeApplication in most cases.
done as a 5 min fix.
2023-08-04 15:53:52 +02:00
c.lamboo
0e77a05c74 Correctly differentiate between plugins and materials in missing packages dialog
CURA-10719
2023-07-27 10:15:27 +02:00
c.lamboo
42002dac36 Update copy
Now more then just materials can be installed. Update copy to reflect this.

CURA-10719
2023-07-27 10:14:43 +02:00
Casper Lamboo
7e2fc1ac5b
Update plugins/Marketplace/RemotePackageList.py 2023-07-25 13:29:22 +02:00
Casper Lamboo
8c54d44cbb
Apply suggestions from code review 2023-07-25 13:27:08 +02:00
HellAholic
afc0f7c615 Update to add sort_by option
Added a class attribute "last_updated" for sort_by
Added an instance attribute for search_sort
Added if statement to add the sort_by string, currently by default.
2023-07-25 13:11:43 +02:00
jspijker
8a38eb79e2 Merge remote-tracking branch 'origin/CURA-10182_add_sign_in_wall_enterprise' into 5.3
# Conflicts:
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
2023-03-06 22:53:16 +01:00
jspijker
397533b806 Rerun the sort
Contribute to CURA-10208
2023-03-06 12:02:44 +01:00
Joey de l'Arago
1133e76e66 Add sign in wall
CURA-10183
2023-02-09 17:41:08 +01:00
c.lamboo
6ef0a35c15 Fix error where icon in the marketplace would not show
CURA-10139
2023-01-11 18:23:42 +01:00
c.lamboo
7efbf6ed1e Translate string
CURA-9793
2022-11-29 15:26:15 +01:00
jspijker
f76f711790 Update mentions to UltiMaker
Contributes to CURA-9808
2022-11-28 14:11:21 +01:00
jspijker
61623720ca Update copyright using UltiMaker
Contributes to CURA-9808
2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker
Contributes to CURA-9808
2022-11-28 09:05:21 +01:00
Remco Burema
3d645140f2 Fix: Sort updateables on top of others instead of vice-versa. 2022-11-09 10:37:49 +01:00
Ghostkeeper
ac67dcc045
Don't cache PluginRegistry instance
Several reasons:
* It's bad style, making it harder to test with mocked PluginRegistry since all sorts of objects have copies of the un-mocked object in their fields.
* It's causing errors in this case when checkIfRestartNeeded is called before show().

Fixes Sentry issue CURA-3P6.
2022-06-22 11:52:13 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
2022-06-20 10:48:13 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
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