Commit graph

28475 commits

Author SHA1 Message Date
Rijk van Manen
26d6a02c32 gradual infill not implemented for cross (3d) pattern 2021-12-01 09:03:08 +01:00
AnnaKang0219
072243d713 parameter update
parameter update
2021-12-01 14:32:06 +08:00
Ghostkeeper
d8e212581b
Show placeholder texts when compatibility lists are empty
When there are no compatible printers, we show that there is no information. After all, all materials should be compatible with some printer.
When there are no compatible support materials, we simply show 'None', because a material could be incompatible with all known support material types.

Contributes to issue CURA-8585.
2021-11-30 19:11:02 +01:00
Iñigo Martinez Lasala
e5e774cd33
Update DisplayProgressOnLCD.py
Support for Octoprint via M118 A1 P1 action:notification command when using BTREETECH TFT
- ETA
- % advance
2021-11-30 19:07:35 +01:00
Ghostkeeper
249a07269e
Specify spacing between external link buttons
Contributes to issue CURA-8585.
2021-11-30 19:02:27 +01:00
Ghostkeeper
58cefcb68c
Add additional buttons at the bottom for materials with links to data sheets
And where to buy it.

Contributes to issue CURA-8585.
2021-11-30 19:00:08 +01:00
Ghostkeeper
39f540ff52
Add information on compatibilities with air manager
Similar to the Material Station.

Contributes to issue CURA-8585.
2021-11-30 18:25:24 +01:00
Ghostkeeper
aba3e755f4
Show compatibility with material station
Contributes to issue CURA-8585.
2021-11-30 18:22:55 +01:00
Ghostkeeper
b854025daa
Fix name of compatibility category
I had the nesting wrong. 'compatibilities' is the nested sub-dict in each of these compatibility entries.

Contributes to issue CURA-8585.
2021-11-30 18:22:34 +01:00
Ghostkeeper
cfdb01caaf
Show list of compatible support materials
Contributes to issue CURA-8585.
2021-11-30 18:13:06 +01:00
fieldOfView
0813f27389 Add a thumbnail to 3mf projects 2021-11-30 18:09:41 +01:00
Ghostkeeper
fd026e472f
Show compatible printers for materials
Contributes to issue CURA-8585.
2021-11-30 18:08:42 +01:00
Ghostkeeper
9c51d620b2
Use QStringList rather than QVariantList
We know that they are strings after all.

Contributes to issue CURA-8585.
2021-11-30 18:07:13 +01:00
Ghostkeeper
1418bb072c
Parse compatibility information of air manager and material station
The union vs. intersection here is a guess. I'm guessing the online Marketplace displays compatibility if ANY materials/combinations are compatible, not requiring that ALL materials/combinations are compatible. We'll have to review that.

Contributes to issue CURA-8585.
2021-11-30 17:50:39 +01:00
Ghostkeeper
02c1e01788
Parse list of compatible support materials
This one is quite complex because the support material names are in their profiles, so we need to consult the profiles, if present.

Contributes to issue CURA-8585.
2021-11-30 17:42:29 +01:00
Remco Burema
bb42fa0527
Don't restore files ignored with current backup policy.
Restoring plugins will casue a headache when (they are large and) the central storage was removed in the mean time. Since it's current policy to ignore plugins _anyway_ when backing up, the simple solution is to also just don't restore them, even if they where present to begin with. Of course this is also applied to other to-be-ignored files and folder types.

should 'fix' CURA-8666
2021-11-30 17:34:49 +01:00
Ghostkeeper
4ffca8da98
Implement getting the compatible printers of a package
Again, only really applicable to materials for now. But it's simple to keep this class generic.

Contributes to issue CURA-8585.
2021-11-30 17:29:28 +01:00
Ghostkeeper
b4020614d5
Add material links to package model
They will not be initialised for plug-ins.

