81 Commits

Author SHA1 Message Date
saumya.jain
3e18082db6 Code review comments
fixes: CURA-8754
2023-07-11 11:45:37 +02:00
saumya.jain
d12659f71f Added refresh moving icon for feedback purpose
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
2023-07-10 14:36:14 +02:00
saumya.jain
cca33bb4a5 Added refresh moving icon for feedback purpose
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
2023-07-10 13:50:37 +02:00
c.lamboo
1f1353802a Prefill material sync file name
CURA-10174
2023-02-20 17:41:07 +01:00
Ghostkeeper
9d820b8d02
Redirect to USB workflow if user account doesn't have permissions
If the user is not allowed to write profiles to the printers, then they'd get errors when trying to sync. Instead we'll redirect them to the USB workflow.
This also works for users that have accounts but don't have the printers in the cloud. The original requirements suggest that the entire sync button must be hidden for this case. But to allow those people to still sync via USB I'm opting for this solution instead.

Contributes to issue CURA-9220.
2022-07-26 17:21:08 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages
CURA-9428
2022-07-15 07:25:54 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
Jaime van Kessel
271868eafd Fix export material to usb
CURA-9122
2022-04-20 11:23:35 +02:00
Jaime van Kessel
e85420f9fa Fix few more instances of old usage of fileUrl vs selectedFile 2022-04-19 17:12:58 +02:00
j.delarago
3674af01b7 selectExisting is replaced with using fileMode:FileDialog.OpenFile in QT6. This forces selecting an existing file.
This is also the default value in QT6 so this line can be removed without changing the functionality
2022-04-12 10:21:34 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
f327c2479b Update Dialog imports to remove version
Update FileDialogs selectExisting -> fileMode and folder -> currentFolder

CURA-8640
2022-04-01 16:08:35 +02:00
j.delarago
99a3a8d11d QTQuick.Dialogs jumped to using 6.0 in QT6
Update imports to use correct version number.

CURA-8640
2022-03-29 16:04:02 +02:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag
Contributes to CURA-8640
2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Jaime van Kessel
5725f3d57f Fix height of syncMaterialCards
CURA-8688
2022-02-28 15:46:04 +01:00
casper
46fac4263b Fix styling issues in the material sync dialog
CURA 8939
2022-02-11 13:10:24 +01:00
Ghostkeeper
4d9039288b
Use new ScrollBar for material sync dialogue
Contributes to issue CURA-8686.
2022-01-18 19:10:06 +01:00
Jaime van Kessel
f11d728c6b Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2 2022-01-03 15:32:58 +01:00
Remco Burema
c8ed3634ed
Qt5->Qt6: Even more renaming stuff.
part of CURA-8591
2021-12-29 12:43:56 +01:00
fvrmr
6962ecdf01 Update material sync link
Changed link how to load material profiles via usb
2021-12-17 10:24:18 +01:00
Ghostkeeper
f0dc7a0eea
Adjust message to include suggestion to update firmware
Because the issue could also be that their firmware is outdated and doesn't yet support syncing material.

Contributes to issue CURA-8671.
2021-12-03 13:59:01 +01:00
Ghostkeeper
6f8a4e93e7
Fix name of capability to filter on
Contributes to issue CURA-8671.
2021-12-03 13:26:51 +01:00
Ghostkeeper
b76df21b4b
Filter printer list by capabilities
And an example of such usage: In the material sync via cloud we only want to sync with printers that can receive those materials.

We might want to add a message for the user to also make sure the firmware is up to date. Because if the firmware is not up to date now it will show no printers and instruct the user how to connect the printer to the cloud.

Contributes to issue CURA-8671.
2021-12-02 17:55:53 +01:00
Jaime van Kessel
a68584cda1 Replace more instances of label with UM.Label 2021-11-10 17:42:23 +01:00
Ghostkeeper
1b36bc2e81
Remove padding on troubleshooting button
Contributes to issue CURA-8609.
2021-11-03 13:46:47 +01:00
Ghostkeeper
9c684cbc4d
Hide entire footer when the user started syncing
If they started syncing, most likely the list of printers is just complete and the user won't need this any more.

Contributes to issue CURA-8609.
2021-11-03 11:26:37 +01:00
Ghostkeeper
a35fcf493a
Allow word wrapping for error message
This prevents being able to align the text vertically with the troubleshooting button though. The text may become the larger of the two, in which case the text should be leading the height. Qt can do this with a Layout, however it then can't automatically adjust the width of the layout there since that would create a polish loop in the layout.

