75 Commits

Author SHA1 Message Date
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
Joey de l'Arago
1133e76e66 Add sign in wall
CURA-10183
2023-02-09 17:41:08 +01:00
c.lamboo
bee4da6368 Re-use Marketplace Component in the InstallMissingPackagesDialog
CURA-6990
2022-06-06 22:27:31 +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
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jaime van Kessel
605280255f Use right enum for alignment 2022-04-06 09:53:48 +02:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag
Contributes to CURA-8640
2022-03-24 11:58:42 +01:00
j.delarago
30083c13d3 Swap implicit width/height for preferredWidth/Height to avoid binding loop error
CURA-8688
2022-03-02 11:34:03 +01:00
Jaime van Kessel
a36fedabe5 Remove unused fontMetrics objects
CURA-8762
2022-02-22 15:53:07 +01:00
Jaime van Kessel
ac6375d17b Don't nest all content in background rect
This way we don't have an extra identation depth, makes it a bit easier to read

CURA-8726
2022-02-22 15:47:48 +01:00
Jaime van Kessel
a05650f64c Fix margins for OnboardBanner
Re-usable components shouldn't really be setting layout themselves.
This should be done by whomever creates them.

The actual fix is that the banner no longe sets all margins, only left & right

CURA-8726
2022-02-22 15:44:30 +01:00
Jaime van Kessel
adfb78e38a Fix spacing
CURA-8762
2022-02-22 15:11:11 +01:00
Jaime van Kessel
80f99b0a59 Fix positioning of marketplace searchbar
CURA-8762
2022-02-22 15:03:57 +01:00
Jaime van Kessel
7deeb26e13 Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace 2022-01-03 11:32:06 +01:00
Jaime van Kessel
6a39862349 Merge RestartManager into marketplace
CURA-8588
2022-01-03 11:12:52 +01:00
Jaime van Kessel
6af2677c52 Remove TabManager
Since marketplace itself already needed to be a qObject, there wasn't
really a need to have a seperate object for it
2022-01-03 11:06:19 +01:00
Jaime van Kessel
c92fcc8e03 Simplify the notifaction icon logic
CURA-8658
2022-01-03 10:14:22 +01:00
casper
fe30a3c19e Add notification badge for the gear icon in the Market Place
CURA 8658
2021-12-30 12:24:14 +01:00
Remco Burema
1cdeaffab7
Make new Marktetplace react to 'get more materials'.
part of CURA-8588
2021-12-30 11:53:42 +01:00
Jelle Spijker
fd508342fe
Renamed Manager to RestartManager
Contributes to: CURA-8587
2021-12-08 14:33:22 +01:00
Jelle Spijker
6c976bc9b0
Introduced a Manager to centralize plugin/package management
Should have done this from the start.
Will move other relevant scattered functions to this type.
For now it checks if the restart banner needs to show.
Taking into account that a user can toggle between enable
and disable without an actual restart. Even with multiple
plugins.

Contributes to: CURA-8587
2021-12-08 08:06:56 +01:00
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