Commit graph

10191 commits

Author SHA1 Message Date
Jaime van Kessel
8aabf113d2
Catch mouse events in toolpanel
Fixes #7720
2020-05-13 10:53:03 +02:00
Nino van Hooff
f34e05ac03
Merge pull request #7743 from Ultimaker/CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers
Cura 7427 add option to sign in with different account while waiting for printers
2020-05-12 17:39:07 +02:00
Kostas Karmas
eac4d3e463 Make login parametrized with a force_logout boolean
Instead of using a separate function to force logging out before
login, login now has a boolean parameter that instructs it to logout
before loging in again, if the user is alread logged in. It then
starts the authorization with a force browser logout first.

CURA-7427
2020-05-12 16:54:41 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
2020-05-12 14:59:01 +02:00
Kostas Karmas
f6ebac6e34 Merge branch 'master' into CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers 2020-05-12 13:10:41 +02:00
Kostas Karmas
e3e767f4b9 Simplify the link in AddNetworkOrLocalPrinterContent
CURA-7427
2020-05-12 12:23:42 +02:00
Psych0meter
9976889e5e
Leapfrog Creatr HS / XL Integration (#7723)
Add the leapfrog creatr HS and leapfrog creatr XL
2020-05-12 11:13:51 +02:00
Jaime van Kessel
d5194cbec6
Merge branch 'mb-fix-es-overhang-shader' of https://github.com/smartavionics/Cura 2020-05-12 11:02:21 +02:00
Kostas Karmas
b717755f20 Add "Sign in with another account" button in AddCloudPrintersView
There are cases where Cura and the browser fall out of sync when it
comes to accounts. In such cases, you may be logged in cura with an
account that has no cloud printers and in the browser with an account
that has printers. So when you press the "Add cloud printer" button,
you are redirected to mycloud and you see cloud printers that are not
detected by Cura (because Cura is in a different acconut). In such
cases, the user can now press the "Sign in with a different account"
link in the "Waiting for cloud response" page, which will log him/her
out in Cura AND in the browser, and then reinitiate the whole
authorization flow, to make sure the accounts are in sync.

CURA-7427
2020-05-11 17:47:09 +02:00
Ghostkeeper
bf8b01efe3
Fix preferred quality type
This quality type is the only one available.
2020-05-11 14:10:08 +02:00
Ghostkeeper
98a5321b2b
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
2020-05-11 14:03:54 +02:00
Ghostkeeper
40056c9a04
Update to setting_version 15
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
2020-05-11 11:40:14 +02:00
Ghostkeeper
7210dd308c
Rename Tronxy quality profiles to something more specific to Tronxy
To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing.
I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade.

Contributes to issue CURA-7384.
2020-05-11 11:39:26 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
2020-05-11 11:02:37 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
2020-05-11 10:51:44 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Ghostkeeper
e16dac0708
Update profile that was outdated since Cura 4.0
Contributes to issue CURA-7420.
2020-05-08 11:34:10 +02:00
Ghostkeeper
8f9408a76f
Apply version upgrade maximum deviation change to built-in profiles
For some this is not exactly restored as their original since this setting is limited to micron precision as well.

Contributes to issue CURA-7420.
2020-05-08 11:15:55 +02:00
Ghostkeeper
3527c16716
Upgrade containers that were forgotten to upgrade from setting_version 13
This is why it was upgrading them as if from the profile importer...

Contributes to issue CURA-7420.
2020-05-08 11:13:15 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML
Provides a single source of truth

CURA-7290
2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15
Once more into the fray.

Contributes to issue CURA-7420.
2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6'
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
2020-05-08 09:10:02 +02:00
Ghostkeeper
47bf094c52
Fix internal conflicts within the Anycubic Mega Zero printer
This definition specified that the maximum E speed is 25mm/s but then said that the retraction speed is 30mm/s. I've changed the maximum E speed to 30mm/s then because apparently that's what the definition author was testing with.
This definition specified that the maximum Z speed is 5mm/s but the default Z hop speed is 10mm/s. I've set the Z hop speed to 5mm/s because it was not initially overridden by the definition author, but apparently 5mm/s is the limit.

Contributes to issue CURA-7431.
2020-05-07 16:50:04 +02:00
Mark Burton
f02ac17a30 GL ES compatibility fixes. 2020-05-07 13:38:09 +01:00
Ghostkeeper
1aec5d3452
Merge branch 'anycubic_mega_zero' of https://github.com/kad/Cura into kad-anycubic_mega_zero 2020-05-07 13:55:43 +02:00
maukcc
157c2d562e HMS434 update
added generic pla to the material list
2020-05-06 15:56:00 +02:00
Nino van Hooff
50ae2064b5 Refactor SyncState logic to SyncState.qml
CURA-7290
2020-05-06 11:47:38 +02:00
Remco Burema
2687578a86
Merge pull request #7624 from Ultimaker/CURA-7022_Add_cloud_printer_within_add_a_connected_printer
Cura 7022 add cloud printer within add a connected printer
2020-05-06 11:13:27 +02:00
konskarm
a2737ea47d
Merge pull request #7663 from Evg33/UNI_3D_codes
UNI 3D tuning.
2020-05-06 09:49:35 +02:00
Nino van Hooff
637a241d99 Use single qml file for sync states
CURA-7290
2020-05-04 15:13:38 +02:00
Evg33
d28a88f90c UNI 3D bugfix layer_0 temperatures 2020-05-04 14:42:14 +03:00
Kostas Karmas
f25547d394 Double the meshfix_maximum_deviation
CURA-7421
2020-05-04 13:19:35 +02:00
Kostas Karmas
9bf0255046 Up the setting version to 14 in all the resourses
CURA-7421
2020-05-04 13:13:07 +02:00
Nino van Hooff
4e7f446fe1 Account sync: create additional sync states
CURA-7290
2020-05-04 11:26:20 +02:00
Evgeny Z
82717845bf
UNI 3D startup code 2020-05-03 22:39:28 +03:00
Evg33
ffc97c3d5b UNI 3D Start/stop codes tuning. 2020-05-03 19:12:19 +03:00
Gerard Rubio
bba0a96576
Fixed bed dimensions 2020-05-03 11:54:45 +02:00
Alexander D. Kanevskiy
d62e7be193 Adding profile for Anycubic Mega Zero
Dimensions: 220x220x250
Nozzle: 0.4
Print speed: 20-100 (40 for normal quality)
2020-05-02 21:49:48 +03:00
Nino van Hooff
acf36d1e42 Add Account sync last update datetime
CURA-7290
2020-05-01 17:44:58 +02:00
64bittuning
2ab2a204a8 Update tronxy_x.def.json 2020-05-01 10:33:24 -04:00
64bittuning
5a0eda9cfe fixed indentation 2020-05-01 10:22:37 -04:00
Nino van Hooff
a6c0ee6c82 Connect rotation animation to isSyncingChanged
Code would be much cleaner if alwaysRunToEnd could be combined with
Animation.Infinite loops to complete the current loop

CURA-7290
2020-05-01 14:50:18 +02:00
64bittuning
6c9e414e8a removed obsolete variants
X5SA Pro was condensed down into X5SA/X5ST/Pro model
2020-04-30 14:33:57 -04:00
64bittuning
b96383770b Update tronxy_x.def.json
Fixed error in speed_travel_layer_0. calculation was incorrect.
2020-04-30 14:33:19 -04:00
64bittuning
12ccd8298c Machine profile update
Updated and condensed machine profiles. Edited formatting to make more sense and be consistent across all files. I3 printers present print to the front, CoreXY move to 0. Speeds are set per machine based orr factory firmware, which should provide more accurate "Estimated time" values "out of the box".
2020-04-30 14:18:14 -04:00
64bittuning
d08d8a26ed Update tronxy_x.def.json
replacing incorrectly uploaded file that was used during troubleshooting
2020-04-30 11:30:40 -04:00
64bittuning
90637fa451 Overhauled all quality profiles
Overhauled all quality profiles to give a more fluid interface while choosing between 0.2 through 0.8 nozzles. Added a larger layer choice and rescaled the options per nozzle. Also included some small overrides based on material choice.
2020-04-30 11:28:44 -04:00