Contributes to issue CURA-8609.
2021-11-01 18:59:06 +01:00
Ghostkeeper
e7e513bb16
Reduce width to 0 if the icon is neutral
Because with our default theme, the neutral icon is empty. This causes the alignment of the label next to it to appear off.

Contributes to issue CURA-8609.
2021-11-01 18:27:38 +01:00
Ghostkeeper
fd79b76f07
Add troubleshooting link to footer
It's moving there now. However if there are any errors syncing with the printers, the troubleshooting link has to disappear from there.

This makes the layout quite complex, since the icon on the left and the button on the right are no longer vertically centred. The text used to be vertically centred too, but can't do that any more since the text is not the determiner of the height any more, with there being a horizontally aligned button below it. It's all a bit complex now.

Contributes to issue CURA-8609.
2021-11-01 18:18:56 +01:00
Ghostkeeper
cd286a006e
Add missing colours, fixing dark theme
Don't just use white rectangles or black text. Use the theme where appropriate. And these rectangles are just outlines.

Contributes to issue CURA-8609.
2021-10-29 15:18:40 +02:00
Ghostkeeper
ce4117a3ee
Reset export USB button when re-opening window
To do that, I moved the property to track that state to the root of the window.

Contributes to issue CURA-8609.
2021-10-29 15:12:16 +02:00
Ghostkeeper
c58d03ad4c
Change button to 'done' once USB export has completed
Also important to keep in mind: It won't change to 'done' if the user cancelled the file dialogue.

Contributes to issue CURA-8609.
2021-10-29 15:06:44 +02:00
Ghostkeeper
f56e438747
Fix broken references
Just some things that the QML is complaining about. This actually did fix the spinning of the spinners.

Contributes to issue CURA-8609.
2021-10-15 15:52:54 +02:00
Ghostkeeper
bfb8d9ddf1
Show 'Done' button when sync was successful
And make it close the window when pressed then.

Contributes to issue CURA-8609.
2021-10-12 17:34:34 +02:00
Ghostkeeper
5b14792c76
Use 'try again' as button text if the first attempt failed
Contributes to issue CURA-8609.
2021-10-12 17:30:20 +02:00
Ghostkeeper
c2057c94db
Only show troubleshooting link if there is an error
And show it next to the error.

Contributes to issue CURA-8609.
2021-10-12 17:28:09 +02:00
Ghostkeeper
bfb39cf989
Add spinners and status icons per printer
These make use of the per-printer sync status to show either nothing, a spinner, a cross or a checkmark.

Contributes to issue CURA-8609.
2021-10-12 17:09:54 +02:00
Ghostkeeper
052e33e66b
Don't anchor status label to button any more
It's now in a completely different place.

Contributes to issue CURA-8609.
2021-10-12 10:17:03 +02:00
Ghostkeeper
4661b02e4c
Move code and status related to uploading materials to separate class
There's quite a lot of status to track, errors and progress. It's better kept separate.

Contributes to issue CURA-8609.
2021-10-12 09:43:21 +02:00
Ghostkeeper
c3d392c5cf
Show upload error or success in header once completed
According to the brand new design.

Contributes to issue CURA-8609.
2021-10-11 15:27:54 +02:00
Ghostkeeper
8ae93c6bc1
Resolve binding loops in sync spinner
Contributes to issue CURA-8609.
2021-10-11 15:19:06 +02:00
Ghostkeeper
ffd3277854
Show error if the upload failed
Contributes to issue CURA-8609.
2021-10-11 14:57:21 +02:00
Ghostkeeper
ffee4a2443
Show syncing spinner while syncing
Rather than disabling the sync button, hide it completely and show this spinner instead.

Contributes to issue CURA-8609.
2021-10-11 14:30:10 +02:00
Ghostkeeper
56eb694745
Hide refresh button if there are no offline printers
It's not considered a big use case when the user has already added some printers but would want to add more while syncing materials to those printers.

Contributes to issue CURA-8609.
2021-10-11 14:11:28 +02:00
Ghostkeeper
9ffbaa772f
Add back button to return from USB workflow to welcome screen
This allows the user to see the welcome screen instructions again. Or to switch back to internet-syncing if they accidentally pressed the USB button (or were just curious).

Contributes to issue CURA-8609.
2021-10-11 13:58:05 +02:00
Ghostkeeper
43bcd2b56a
Implement info icon with UM.StatusIcon
This way the sizes are consistent with the other similar icons in the UI.

Contributes to issue CURA-8609.
2021-10-11 13:49:45 +02:00