28338 Commits

Author SHA1 Message Date
Remco Burema
518e59303d
Fix dashes in links.
part of CURA-8565 and/or CURA-8585
2021-12-01 14:01:41 +01:00
Remco Burema
c1298c6a5e
Hide search link when not needed. 2021-12-01 13:53:43 +01:00
Remco Burema
b5e06f6c67
Fix tooltip targetpoint. 2021-12-01 13:48:18 +01:00
Remco Burema
1a787e5df2
Solve layout warnings. 2021-12-01 13:22:50 +01:00
Orel
da6468e449 Decrease new mesh size 2021-12-01 12:55:24 +01:00
aschwenck
dc56d3e22e Add new Dagoma PRO 430 printer profiles 2021-12-01 12:46:09 +01:00
casper
bd9722654c Use FontMetrics component to calculate the line height
cura 8563
2021-12-01 11:45:30 +01:00
Jaime van Kessel
83b56726ba CHange _getBuiltinWelcomePagePath to be static
SHould have been static, so boyscouting it now

CURA-8696
2021-12-01 10:33:05 +01:00
Jaime van Kessel
22fcdf5c7b Change whatsnew to whats_new
They are seperate words, so should have an _ in between

CURA-8696
2021-12-01 10:30:52 +01:00
Jaime van Kessel
051c3ee2e2 Fix up documentation of WelcomePageModel
Some more boyscouting

CURA-8696
2021-12-01 10:29:31 +01:00
casper
bf168388dd Change styling of "Search in the browser" button in the marketplace
To comply with the UX design.

cura 8563
2021-12-01 10:29:21 +01:00
Jaime van Kessel
6bce9453e4 Fix warnings in newpages model
Boyscouting. These somehow snuck through code review

CURA-8696
2021-12-01 10:21:07 +01:00
Jaime van Kessel
a057cbe481 Minor codestyle cleanup
Boyscouting

CURA-8696
2021-12-01 10:18:04 +01:00
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 49db5be3aa731f8c9be6fe39f77ccbb8ee26f622.
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