4887 Commits

Author SHA1 Message Date
Remco Burema
87f94e680b
Use re-usable search-bar for Settings search as well.
done as part of CURA-8559
2021-11-16 10:20:08 +01:00
Remco Burema
bc0b7301e5
Merge remote-tracking branch 'origin/marketplace_redesign' into CURA-8559_add_marketplace_search 2021-11-12 13:10:20 +01:00
Remco Burema
b5d58f78d7
Fix: Actually make SearchBar-component independant.
It still depended on the Digital Library 'parent'.

part of CURA-8559
2021-11-12 11:49:37 +01:00
Remco Burema
977a12c989
Steal search-bar from DigitalFactory.
Make 'SearchBar' into a reusable component, so it can be used in the (new) Marketplace search. Also now at least the word 'Search' can be translated ;-)

part of CURA-8559
2021-11-12 09:52:24 +01:00
Remco Burema
c1f2da8820
Layout fixes.
Prevent 'height' based binding loops.

part of CURA-8561
2021-11-11 17:30:43 +01:00
Ghostkeeper
797ff9c573
Turn new Marketplace button into button with text instead of icon
The Marketplace icon is apparently confusing to use for the Marketplace in Cura and should only be used for the website version.

Contributes to issue CURA-8556.
2021-10-25 11:08:14 +02:00
Ghostkeeper
aed52cea74
Split functionality of the two marketplace buttons
One now opens the old one again. One still opens the new one (but with a new name).

Contributes to issue CURA-8556.
2021-10-25 01:11:26 +02:00
Ghostkeeper
7796abd55b
Revert "Revert "Add new button to open the Marketplace""
This reverts commit aa4b7ddb8bce12c4ff2ea8864c1dad63a7a0a7c4.
Apparently it is now in scope again for the button to be there. It's in the requirements and the requirements are holy. Whoopteedoo.

Contributes to issue CURA-8556.
2021-10-25 00:51:26 +02:00
Ghostkeeper
8beac74417
Let Marketplace button open Marketplace instead of Toolbox
This hijacks the button to open something else. The old Toolbox is no longer accessible now.

Contributes to issue CURA-8556.
2021-10-19 13:46:21 +02:00
Ghostkeeper
aa4b7ddb8b
Revert "Add new button to open the Marketplace"
This reverts commit 648aa3d84cd11439b6457aa81285ea9a5ac202f0.
Apparently we don't want to retain the old Toolbox alongside, not even during development.

Contributes to issue CURA-8556.
2021-10-19 13:09:22 +02:00
Ghostkeeper
648aa3d84c
Add new button to open the Marketplace
For now this button opens the same Marketplace. I must maintain both Marketplaces side-by-side for the moment though.

Contributes to issue CURA-8556.
2021-10-18 17:49:55 +02:00
Jelle Spijker
666880ad20
Only show certain App Switcher icons when account has DF access
Added a dictionary where additional user rights can be set.
A plugin such as the DigitalFactory can update this dictionary
if certain account rights change. The `account.additionalRights`
is intended to allow us some flexibility, without breaking the API
in the future.

The Application Switcher now queries the additional account rights,
which is updated by the DF plugin to only show `My printers`,
`Digital Library` and `Print jobs` when the user has access to the
DF.

Contributes to CURA-8624
2021-10-18 15:37:06 +02:00
Jelle Spijker
629f695ef7
Only show certain Application Switcher links when logged in
Some links in the application only make sense to
forward a user when they are logged into the DF.
Since we don't expose yet if the user has access
to the DF it will now only check if they are
logged in.

Contributes to CURA-8624
2021-10-18 15:37:06 +02:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
2021-10-08 18:17:18 +02:00
Jaime van Kessel
cc92f4c1e0 Merge branch 'CURA-8602_move_skip_button_onboarding_flow' of github.com:Ultimaker/Cura 2021-10-05 11:01:55 +02:00
Jelle Spijker
b49004a742
Reorient layout of skip, sign-in and create
* Skip button
  - Moved to the left, such that a user won't click on it mindlessly
  - Made it a Tertiary button, so it will have predictable margins
* Sign-in button
  - Moved to the right bottom, making it the logical next option
* Create an account
  - Moved to be inline with skip and sign-in
  - Made it a secondary button as requested by UX

Contributes to CURA-8602
2021-10-04 16:48:51 +02:00
Ghostkeeper
ebee7dbec9
Remove space from link
This was probably a copy-paste error.
2021-10-01 10:22:38 +02:00
Konstantinos Karmas
5266cbb950 Initiate an account sync immediately after pressing "Add cloud printer"
It was a bit weird that the sync didn't happen immediately and you had to wait for 30seconds until the printer appeared.
2021-09-23 12:53:57 +02:00
Jaime van Kessel
0656e11afa Fix styling of application button
Fixes previous mistake that I made while simplifying the QML

