Commit graph

28353 commits

Author SHA1 Message Date
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
AnnaKang0219
46371025b1 update setting_version
update setting_version
2021-10-05 10:54:22 +08:00
AnnaKang0219
228b97c003 Fix error
1.update setting version
2021-10-05 10:44:21 +08: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
Jelle Spijker
b49004a742
Reorient layout of skip, sign-in and create
* Skip button
  - Moved to the left, such that a user won't click on it mindlessly
  - Made it a Tertiary button, so it will have predictable margins
* Sign-in button
  - Moved to the right bottom, making it the logical next option
* Create an account
  - Moved to be inline with skip and sign-in
  - Made it a secondary button as requested by UX

Contributes to CURA-8602
2021-10-04 16:48:51 +02:00
Konstantinos Karmas
ce34e16cdd Add documentation
CURA-8254
2021-10-04 16:47:48 +02:00
Konstantinos Karmas
4b7f385077 Add external link to "Learn more" action
CURA-8254
2021-10-04 16:43:17 +02:00
Ghostkeeper
1e9ae92d29
Add spacing and padding to first page
Contributes to issue CURA-8609.
2021-10-04 16:39:56 +02:00
Ghostkeeper
b5edd5fa9c
Make Sync dialogue modal
Otherwise it appears behind other modal windows, such as the material manager.

Contributes to issue CURA-8609.
2021-10-04 16:27:52 +02:00
Ghostkeeper
9ec731eaf6
Create MaterialsSyncDialog from a Python function
Rather than from the QML.
This allows creating this dialogue from a message button without needing to put it in the base application.

Contributes to issue CURA-8609.
2021-10-04 16:23:28 +02:00
Konstantinos Karmas
1f5672acca Check if new materials were installed on initialization
When the MaterialManagementModel is initialized, it will check whether during this startup new materials were installed. If that's the case, then it will show the prompt message to sync those materials with the printers, which should initiate the sync materials flow.

CURA-8254
2021-10-04 15:55:06 +02:00
Jaime van Kessel
44eb3201a9 Fix duplicating / multiplicating support blockers
CURA-7851
2021-10-04 15:52:08 +02:00
Ghostkeeper
9e1dc98cd1
Catch environment errors when reading license file from package
The package may be inaccessible for whatever reason, which would crash Cura.

New attempt to fix CURA-2RP (without breaking the unit test saying that this error should be raised by Uranium then).
2021-10-04 14:31:25 +02:00
AnnaKang0219
b154e4260a fix errors
1.setting extruder for Jr. Wifi Pro
2.setting base quality
2021-10-04 16:48:00 +08:00
AnnaKang0219
585e32d241 fix errors
1.remove no-use file :xyzprinting_da_vinci_jr_wifi_pro_extruder_0.def.json
2.remove "meta" in carbon_fiber quality file.
2021-10-04 14:10:09 +08:00
AnnaKang0219
8b5e64a4f9 remove unnecessary default_values
remove unnecessary default_values for ['adhesion_type']
2021-10-04 13:01:07 +08:00
AnnaKang0219
097a56bd9b fix check error
remove speed_travel in definition due to the setting already in quality.
2021-10-04 11:48:49 +08:00
AnnaKang0219
8c155e8990 fix check errors
remove the settings in definitions if these parameter already setting in quality
2021-10-04 11:23:30 +08:00
Denis Shatilov
d9a20fd01a
Fixed Extruder hitting frame after finished print 2021-10-03 12:33:04 -07:00
legend069
35dd43675c Update ChangeAtZ.py
fixed typos and the gcode insert makes it easier to find for others "changeatz"
2021-10-03 20:00:08 +11:00
legend069
4508f60ce5 Update ChangeAtZ.py
PR
2021-10-03 19:43:50 +11:00
Ghostkeeper
1c78452d39
Add basis for a new material sync wizard
Just the set-up with a basic page to test the window with.

Contributes to issue CURA-8609.
2021-10-01 17:54:01 +02:00