Ghostkeeper
314b966cc9
Improvements to translated strings
...
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.
Contributes to issue CURA-5741.
2018-10-08 15:03:21 +02:00
Aleksei S
436860f841
Don't show prime tower shadow if only one extruder is enabled
...
CURA-5740
2018-10-04 11:36:02 +02:00
Jaime van Kessel
dabe747ec0
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura
2018-10-03 13:25:09 +02:00
Lipu Fei
b97f4ea30c
Merge remote-tracking branch 'origin/3.5'
2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff
Fix getDefaultVariantNode for UM2
...
CURA-5790
UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
2018-10-03 11:24:27 +02:00
Diego Prado Gesto
c0c66649b8
Merge branch '3.5'
2018-10-02 20:27:18 +02:00
Jaime van Kessel
18361b9434
Ensure that CuraAPI can be called in the same way as before
...
This should prevent another API break.
CURA-5744
2018-10-02 10:42:15 +02:00
Mark
b412a259af
Merge pull request #4410 from Ghostkeeper/fix_initial_startup_model_argument
...
Fix initial start-up when providing model parameter
2018-10-02 10:14:07 +02:00
ChrisTerBeke
acb7df710c
Fix getting cura application instance
2018-10-01 15:37:28 +02:00
Aleksei S
cbad60898a
Merge branch 'master' of github.com:Ultimaker/Cura
2018-09-28 16:10:50 +02:00
Lipu Fei
8584af415a
Merge remote-tracking branch 'origin/CURA-5744-move-oauth-login' into resolve_dependencies_oauth
2018-09-28 14:32:16 +02:00
Lipu Fei
c04c7654c1
Make Backup._application private
2018-09-28 14:31:36 +02:00
Lipu Fei
1bee201cfd
Remove unused code
2018-09-28 14:24:40 +02:00
Lipu Fei
5761d28f7f
Use old data dict code style, more readable
2018-09-28 14:24:21 +02:00
Lipu Fei
3bc91f15c3
Fix mypy complains
2018-09-28 14:17:00 +02:00
Lipu Fei
7ae6800a14
Fix imports in QualityManager
2018-09-28 14:01:28 +02:00
Ghostkeeper
3e7021d729
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2018-09-28 13:48:14 +02:00
Ghostkeeper
bfc3c5d8d8
Merge branch 'feature_mesh_names' of https://github.com/paukstelis/Cura into paukstelis-feature_mesh_names
2018-09-28 13:26:15 +02:00
Remco Burema
a68a591c18
Correct typo leading to infinite recursion.
2018-09-28 13:07:18 +02:00
Lipu Fei
6e2f7e72b6
Fix missing argument
2018-09-28 12:34:00 +02:00
Lipu Fei
3a01b63343
Fix refactor and tests
2018-09-28 12:33:16 +02:00
Lipu Fei
6e46772170
Fix imports in Backup
2018-09-28 12:25:03 +02:00
Lipu Fei
dd150bbab9
Resolve circular imports for CuraAPI
2018-09-28 12:07:00 +02:00
Ghostkeeper
4a4b096052
Only send uppercase g-code via custom commands
...
Because most printers don't understand anything other than uppercase.
Fixes #4178 .
2018-09-28 11:53:28 +02:00
Aleksei S
9bd4ab2faa
Added unittest for PrintInformation class
2018-09-28 10:46:14 +02:00
Jaime van Kessel
3b70e5eb6b
Fix typing
...
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
2018-09-27 20:01:55 +02:00
Jaime van Kessel
57334dd751
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
2018-09-27 17:52:00 +02:00
Jaime van Kessel
f585afe77b
Fix spacing
2018-09-27 17:31:45 +02:00
Jaime van Kessel
7310a677ce
Clean up more code
...
This fixes some typing and moves a property to protected, as it should be
2018-09-27 16:07:18 +02:00
Jaime van Kessel
c15f8aa693
Move printer type checking to where it belongs; inside the UM3 plugin.
2018-09-27 15:54:23 +02:00
Jaime van Kessel
889035ebfa
Fixed typo
2018-09-27 15:42:12 +02:00
Jaime van Kessel
d7901907af
Fix typing
2018-09-27 15:37:08 +02:00
Jaime van Kessel
b58c01400b
Updated typing & documentation
2018-09-27 15:28:53 +02:00
Jaime van Kessel
1467e703ae
No longer make BuildVolume set max bounds.
...
We didn't use it anymore and it added an extra requirement for buildvolume to depend on Application
2018-09-27 15:16:46 +02:00
Jaime van Kessel
d83241f13a
Add missing typing to number of decorators
2018-09-27 14:29:09 +02:00
Jaime van Kessel
853ccbdb71
Fix mypy typing issue
2018-09-27 14:00:28 +02:00
Jaime van Kessel
8d9a1fb85d
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
2018-09-27 13:47:32 +02:00
Jaime van Kessel
f8369703ed
Connect signals before loading auth data
...
CURA-5744
2018-09-27 13:45:46 +02:00
ChrisTerBeke
6d402806ac
Ensure logged in state is not always set to False after loading from preferences
2018-09-27 13:35:18 +02:00
Jaime van Kessel
202cf698c3
Change callback for succes / failure to the new location
...
CURA-5744
2018-09-27 11:56:19 +02:00
Jaime van Kessel
649f1c8961
Make it optional for the AuthService to have a preference object
...
This should make it easier if we ever want to re-use the authService, since
it no longer has a hard link with the Preferences
CURA-5744
2018-09-27 11:42:12 +02:00
Jaime van Kessel
0ccbabd857
Switch SHA512 implementation to use the one from hashlib
...
CURA-5744
2018-09-27 11:37:44 +02:00
Jaime van Kessel
506ec5109d
Moved loading of the authentication to the account
...
CURA-5744
2018-09-27 11:37:22 +02:00
Jaime van Kessel
cf6d3b9289
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
2018-09-27 11:11:54 +02:00
Jaime van Kessel
1c8804ff2c
Changed documentation style to doxygen
...
CURA-5744
2018-09-27 11:03:17 +02:00
ChrisTerBeke
246d12a596
Remove client.package.download scope until that is deployed on production
2018-09-27 10:48:22 +02:00
ChrisTerBeke
52ffe39c07
Small fixes in settings
2018-09-27 10:33:50 +02:00
ChrisTerBeke
185a1707b2
Merge branch 'master' into CURA-5744-move-oauth-login
2018-09-27 09:40:44 +02:00
Jaime van Kessel
16ff1c3712
Add property for the accessToken
...
CURA-5744
2018-09-26 17:12:00 +02:00
Jaime van Kessel
067e59a254
Add logged_in as argument to loginStateChanged callback
...
CURA-5744
2018-09-26 17:06:09 +02:00