Contributes to issue CURA-8585.
2021-11-30 17:17:50 +01:00
Ghostkeeper
d6143103d0
Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details
Conflicts:
	plugins/Marketplace/resources/qml/Marketplace.qml -> Whole layout changed, while the onboarding banner got added. I re-added the onboarding banner item and the new search link at locations where I thought it was appropriate.
	plugins/Marketplace/resources/qml/Packages.qml -> A small conflict where new properties got added while I moved the width property up a bit for consistency. Easy enough to fix.
2021-11-30 16:16:20 +01:00
Ghostkeeper
cd09af885d
Fix resetting when Marketplace is closed and re-opened
Previously, this would cause the Marketplace to freeze. We're still not entirely sure why. It seems to be a bug in Qt, but it's rather hard to deal with.

This new solution is nicer in some ways but not as neat in others.
- We're no longer clearing the content of the loader, so the QML and the package data remains in memory while the Marketplace is closed. We deem this to not be a problem, because the memory usage of this package data is only a couple of kB, nothing compared to the memory used by the slicer when it loads a model.
- On the other hand, it's now possible to programmatically change the tab there, instead of manually having to click the buttons.
- Fixes a bug where the highlighted tab of of the tab bar doesn't update when closing and re-opening the Marketplace. And a bug where there was a search bar for the manage page while it didn't work.

Contributes to issue CURA-8565.
2021-11-30 15:59:30 +01:00
Ghostkeeper
02cf4ac440
Fix newline rendering in extended display
Rich Text is rendered a bit like HTML, where all of the whitespace gets changed into a single space. This is normally not so bad, but with newlines it's annoying. This preserves the newlines from the description.

Contributes to issue CURA-8565.
2021-11-30 15:01:39 +01:00
Ghostkeeper
c1f0fb1faf
Make icons smaller for tertiary buttons
These are typically visually smaller buttons, since they don't have an outline. It makes more sense to use the size of the text then, or something thereabouts.

Contributes to issue CURA-8565.
2021-11-30 14:56:09 +01:00
Ghostkeeper
c48c449354
Show hover colour when hovering a card
This signals to the user they can select one.

Contributes to issue CURA-8565.
2021-11-30 14:50:45 +01:00
Ghostkeeper
7529483cb0
Don't show download count for bundled plug-ins
I considered rewriting the section title property to be QML-only and translate it from the QML, but this is a bit simpler in the end, even though there is data duplication now.

Contributes to issue CURA-8565.
2021-11-30 14:42:12 +01:00
Jaime van Kessel
ab2cbbfecc
Merge pull request #10920 from sustmi/czech-translations-v4.12.1
Add Czech translations for v4.12.1
2021-11-30 14:40:52 +01:00
casper
a0dce47d54 Merge branch 'CURA-8564_Add_onboarding_banners_with_link_to_explain_Cura_MP' into marketplace_redesign 2021-11-30 14:27:41 +01:00
Jaime van Kessel
f1e337c9b2
Merge pull request #10964 from Ultimaker/CURA-8563_Easy_navigation_to_Cloud_marketplace
[Cura 8563] - Easy navigation to cloud marketplace
2021-11-30 14:25:10 +01:00
Jaime van Kessel
b0275cfba9 Add campaign links
CURA-8563
2021-11-30 14:17:40 +01:00
Ghostkeeper
5da63fda26
Also catch BlockingIOError when getting a keyring attribute
This occurs when there's a timeout, on some systems, when asking for the password to the keyring. We'll interpret a timeout as a refusal to enter a password.

Fixes Sentry issue CURA-332.
2021-11-30 13:27:32 +01:00
Ghostkeeper
7eca005659
Increase size of icons on action buttons
We want those to be 1.5em now. This has an effect on all action buttons with icons in the interface!

Contributes to issue CURA-8565.
2021-11-30 13:24:12 +01:00
casper
97ba4489ff Remove unneeded margin from search bar
Cura 8563
2021-11-30 13:01:45 +01:00
casper
c62b21ad44 Revert "Decrease margin sizes"
This reverts commit 49db5be3aa.
2021-11-30 12:57:22 +01:00
casper
d291ea85a2 Place the on boarding banners in the correct place in the marketplace
To comply with the UX design

