362 Commits

Author SHA1 Message Date
Konstantinos Karmas
99f8c85065 Style the "no plugin/material installed" texts in the installed tab
The default black text color was invisible in the dark theme.
2021-08-24 13:33:05 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
2021-08-24 13:32:25 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Ghostkeeper
0a75c772ed
Unrevert new icon set for all of Cura's interface
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons""

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
2021-06-28 17:16:56 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Jaime van Kessel
70e4e9640e
Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"
This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.
2021-05-27 16:06:20 +02:00
jelle Spijker
2bd6f28f3a
Update Icons
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
2021-04-26 19:42:17 +02:00
Jaime van Kessel
aed653546a
Merge branch 'CURA-8126_Fix_Toolbox_not_closing_instantly_after_quitting' of github.com:Ultimaker/Cura 2021-03-30 14:26:47 +02:00
Kostas Karmas
54b30f20a3 Fix Toolbox window not closing instantly after pressing "Quit Cura"
After installing a package and hitting the "Close Ultimaker Cura" button, the Toolbox window
was remaining open for a few seconds, even though the Cura window was instantly closing.

This is not fixed by explicitly hiding the Toolbox dialog once that button is pressed.

CURA-8126
2021-03-30 11:49:56 +02:00
Kostas Karmas
6abb029afd Fix marketplace button not directing to the web marketplace
We generally disabled the clicks in the mouseArea of the tooltips.
In this case though it should still accept the left click since it acts as a button.

CURA-8125
2021-03-30 11:40:03 +02:00
Kostas Karmas
189d00c3ed Fix toolbox not initializing due to enabledChanged signal
The Connections in qml is a QObject and it has an enabledChanged signal by default.
Therefore, we cannot really use the Connections to connect to the enabledChanged signal of e.g.
a python class, because qml complains that there is already a function named enabledChanged() in
the Connections.

To circumvent that, we can simply rename the enabledChanged() signal of the Toolbox to
toolboxEnabledChanged().
2021-03-30 09:02:56 +02:00
Kostas Karmas
7827b36ab7 Fix QML warnings due to depricated on<signal> calls in Connections
As of 5.12, the signals used in connections should not be declared as on<signal>, but as
function on<signal>(arguments).
2021-03-30 09:02:48 +02:00
Ghostkeeper
5668eba6b2
Don't use anchors in a Layout context
The anchors won't work then. They can never mix.
In this case it's easiest to continue with the Layout.

Contributes to issue CURA-7501.
2020-10-16 15:41:14 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
2020-08-11 11:32:53 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
2020-08-11 11:18:37 +02:00
Kostas Karmas
3228766dd5 Fix "Fetching Packages" text in the Marketplace in dark mode
CURA-7627
2020-08-05 14:12:00 +02:00
Remco Burema
60dd4f411b
Readable text in dark mode.
part of CURA-7627
2020-08-05 08:03:12 +02:00
Kostas Karmas
8a7dd2cfdf Update Toolbox labels to be aligned with the Digital Factory
CURA-7605
2020-07-27 11:58:55 +02:00
Kostas Karmas
2c6cbc7be4 Fix qml warnings in ToolboxAuthorPage 2020-07-27 10:40:53 +02:00
Remco Burema
51a13675a5
Remove rating packages/materials.
Online teams decided not to support ratings anymore, making this a rather useless feature in the upcoming release.

CURA-7606
2020-07-22 12:51:20 +02:00
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
2020-04-22 15:18:48 +02:00
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Remco Burema
8d6cbdf673
Fix long materials title causes misalign.
CURA-7240
2020-04-01 17:57:33 +02:00
Remco Burema
07569c6b88
Fix extra line after plugin/materials list.
CURA-7240
2020-04-01 17:54:56 +02:00
Remco Burema
90ffa2a772
Explain empty installed materials/plugins brackets.
part of CURA-7240
2020-03-31 16:56:45 +02:00
Jaime van Kessel
c764326c25
Fix marketplace installed plugins/materials empty rectangle
CURA-7240
2020-03-31 15:57:08 +02:00
Remco Burema
d89fce6240
Order bundled/installed packages/materials section.
And other finishing touches.
part of CURA-7240
2020-03-31 12:02:46 +02:00
Remco Burema
85490dc58a
[Marketplace] De-emphasize pre-installed packages.
Tried to do it the elegant way, couldn't get that to work within timebox.
part of CURA-7240
2020-03-31 11:52:55 +02:00
Kostas Karmas
5581705a0f Revert "Wrap the restart prompt text in Marketplace"
This reverts commit 2978b09e26b30b3ce007db04fdb8ce05026f35fa.
2020-03-31 11:32:34 +02:00
Kostas Karmas
2978b09e26 Wrap the restart prompt text in Marketplace
CURA-7332
2020-03-31 11:24:23 +02:00
Jaime van Kessel
da4bb127df
Add wordWrap to restart required message
In some languages (and on some operating systems) the
text would be cut off by the button
2020-03-31 10:56:03 +02:00
konskarm
bba6a5cc39
Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder
CURA-7162/Replace the default logobot.svg with a new placeholder
2020-03-30 15:05:37 +02:00
Kostas Karmas
eaef9f0f45 Open plugin author page with custom openUrl
CURA-7310
2020-03-24 16:42:46 +01:00
Kostas Karmas
4f0f7dec5e Open material author page with custom openUrl
CURA-7310
2020-03-24 16:42:22 +01:00
Kostas Karmas
92cef02ee5 Open "buy material spool" with custom openUrl
CURA-7310
2020-03-24 16:38:25 +01:00
Kostas Karmas
e003d76c1e Open links in materials with custom openUrl
CURA-7310
2020-03-24 16:36:09 +01:00
Ghostkeeper
b572fc68de
Don't hard-code the application name
As a response to the comment on commit d501f7730a42e45177fa3cdb89a4cdce1f1bd9a4.
2020-03-06 15:54:23 +01:00
Jaime van Kessel
d501f7730a
Show Full name for quit message
We're a bit insecure about Cura, so we have to put the company name in front of it ;)
2020-03-02 10:48:47 +01:00
Dimitriovski
77cf63acfa
Removed the new placeholder from WelcomePage.qml as we probably want to see the Robot there instead of the hexagon.
CURA-7162
2020-02-27 11:20:32 +01:00
Dimitriovski
1acfaf9705
added sourceSize property to qml's Image for better rendering
CURA-7162
2020-02-27 11:19:44 +01:00
Dimitriovski
510acfab62
Replaced the logobot.svg image with a new placeholder.svg image
CURA-7162
2020-02-21 17:05:27 +01:00
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071
CURA-7071/Added option to redirect to Web MP from Cura MP
2020-02-04 11:02:30 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura 2020-01-30 15:32:21 +01:00
Remco Burema
c6b6af14cf
Fix typo. 2020-01-30 15:06:47 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
CURA-7152
2020-01-30 12:51:13 +01:00
Ghostkeeper
242da1b3aa
Give web marketplace button a hover colour
It needs to be the same as the bar beneath the marketplace tab buttons when highlit.

Contributes to issue CURA-7071.
2020-01-28 14:47:00 +01:00
Ghostkeeper
6553443f3b
Make marketplace materials link slightly smaller
Contributes to issue CURA-7071.
2020-01-28 14:41:29 +01:00
Ghostkeeper
38e7a9e4df
Turn Marketplace link into an actual link
With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.

Contributes to issue CURA-7071.
2020-01-28 14:37:59 +01:00
Ghostkeeper
e51a1b18be
Add link text to marketplace search page
Contributes to issue CURA-7071.
2020-01-28 14:19:33 +01:00