1025 Commits

Author SHA1 Message Date
Ghostkeeper
a878cfae7a
Merge branch 'master' into marketplace_redesign 2021-12-31 14:07:51 +01:00
casper
02c81234d0 Remove references to the toolbox plugin from the themes.json
Some other components were (incorrectly) using these theme variables.
Replaced them by another theme variable with the same value.

CURA 8588
2021-12-30 13:38:16 +01:00
casper
a0bb1eda94 Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement 2021-12-06 17:10:27 +01:00
casper
4848c474e8 Implement UX design for maketplace license dialog
cura 8587
2021-12-06 17:10:13 +01:00
Ghostkeeper
f932239b6a
Implement aesthetics of busy indicator
Don't use the default spinner but use an image from our theme. A new image. And change the font size, colour and spacings a bit according to our designs.

Contributes to issue CURA-8587.
2021-12-06 16:52:47 +01:00
Jaime van Kessel
7a902f8314 Add restart required banner
CURA-8587
2021-12-06 11:28:06 +01:00
Ghostkeeper
df66bcb541
Add additional buttons at the bottom for materials with links to data sheets
And where to buy it.

Contributes to issue CURA-8585.
2021-12-03 13:26:59 +01:00
casper
52c8e6b217
Decrease size of the icons in the marketplace onboarding banners
CURA-8564
2021-12-03 13:26:48 +01:00
Ghostkeeper
6f65521ce8
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-12-03 13:25:54 +01:00
Ghostkeeper
ecc3760e8e
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-12-03 13:25:48 +01:00
Ghostkeeper
b1af7ad203
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-12-03 13:25:26 +01:00
Ghostkeeper
39488823b1
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-12-03 13:25:25 +01:00
Jelle Spijker
3c225f1a73
Fixed some layout issues with the Package Cards
Contributes to: CURA-8587
2021-12-03 13:25:08 +01:00
Ghostkeeper
64dba8374a
Remove fill colours
The colour gets determined by the theme.

Contributes to issue CURA-8562.
2021-11-22 17:17:24 +01:00
Jelle Spijker
05c0857cb2
Add Certified icon
Contributes to CURA-8562
2021-11-19 11:21:30 +01:00
fieldOfView
9ebd8524ad Use badge icons 2021-11-18 10:53:35 +01:00
fieldOfView
77cfd8218a Add warning and error badge icons 2021-11-18 10:23:53 +01:00
Jaime van Kessel
d7e023c5ee Fix sizes of icons in package card
CURA-8561
2021-11-17 10:56:06 +01:00
Remco Burema
51de234082
Links, hovers, ensmallify layout.
part of CURA-8561
2021-11-10 18:09:36 +01:00
Jaime van Kessel
0bb09a4783 Replace all old controls 1 comboboxes with UM.Combobox 2021-11-10 14:57:01 +01:00
Jaime van Kessel
e0ff70dc78 Convert stage buttons to controls 2 2021-11-10 13:47:41 +01:00
Ghostkeeper
e0508b0f4f
Correct size and margins for package icon
Contributes to issue CURA-8561.
2021-11-09 15:08:33 +01:00
Remco Burema
bb51dc7d14
Gather and show required information.
Also add 'Downalod' icon. Still very much WIP and nonfunctional.

part of CURA-8561
2021-11-05 18:44:31 +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
73bb311293
Add dark theme entry for background of detail panels
Otherwise it uses the very bright light theme which doesn't match with the light text colour in dark mode.

Contributes to issue CURA-8556. Found during issue CURA-8557.
2021-10-29 15:47:22 +02:00
Jaime van Kessel
6c416742fb Merge branch 'dark-theme-images' of github.com:Ultimaker/Cura 2021-10-28 14:11:20 +02:00
10r3n20
00120870e1 add dark themed images to the dark theme 2021-10-26 13:01:15 +02:00
Ghostkeeper
35ec8f7190
Add basic layout for button to load more packages
Contributes to issue CURA-8556.
2021-10-21 18:06:52 +02:00
Ghostkeeper
1320d8c9f4
Add a simplistic design for a card for each package
It just displays the package name for now.

Contributes to issue CURA-8556.
2021-10-21 17:09:12 +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
Ghostkeeper
d9d83b4334
Add page for when the user has no cloud printers
It should show this image, instructions, and a refresh button.
If the refresh button is pressed and the user now has more printers, it should automatically swap to the printer list. Or vice-versa if printers get deleted on the website.

Contributes to issue CURA-8609.
2021-10-06 16:42:56 +02:00
Ghostkeeper
e5dc90a519
Add USB syncing page to swipe view
Looks like a lot of blank space. May need to adjust sizes.

Contributes to issue CURA-8609.
2021-10-06 15:11:14 +02:00
Ghostkeeper
b98da6b538
Merge branch 'master' into CURA-8609_sync_materials_to_printer
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> Both master and my branch added an __init__ function. I merged the two __init__s to do both things that need to be done.
2021-10-06 14:22:18 +02:00
Ghostkeeper
554f580f13
Add extra card to refresh printer list
Contributes to issue CURA-8609.
2021-10-05 17:28:26 +02:00
Ghostkeeper
7a47ffb1b7
Add design for cards with printers
I'm adding the theme entry 'card' once and for all to hopefully unify the design we're using for cards in the toolbox, in the digital library, in the LAN connection interface, etc.

Contributes to issue CURA-8609.
2021-10-05 16:34:45 +02:00
Ghostkeeper
d8dcd0affc
Replace three image layout with a single unified image
This new image positions all the images correctly and makes sure it all uses the correct line width even though they are scaled relatively to each other.

Contributes to issue CURA-8609.
2021-10-05 11:44:06 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type
CURA-8601
2021-10-05 10:20:52 +02:00
Ghostkeeper
346d9f1db2
Add images describing the workflow to first page
Contributes to issue CURA-8609.
2021-10-04 17:59:16 +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
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
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
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
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
Ghostkeeper
c779135112
Rename Group icon to People, and add high detail variant
The icon is called People in the UX team's icon system, and we need to stay aligned to that.
The high detail variant has an extra person in it.

Contributes to issue CURA-8530.
2021-09-01 18:01:10 +02:00
Ghostkeeper
b7b0d25615
Add high detail versions of some icons
The group icon seems to be broken though. We'll look into it.

Contributes to issue CURA-8530.
2021-09-01 15:39:04 +02:00
Konstantinos Karmas
de1a299e7a Add missing view_normal icon in the deprecated icons
Also remove the capitalization from the `viewMode`.

CURA-8520
2021-08-30 14:28:52 +02:00
Konstantinos Karmas
57b0287c84 Add missing Play icon
The `play` icon is readded to the theme and remapped to the `Play.svg`.

Found by @fieldOfView.

CURA-8520
2021-08-30 14:27:52 +02:00
Konstantinos Karmas
cf93f66135 Add missing Group.svg icon
CURA-8520
2021-08-30 11:42:57 +02:00
Konstantinos Karmas
b41b0e55b5 Add missing icon mappings
CURA-8520
2021-08-30 11:29:18 +02:00