52 Commits

Author SHA1 Message Date
Jelle Spijker
0fefe85fca
Present restart banner if plugin has been en-/disabled
Contributes to: CURA-8587
2021-12-07 08:57:56 +01:00
Ghostkeeper
e646d53b53
Make quit button quit Cura
Contributes to issue CURA-8587.
2021-12-06 16:05:48 +01:00
Ghostkeeper
3c54964417
Use same content for button as old one
So make it dynamic based on the application name. This also causes the translation to be re-used.

Contributes to issue CURA-8587.
2021-12-06 16:05:48 +01:00
Ghostkeeper
3cae6d80b9
Show restart banner only when a restart is required
Contributes to issue CURA-8587.
2021-12-06 16:05:47 +01:00
Jaime van Kessel
de0dc568cd Change rectangle into item
It had no color, so it doesn't need to be a rectangle

Cura-8587
2021-12-06 11:30:27 +01:00
Jaime van Kessel
7a902f8314 Add restart required banner
CURA-8587
2021-12-06 11:28:06 +01:00
Remco Burema
813bbb30e4
Merge branch 'marketplace_redesign' into CURA-8585_marketplace_material_details 2021-12-01 14:08:20 +01:00
Remco Burema
c1298c6a5e
Hide search link when not needed. 2021-12-01 13:53:43 +01:00
Remco Burema
1a787e5df2
Solve layout warnings. 2021-12-01 13:22:50 +01:00
casper
bd9722654c Use FontMetrics component to calculate the line height
cura 8563
2021-12-01 11:45:30 +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
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
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
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
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
casper
6ca20ba863 Rename properties in marketplace onboarding banner
CURA-8564
2021-11-29 15:09:33 +01:00
casper
c136deb430 Remove top anchor from an element used in ColumnLayout
This element did need additional margins at the top. Added margins
to the ColumnLayout element instead.

CURA-8564
2021-11-29 14:34:15 +01:00
Ghostkeeper
6d1ffbde69
Remove superfluous anchors.fill
This is already set by the StackView, which (logically) requires that the children fill the entire space taken by the StackView.

Contributes to issue CURA-8565.
2021-11-29 11:59:46 +01:00
casper
f8d9f1e39c Use visible property of Rectangle
rather than defining a separate property

CURA-8564
2021-11-29 11:55:33 +01:00
casper
00135e574d Rename property bannerBody to bannerText
CURA-8564
2021-11-29 11:53:35 +01:00
casper
f1ef1c283e Add links to read me support pages
Note that since the support pages are not yet ready the "read more"
buttons are hidden. Once the correct link is added they become visible
again.
2021-11-27 13:48:38 +01:00
Ghostkeeper
a715274ca7
Add a StackView around Marketplace to allow extra pages on top
This allows a sort of full-screen pop-up to replace the entire Marketplace window contents, on top of the normal contents. The normal contents are kept as they are, but out of view.

Contributes to issue CURA-8565.
2021-11-26 16:04:23 +01:00
casper
3ddfa6486b Remove banners when clicking close button 2021-11-26 14:49:00 +01:00
casper
20f94add47 Display different content on each of the marketplace onboarding banners 2021-11-26 10:10:09 +01:00
casper
853f915f2a Add basic onboarding banner to the market place 2021-11-26 10:06:50 +01:00
Remco Burema
307d751c2d
Fix white rectangles in dark mode and height of search-bar.
part of CURA-8559
2021-11-18 08:14:04 +01:00
10r3n20
cc401e107e fixed conflicts 2021-11-17 10:07:42 +01:00
10r3n20
4c6441f65e moved manage packages button inside the tabBar and adjusted styling 2021-11-16 14:02:07 +01:00
10r3n20
74193ffff9 moved padding to PackageTybeTab and replaced default margin with narrow margin 2021-11-16 11:29:48 +01:00
Remco Burema
24eaad4c6d
Make switching Marketplace-tabs work with search-bar.
Reset search-bar (text) when switching tabs. Also hide search-bar (at least for now) when dealing with the managed packages tab.

