26423 Commits

Author SHA1 Message Date
Ghostkeeper
e7b49ee551
Disable sync button while in progress
Need to show a bit more feedback I think. Let's see what the design said...

Contributes to issue CURA-8609.
2021-10-11 13:11:54 +02:00
Ghostkeeper
9729f4f3d2
Set properties immediately upon constructing
Instead of afterwards. A bit more efficient.

Contributes to issue CURA-8609.
2021-10-08 17:46:10 +02:00
Ghostkeeper
fb7e67b8ad
Change 'hit' to 'click'
This is more consistent with other texts.

Contributes to issue CURA-8609.
2021-10-08 16:51:04 +02:00
Ghostkeeper
2b785343b5
Implement basic uploading of material
Steps involved are:
- Create an archive of all materials.
- Request the cloud API to provide a URL to upload the archive to.
- Upload the archive to that API.

Currently the two internet requests are asynchronous, meaning that the job will 'end' before the upload is complete. Most likely the job instance will even be deleted before we get a response from the server. So this won't work, really. Need to structure that a bit differently. But I want to save this progress because it embodies the happy path well.

Contributes to issue CURA-8609.
2021-10-08 16:02:31 +02:00
Ghostkeeper
042bd46fba
Don't import CuraApplication if not type checking
Otherwise we'll get unnecessary import loops here.

Contributes to issue CURA-8609.
2021-10-08 15:59:42 +02:00
Ghostkeeper
599c59bd3a
Add a background job to upload material archives
It creates the archive now. It doesn't yet upload it.

Contributes to issue CURA-8609.
2021-10-08 15:15:57 +02:00
Ghostkeeper
a7f172d836
Only show online printers in list of printers to sync to
We can only sync with printers that are currently online.
We'll just send it to the account to sync with everything. But these are the ones it should arrive with.

Contributes to issue CURA-8609.
2021-10-08 14:22:46 +02:00
Ghostkeeper
07b2c1b777
Add option to only show printers that are online
I have a feeling this will be abused later. But fine. We currently need it for the list of printers that we can sync materials to via the cloud.

Contributes to issue CURA-8609.
2021-10-08 14:21:03 +02:00
Ghostkeeper
8234276204
Add log entry when syncing with cloud printers
Not only do I now have an interface where the user doesn't get any feedback when syncing happens, but even in the log there was nothing shown when it happens.

Contributes to issue CURA-8609.
2021-10-08 14:13:54 +02:00
Ghostkeeper
32c63c2757
Add isOnline role to GlobalStacksModel
This way we can filter for only online printers or display whether printers are online or not in the future.

Contributes to issue CURA-8609.
2021-10-08 14:09:12 +02:00
Ghostkeeper
93953630ec
Update online status when updating account printer status
This updates the metadata entries. Naturally this updates every 60 seconds in Cura, but it could also manually be triggered by the refresh button.

Contributes to issue CURA-8609.
2021-10-08 14:08:02 +02:00
Ghostkeeper
0bf4a3d944
Store online status of printer in the printer's metadata
It's a little bit weird with the hidden global stack system when there's a cluster of various types of printers. But it should behave the same way.

Contributes to issue CURA-8609.
2021-10-08 13:49:20 +02:00
Ghostkeeper
75c7d5c4f5
Link to USB page without depending on actual order of pages
This is more future-proof. If someone were to add a page to the end, it wouldn't immediately break these buttons any more.

An example of why self-documenting code can be good.

Contributes to issue CURA-8609.
2021-10-06 16:48:52 +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
52373c6850
Add correct links for troubleshooting buttons
Contributes to issue CURA-8609.
2021-10-06 15:46:43 +02:00
Ghostkeeper
038db1fc4f
Implement functionality of export to USB button
It now creates a similar dialogue of what the old button did. The dialogue is no longer necessary in the materials page, so I've moved it to here specifically.

Contributes to issue CURA-8609.
2021-10-06 15:20:26 +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
5db964aed1
Link opening sync all window to the button that should open it
This is a new button just merged in from the Master branch. With the window implemented, we can now properly open it.

Contributes to issue CURA-8609.
2021-10-06 14:25:12 +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
d16217c674
Implement filter for printer list to only show printers with certain configured connections
Because here we only want to show cloud-connected printers.

Contributes to issue CURA-8609.
2021-10-05 17:44:15 +02:00
Ghostkeeper
c8931d4c23
Implement sync function for refresh button
Quite simple. There's not a lot of feedback though when you press that button. Maybe we need to look at that.

