11720 Commits

Author SHA1 Message Date
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
Ghostkeeper
d4ebf3baa0
Also use proper icon size for left icon
Almost forgot!

Contributes to issue CURA-8565.
2021-12-03 13:25:09 +01:00
Ghostkeeper
04501f788c
Allow changing the icon size
But use the same default as what was previously hard-coded. Now we can have buttons with non-standard icon sizes then, e.g. if the button size itself is also non-standard.

Contributes to issue CURA-8565.
2021-12-03 13:25:09 +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
Jaime van Kessel
d7e023c5ee Fix sizes of icons in package card
CURA-8561
2021-11-17 10:56:06 +01:00
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
Remco Burema
51de234082
Links, hovers, ensmallify layout.
part of CURA-8561
2021-11-10 18:09:36 +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
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
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
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
Ghostkeeper
7680124f7e
Merge branch 'master' of https://github.com/mlapkin/Cura into mlapkin-master 2021-10-18 17:36:46 +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
mlapkin
efa292e28d
Update fdmprinter.def.json.po
Fix translation of 'order'.
2021-10-18 18:37:56 +07:00
Ghostkeeper
89c5a38afa
Use a neutral e-mail address
If I end up under a bus, these e-mails will then still arrive somewhere.
2021-10-16 11:52:29 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
Ghostkeeper
a1a4d421ca
Consistent user-visible naming of Arjun Pro printers
Contributes to issue CURA-8580.
2021-10-15 16:13:31 +02:00
Ghostkeeper
57f4807f98
Update setting_version to 19
This was committed before we implemented that version upgrade. But we do it now. This requires that we update references to the FLSun SR printer, but obviously there are none in here.

Contributes to issue CURA-8580.
2021-10-15 16:12:27 +02:00
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
Ghostkeeper
c6d92dc8d6
Fix combing mode override
This needs quotes, since it's a Python expression. Otherwise it would get interpreted as a variable name which doesn't exist.

Contributes to issue CURA-8627.
2021-10-13 17:23:09 +02:00
Ghostkeeper
f0262abbb5
Combine two property overrides in one setting, for proper JSON
Otherwise the maximum gets ignored because the JSON results in a dict where the keys are unique. So the second one happens to get skipped then.

Contributes to issue CURA-8627.
2021-10-13 15:46:35 +02:00
Ghostkeeper
43897b60d8
Properly use strings as values for enums in setting overrides
This is interpreted as a Python function, so if it doesn't have those quotes it'll be interpreted as a variable name, and that variable doesn't exist.

Contributes to issue CURA-8627.
2021-10-13 15:42:46 +02:00
Jelle Spijker
246c986d95
Merge pull request #10605 from Ultimaker/CURA-8550_lightning_infill
CURA-8550 Added lightning infill description and sub-settings level.
2021-10-13 12:21:29 +02:00
Konstantinos Karmas
f68d915235
Merge pull request #10509 from Ultimaker/PP-1-Improved_print_profiles
Various print profile improvements for the UM3, S3 and S5
2021-10-12 16:10:48 +02:00
p.kuiper
7deb31db98 Bug fixes.
- Removed default value when value is already set.
 - Make sure UM3 and UM3 extended variants are the same
2021-10-12 12:54:26 +02:00