CURA-8421
2021-09-22 13:53:49 +02:00
Jaime van Kessel
e39675e447 Use styled tooltip
CURA-8422
2021-09-22 13:44:45 +02:00
Jaime van Kessel
5a8396651e Update the copy of the tooltips
CURA-8422
2021-09-22 12:59:43 +02:00
Jaime van Kessel
aa905a80fe Add animations to hover effect
CURA-8421
2021-09-22 09:48:27 +02:00
Jaime van Kessel
90bfdce3bb Further simplify the qml of applicationSwitcherPopup
CURA-8421
2021-09-22 09:45:53 +02:00
Jaime van Kessel
0c9ef1e647 Move ApplicationSwitcherPopup to it's own file
CURA-8421
2021-09-22 09:43:49 +02:00
Jaime van Kessel
fd0804646a Simplify the QML of application switcher
CURA-8421
2021-09-22 09:40:32 +02:00
Jaime van Kessel
9bf5d85be1 Add animation to hover effect
CURA-8421
2021-09-22 09:36:47 +02:00
Jaime van Kessel
f55e3363d0 Remove unneeded property change
CURA-8421
2021-09-22 09:35:09 +02:00
Jaime van Kessel
dc181a3426 Simplify QML of application button
CURA-8421
2021-09-22 09:33:13 +02:00
Jaime van Kessel
e0b38f2782 Add animation to hover effect
CURA-8421
2021-09-22 09:29:47 +02:00
Konstantinos Karmas
96436fbedd Remove unnecessary anchor
Fixes review comment https://github.com/Ultimaker/Cura/pull/10491#discussion_r713124155.

CURA-8421
2021-09-21 17:36:04 +02:00
Konstantinos Karmas
c73f815b69 Use anchors instead of setting the width
Fixes review comment https://github.com/Ultimaker/Cura/pull/10491#discussion_r713119985.

CURA-8421
2021-09-21 17:32:06 +02:00
Konstantinos Karmas
2f75e299f5 Set the width in the parent item
Fixes review comment https://github.com/Ultimaker/Cura/pull/10491#discussion_r713127038.

CURA-8421
2021-09-21 17:31:37 +02:00
Konstantinos Karmas
a3d04bc752 Use the correct color for the label
CURA-8421
2021-09-21 16:16:14 +02:00
Konstantinos Karmas
ed0fc26051 Fix unthemed label
Since in dark mode it stays black and it disappears in the background.

CURA-8421
2021-09-21 15:51:01 +02:00
Jaime van Kessel
1aadb1bade
Merge pull request #10492 from Ultimaker/CURA-8422_add_platform_links
Add links to Ultimaker website applications
2021-09-21 15:45:37 +02:00
Konstantinos Karmas
c91509418e Make all the top right buttons uniform
Instead of inverting the fill and the text color in those buttons when hovering on those buttons, they will now show a light background fill when hovered.

CURA-8421
2021-09-21 15:36:31 +02:00
Konstantinos Karmas
ab77efd9c4 Move the popup so that the arrow isn't drawn exactly on the corner
CURA-8421
2021-09-21 15:07:04 +02:00
Konstantinos Karmas
e2d19668e4 Change the hover colors of the AppSwitcher button
So that they are more subtle.

CURA-8421
2021-09-21 15:00:25 +02:00
Ghostkeeper
df7ddd305c
Add tracking tags to Ultimaker website links
Contributes to issue CURA-8422.
2021-09-21 13:17:08 +02:00
Konstantinos Karmas
cd505d575d Merge branch 'CURA-8421_Introduce_app_switcher' into CURA-8422_add_platform_links 2021-09-21 11:35:02 +02:00
Konstantinos Karmas
6df9f9f72c Remove debugging code
So that all platform links have the link icon indicator in the bottom right corner.

CURA-8421
2021-09-21 11:32:38 +02:00
Konstantinos Karmas
ee564782b5 Remove comment
CURA-8421
2021-09-21 11:06:45 +02:00
Konstantinos Karmas
0d932991d4 Rename ApplicationSwitcher.svg to BlockGrid.svg
Since it is the original filename in the design.

CURA-8421
2021-09-20 17:24:06 +02:00
Konstantinos Karmas
fea8ecd55f Rename the qml elements and the theme entries used in AppSwitcher
To some more sensible names (hopefully).

CURA-8421
2021-09-20 17:19:37 +02:00
Konstantinos Karmas
d844c5f70a Fix alignment of the ApplicationSwitcher button
The sign in button has a different size when you are logged in, where the account avatar was being drawn in the middle of the Sign In button. This was causing a weird alignment of the ApplicationSwitcher next to it, as it was adding an extra margin.

This is now fixed by making sure that the width of the button that has to do with account adjusts according to whether you are logged in or not. This makes the ApplicationSwitcher icon move when you log in but looks more natural relatively to the account button.

CURA-8421
2021-09-20 16:57:16 +02:00
Konstantinos Karmas
a9968acd6d Fix misalignment of images if the displayName spans to next line
When the displayname of the app is long and it spans to the next line, it was pushing the icon up in the column, making it seem like it is misaligned. This is now fixed and the icons should be aligned regardless if the display name has one or two lines.

CURA-8421
2021-09-20 16:42:22 +02:00
Ghostkeeper
82922fd738
Merge branch 'CURA-8421_Introduce_app_switcher' into CURA-8422_add_platform_links 2021-09-20 16:36:49 +02:00
Ghostkeeper
c518f0de93
Add links to Ultimaker's platform websites
The links are not final since they will need some campaign tags. For the rest it should be more or less done.

Contributes to issue CURA-8422.
2021-09-20 16:36:26 +02:00
Konstantinos Karmas
15884a66e8 Warp and elide ApplicationButton display name
To make sure that it properly fits in the available space.

CURA-8421
2021-09-20 15:58:53 +02:00
Konstantinos Karmas
570fb3cf93 Introduce the ApplicationSwitcher widget
It includes only the hardcoded model with the Ultimaker links for now.

CURA-8421
2021-09-20 15:33:05 +02:00