Contributes to issue CURA-8609.
2021-10-05 17:31:27 +02:00
Ghostkeeper
554f580f13
Add extra card to refresh printer list
Contributes to issue CURA-8609.
2021-10-05 17:28:26 +02:00
v27jain
89070237d9
Adding 3DI D300 (#9863)
* Add files via upload

* Add files via upload

* Add files via upload

* Delete 3di_d220.def.json

* Delete 3di_d300.def.json

* Add files via upload

* Delete 3di_d220_extruder_0.def.json

* Delete 3di_d300_extruder_0.def.json

* Add files via upload

* Update 3di_d220.def.json

* Update 3di_d300.def.json

* Delete 3di_d300_platform.stl

* Add files via upload

* Update 3di_d300.def.json

* Delete 3di_d220.def.json

* Delete 3di_d220_platform.stl
2021-10-05 16:38:50 +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
hyu7000
46261e328b
cremaker def files added (#10409)
* test

test

* Delete 느낌표 2개.png

* Cremaker's def file

Cremaker's 3 model def files added.

* Cremaker's ext def file

Cremaker's extruder def files added.

* cremaker bed obj file

2 model size add

* change value

change to value from default value

* change value

change to value from default value

* change machine value

change to "cremaker_common" from "cremaker"

* change value

change to value from default value

* change value

change to value from default value

* change value

change to value from default value

* Update cremaker_common.def.json

* change some code for crashes to resolve
2021-10-05 16:26:03 +02:00
Jaime van Kessel
968aceb430 Merge branch 'CURA-8254_Trigger_material_profile_sync_with_printer' of github.com:Ultimaker/Cura 2021-10-05 15:02:57 +02:00
Konstantinos Karmas
e4f6c1a440 Fix typing
CURA-8254

Co-Authored-By: Jaime van Kessel <3922611+nallath@users.noreply.github.com>
2021-10-05 14:53:38 +02:00
Konstantinos Karmas
587421f97a Make the installed_packages private
CURA-8254
2021-10-05 14:51:14 +02:00
Jelle Spijker
8466a291fd
Merge pull request #10547 from Ultimaker/CURA-8601_update_connect_to_cloud_popup
Update connect to cloud popup
2021-10-05 14:44:12 +02:00
Ghostkeeper
c95de3e379
Add main layout for printer list page
The actual printer list is not implemented yet and some of these elements may need to be swapped out if there are no printers available. But this is the basis of it.

Contributes to issue CURA-8609.
2021-10-05 14:30:42 +02:00
Ghostkeeper
ec79961153
Skip to next page when login is successful
Contributes to issue CURA-8609.
2021-10-05 14:20:50 +02:00
Ghostkeeper
0bb0c672c5
Skip sign in page if already signed in
Contributes to issue CURA-8609.
2021-10-05 14:05:08 +02:00
Ghostkeeper
f2aba01eff
Reset page index to 0 when re-opening sync dialogue
When the user previously opened the dialog and advanced through the pages, but closes the window, then they'll probably have to restart when they want to try it again.

Contributes to issue CURA-8609.
2021-10-05 14:00:15 +02:00
Jelle Spijker
501b4c4fde
Spaces around assignment operator
According to UM codestyle

Contributes to CURA-8601
2021-10-05 13:54:13 +02:00
Ghostkeeper
9b1c8d1c7a
Add beginnings of printer list page
We just need this to have something to navigate to from the other pages as I implement that it automatically skips the sign in page when already signed in, and that it continues after being signed in from the sign in page.

Contributes to issue CURA-8609.
2021-10-05 13:26:25 +02:00
Ghostkeeper
c761820d52
Add behaviour to sign in page buttons
It will now sign you in when you press that button. It doesn't automatically proceed to the next page when signed in though. For that I reckon I'll need to build that next page first, or at least the beginnings of it.

Contributes to issue CURA-8609.
2021-10-05 13:22:33 +02:00
Ghostkeeper
3b62759ff2
Design for sign in page of material sync dialog
It's not functional yet at the moment, but this is a nice layout.

Contributes to issue CURA-8609.
2021-10-05 13:15:40 +02:00
Konstantinos Karmas
cb4d5ce6e5 Update message text
CURA-8254
2021-10-05 13:11:52 +02:00
Jelle Spijker
52a38d4176
Merge pull request #9160 from Ultimaker/UMH-2021_ribbed_vaults_infill
UM Hackathon 2021: Add 'Ribbed Support Vaults' infill pattern.
2021-10-05 12:29:00 +02:00
Ghostkeeper
cef5c5da2a
Add link to help and button to continue
These two are aligned vertically.

Contributes to issue CURA-8609.
2021-10-05 12:05:26 +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
Konstantinos Karmas
bdbac23fdf Add comment
CURA-8254
2021-10-05 11:43:36 +02:00
Konstantinos Karmas
8157cedfef Show the message only if there are printers that support material export
If none of the user's printers support exporting materials to it, then the message should not be shown.

CURA-8254
2021-10-05 11:42:00 +02:00
Konstantinos Karmas
658e54c8e5 Simplify the check for new materials
If there is at least one material, we can already show the message without checking the rest of the installed packages.

CURA-8254
2021-10-05 11:36:10 +02:00
Jaime van Kessel
cc92f4c1e0 Merge branch 'CURA-8602_move_skip_button_onboarding_flow' of github.com:Ultimaker/Cura 2021-10-05 11:01:55 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type
CURA-8601
2021-10-05 10:20:52 +02:00
Ghostkeeper
6b0e221b73
Implement word wrapping for introductory text
Contributes to issue CURA-8609.
2021-10-04 18:13:12 +02:00
Ghostkeeper
e56076af08
Render material spool somewhat bigger and give it a margin
The image of the spool doesn't have a margin by itself, contrary to the other images which have a visual margin given by the size of the table. We have to give it a margin manually. This is one of the consequences of encoding margins inside of images that may be used all over the place. We can't just remove the margins inside of the image because the laptop image will be used in other places too.
Just adding a margin would subtract from the size of the spool image making it very small. To compensate I'm making the spool image slightly bigger.

Contributes to issue CURA-8609.
2021-10-04 18:09:47 +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
5732fc2b51 Update campaign tags
CURA-8254
2021-10-04 17:05:36 +02:00