CURA-8564
2021-11-30 12:20:21 +01:00
casper
5a148e459f Decrease size of the icons in the marketplace onboarding banners
CURA-8564
2021-11-30 12:19:32 +01:00
casper
8e6210fb2c Change margins of read more button in marketplace onboarding banner
To comply with UX design

CURA-8564
2021-11-30 12:11:32 +01:00
casper
ca60206728 Always show read more button in on boarding banner
Even if there is no link

CURA-8564
2021-11-30 12:10:55 +01:00
casper
82d148d077 Add correct text to material and plugins onboarding banners
CURA-8564
2021-11-30 12:08:09 +01:00
casper
49db5be3aa Decrease margin sizes
They were way bigger compared to the UX design

CURA-8563
2021-11-30 10:52:15 +01:00
casper
d96ba0dcf3 Easy navigation to Cloud marketplace
CURA-8563
2021-11-30 10:51:43 +01:00
Ghostkeeper
cac623b509
Use medium font size for extended description
The design appears more balanced then, quoth the designer of the layout.

Contributes to issue CURA-8565.
2021-11-30 10:49:49 +01:00
Remco Burema
55f9771dd4
Merge pull request #10948 from Ultimaker/CURA-8564_Add_onboarding_banners_with_link_to_explain_Cura_MP
Cura 8564 add onboarding banners with link to explain cura mp
2021-11-30 10:36:13 +01:00
Ghostkeeper
f385e3d639
Don't show elision or read more if there is no description at all
Apparently Qt marks it as 'truncated' then, even though it's not really. Don't show the ... nor the 'read more' button if there is nothing more to read.

Contributes to issue CURA-8565.
2021-11-29 19:59:43 +01:00
Ghostkeeper
d0eee2cffe
Make header of detail page depend on header of origin
It's the same as the list of packages you came from, now.

Contributes to issue CURA-8565.
2021-11-29 19:41:25 +01:00
Ghostkeeper
d96284ee3e
Only show formatted description in detail page
We can't show rich text in the package list, because the we use the onLineLaidOut signal there, which doesn't work with Rich Text. So for the package list we should NOT use the formatted version of the description because that will contain ugly HTML tags that the user wouldn't want to see. Show the original description there. Use the formatted description only in the detail page where we don't use onLineLaidOut.

Contributes to issue CURA-8565.
2021-11-29 19:35:57 +01:00
Ghostkeeper
b5c7dfe9a2
Format links in descriptions to be clickable
Took some fiddling to get the regex right. But it's nice now.

Contributes to issue CURA-8565.
2021-11-29 19:29:33 +01:00
Ghostkeeper
d511c4542a
Make package detail page scroll if details are too long
Some plug-ins could have very long descriptions now. We show all of it, but that could go off the screen in theory.

This makes the content scrollable if it goes off the screen.

Contributes to issue CURA-8565.
2021-11-29 19:04:30 +01:00
Ghostkeeper
ffd1a4d812
Add button to visit plug-in website
There are a lot of buttons leading to websites now: An arrow leading to the author website. An author name leading to the author website. A 'read more' label leading to the plug-in website and this new button leading to the plug-in website. Maybe we should raise this with the designer.

Contributes to issue CURA-8565.
2021-11-29 18:46:56 +01:00
Ghostkeeper
09b4bd2ac2
Add forgotten ArrowLeft icon
I've been using this for a while. It should've been included with the commit that added the button, but oh well.

Contributes to issue CURA-8565.
2021-11-29 18:37:54 +01:00
Ghostkeeper
e173fa2d9d
Add package description in full to detail card
I realise that this might cause the card to become taller than the window. Might need to do something about that.

Contributes to issue CURA-8565.
2021-11-29 18:33:58 +01:00
Ghostkeeper
0546f58e57
Add extended description header
Wrapping the whole content so far in another column so that we can have a wider part below, automatically aligned.

Contributes to issue CURA-8565.
2021-11-29 18:26:28 +01:00