111 Commits

Author SHA1 Message Date
c.lamboo
b22fafadbe Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory"
because these are brand names.

CURA-9793
2022-11-29 15:26:51 +01:00
jspijker
f76f711790 Update mentions to UltiMaker
Contributes to CURA-9808
2022-11-28 14:11:21 +01:00
jspijker
61623720ca Update copyright using UltiMaker
Contributes to CURA-9808
2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker
Contributes to CURA-9808
2022-11-28 09:05:21 +01:00
Ghostkeeper
06c15f08aa
Make buttons in account fill the whole width
That makes them easier to click.
The text of these buttons was going outside of the buttons themselves. That could be a problem, but it's not visible since the button has no background.

Contributes to issue CURA-9143.
2022-05-09 11:59:00 +02:00
c.lamboo
66fde9100c Use QML defined enum in sync state
These are the enums from cura/API/account.py
somehow exposing these enums from python to QML doesn't work properly anymore
A better solution should be found in the very near future

CURA-9146
2022-04-21 11:32:03 +02:00
Jaime van Kessel
5a62278097 Fix display of username
CURA-9146
2022-04-15 10:16:00 +02:00
j.delarago
94e5a4e1db Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image.
CURA-9104
2022-04-11 14:10:27 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
Jaime van Kessel
124602d2ad Return account widget to it's former glory 2022-03-31 14:19:41 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
2022-03-28 15:33:43 +02:00
Jaime van Kessel
ba6c0438a1 Fix size of signed out account screen
CURA-8940
2022-02-21 15:27:27 +01:00
casper
1c711129e2 Merge branch 'replace_controls_1_for_controls_2' into CURA-8687_dialogs
# Conflicts:
#	resources/qml/Account/SyncState.qml
#	resources/qml/Preferences/ReadOnlySpinBox.qml
2022-02-11 10:44:52 +01:00
Jaime van Kessel
ddc43446e6 Fix wrapping in sync menu 2022-02-10 10:37:26 +01:00
casper
f957cc289e Fix Qt warnings
resolve binding loo in `SyncState`
move `updateCostPerMeter` function to root of `MaterialView` such that it is available of all sub components

Cura 8687
2022-02-07 22:01:45 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jaime van Kessel
aa905a80fe Add animations to hover effect
CURA-8421
2021-09-22 09:48:27 +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
ee564782b5 Remove comment
CURA-8421
2021-09-21 11:06:45 +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
Ghostkeeper
f4508c709e
Fix links to account sign up page
This was a miscommunication.

Contributes to issue CURA-8440.
2021-09-02 14:32:06 +02:00
Konstantinos Karmas
332475562b Change account signup link
CURA-8441
2021-08-09 13:00:03 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Konstantinos Karmas
9d70ea8a8a Size the avatar icon with the same height as the marketplace button
CURA-8202
2021-06-30 15:18:12 +02:00
Konstantinos Karmas
061e889371 Fix height binding loop in the account details popup
CURA-8202
2021-06-30 13:09:29 +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
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
Ghostkeeper
e6951327bb
Translate title of sign in screen
Formerly this probably wasn't translated because it's like a name or term. But now it definitely needs to be translated.

Contributes to issue CURA-8107.

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2021-04-02 11:09:24 +02:00
Ghostkeeper
9ebb5e4cee
Redesign log-in advertisement
This is a new text and new ordering. The title is above the image now, and the sign in has become a tertiary button.

Contributes to issue CURA-8107.
2021-04-01 19:33:35 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs
CURA-7813
2021-03-29 18:12:35 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Ghostkeeper
222d6604e0
Clarifications and fixes to source strings
Found during work on CURA-7622.
2020-08-21 16:40:24 +02:00
Jaime van Kessel
955b2950e8
Change tertiary button to use link text color
CURA-7627
2020-08-04 13:30:01 +02:00
Nino van Hooff
294afdb7ca Connect sync timer to sync() for consistency and add unit tests.
Also rename a function to camelCase

CURA-7473
2020-06-26 16:09:33 +02:00
Nino van Hooff
4f1a18f102 Add Install Pending Updates button to Account popup
CURA-7473
2020-06-26 11:37:01 +02:00
Nino van Hooff
6a02abefcd Change copy of "Your are in sync with your account"
to "Account synced"

Don't think the duplication I found is necessary, but I don't dare to
deduplicate it as I found some logic inconsistencies

CURA-7418
2020-06-17 15:34:13 +02:00
Kostas Karmas
60e38402fb Remove system palette
The SystemPalette was not properly reflecting the text color in the
dark theme (the icon remained black). For that reason, the palette
is removed and color for the icon have been added in the themes.

CURA-7418
2020-06-16 14:50:06 +02:00
Kostas Karmas
a9de95a1eb Fix minor visual issues
The following issues are fixed:
 * The visibility of the placeholder rectangle, according the existence
	of the avatar image
 * The initial letter not being visible in the dark theme
 * Vertical alignment of the avatar

CURA-7418
2020-06-16 14:41:52 +02:00
Kostas Karmas
78bd5520bd Add theme color for sync state icon
CURA-7418
2020-06-16 14:41:23 +02:00
Kostas Karmas
2b517a03cc Fix typo
CURA-7418
2020-06-16 14:39:50 +02:00
Kostas Karmas
87a97afd84 Add newlines at the end of files
CURA-7418
2020-06-16 13:35:28 +02:00
Jaime van Kessel
ec1ed80c9f
Add initials when no avatar is set
CURA-7418
2020-06-16 09:17:58 +02:00
Jaime van Kessel
0edb93176a
Fix some layout issues
CURA-7418
2020-06-15 14:09:01 +02:00
Jaime van Kessel
a7e7ddf4b5
Add the digital factory button
CURA-7418
2020-06-15 13:33:47 +02:00
Jaime van Kessel
d33529f932
Use property & states instead of listening to changed signal
It makes a lot more sense to me to use states and an actual property.

CURA-7418
2020-06-11 17:31:19 +02:00
Jaime van Kessel
f4c5a134c2
Move palette to syncstate
It should be there, since that is the only place it's being used

CURA-7418
2020-06-11 17:02:37 +02:00
Jaime van Kessel
d8d3f16c9f
Remove unneeded width property
CURA-7418
2020-06-11 17:01:04 +02:00