part of CURA-8559
2021-11-12 15:37:59 +01:00
Remco Burema
79f7724923
Actually set search string + fix code style warnings.
It now works! Sort of. Turns out you have to manually click 'Load More' each time now :-) This is also at least partially explains the 'cases' mentioned in previous commit (when switching tabs).

part of CURA-8559
2021-11-12 14:30:09 +01:00
Remco Burema
d7ac307ace
Type in the search-bar and the remote package list reacts.
It doesn't do any actual searching yet though. Also switching between page doesn't work like it's supposed to yet (and probalby more of that sort of cases).

part of CURA-8559
2021-11-12 14:01:05 +01:00
Remco Burema
7432c0d8f0
Add (not yet operational) search-bar to new Marketplace.
part of CURA-8559
2021-11-12 12:11:45 +01:00
Lorenzo Romagnoli
2cdda695e9
adjusted style of hover and button sizes (#10739)
adjusted style of hover and button sizes

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2021-11-05 10:15:35 +01:00
Jelle Spijker
3a94fc0ced
Apply suggestions from code review
Applied code review comments

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2021-11-03 17:58:16 +01:00
j.spijker@ultimaker.com
5db6e50dee
Fixed typo
not plug-ins but plugins

Contributes to CURA-8558
2021-11-02 16:21:27 +01:00
j.spijker@ultimaker.com
397baebda4
Changed deprecated qml syntax
Contributes to CURA-8558
2021-11-02 14:34:35 +01:00
j.spijker@ultimaker.com
b53a9840f3
Moved ManagePackagesButton to its own file
For better readability

Contributes to CURA-8558
2021-11-02 14:34:35 +01:00
Jelle Spijker
86d5d315bc
Differentiate between local and remote packages
There is a distinction between packages which are already
installed on the local machine and packages which are
available on the remote server. Even with this difference
it is important that they are handled the same and can be
reused in the same GUI elements.

In order to reduce code duplication I created a parent object
PackageList which contains the base logic and interface for
the QML and let both RemotePackageList and LocalPackageList
inherit from this.

UX specified that the gear icon (Settings.svg) should be
separate from the tabs of material and plugins. This also
ment that the current tab  item couldn't set the pageTitle
anymore. This is now defined in the Package component and
set when the loader has loaded the external QML file.

Contributes to CURA-8558
2021-11-01 17:12:18 +01:00
Ghostkeeper
03e1fc34b4
Change page title depending on selected tab
Contributes to issue CURA-8557.
2021-10-29 15:51:41 +02:00
Ghostkeeper
4191f98440
Switch pages to Materials when tab is clicked
And back to plug-ins when that tab is clicked.
Sadly, linking the content dynamically doesn't seem to work, with a custom property.

Contributes to issue CURA-8557.
2021-10-28 18:23:14 +02:00
Ghostkeeper
5f884321ea
Add design for tabs of package type selector
The width here is implementation-defined. Looks like it matches the design though. Seems like the design has 0 margins.

Contributes to issue CURA-8557.
2021-10-28 18:08:51 +02:00
Ghostkeeper
38b7f17615
Add basic tab bar to select pages
Contributes to issue CURA-8557.
2021-10-28 17:49:32 +02:00
Remco Burema
e3d90f16a1
Close new marketplace window when signing out or in
Because otherwise you can either see plugins you might not have the rights to, or not see plugins you do have the rights to.

part of CURA-8556
2021-10-27 17:42:00 +02:00
Jaime van Kessel
7bbc91b7a5 Clear contents of net marketplace if window is closed
CURA-8556
2021-10-27 16:11:02 +02:00
Ghostkeeper
b585c02207
Add background to page content, and restructure margins
To display the background across the entire bottom side and not with the margins of the column, we have to restructure where the margins are a bit.

Contributes to issue CURA-8556.
2021-10-21 16:35:54 +02:00