Commit graph

17030 commits

Author SHA1 Message Date
Ghostkeeper
e5d1a53dd6
Add missing return type
Contributes to issue CURA-5330.
2018-06-04 09:55:17 +02:00
Ghostkeeper
51f24bc8c8
Call getMachineManager on CuraApplication
Because Application doesn't have it. Its child class has.

Contributes to issue CURA-5330.
2018-06-04 09:53:20 +02:00
Ghostkeeper
49c684a741
Add function typing
Contributes to issue CURA-5330.
2018-06-04 09:51:34 +02:00
Ghostkeeper
8ba592b593
Fix circular import with CuraApplication again
Contributes to issue CURA-5330.
2018-06-04 09:48:50 +02:00
Ghostkeeper
aff341eac9
Add casts for result of deepcopy
Because deepcopy should return the same object as what is provided as input.

Contributes to issue CURA-5330.
2018-06-04 09:48:30 +02:00
Ghostkeeper
9fb4511f52
Add function typing
This causes MyPy to discover errors in this file.

Contributes to issue CURA-5330.
2018-06-04 09:43:13 +02:00
Ghostkeeper
f544e3d5c0
Fix @override decorator
They need a parameter and they need to be the last decorator.

Contributes to issue CURA-5330.
2018-06-04 09:02:57 +02:00
Ghostkeeper
5a5d07865b
Fix circular imports with CuraApplication
Contributes to issue CURA-5330.
2018-06-04 09:01:30 +02:00
Mark
0e11a165a3 add typing 2018-06-03 18:14:34 +02:00
Mark
30a05e6ba6 make sure old plugins are updatable 2018-06-03 12:57:08 +02:00
Ghostkeeper
84d69fcd97
Add missing type for locally created list
MyPy isn't clever enough to figure this out.

...but I am.

Contributes to issue CURA-5330.
2018-06-01 16:50:58 +02:00
Ghostkeeper
da285a33d5
Fix types
Added the missing ones and fixed the broken ones.

Contributes to issue CURA-5330.
2018-06-01 16:47:46 +02:00
Ghostkeeper
e4a0345fe4
Fix more minor typing mistakes
Contributes to issue CURA-5330.
2018-06-01 16:40:57 +02:00
Ghostkeeper
c3bac474ab
Use CuraContainerRegistry instead of ContainerRegistry
Because we're calling functions of CuraContainerRegistry.

Contributes to issue CURA-5330.
2018-06-01 16:33:32 +02:00
Ghostkeeper
ff4a214c24
Add function typing
This makes MyPy discover a lot of typing errors because it now starts analysing all of these functions.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
b920b9de4f
Fix type of setProperty
And properly pass on the extra parameters.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
e38228ac24
Remove unused target_container parameter
It's not compatible with ContainerInterface anyway.

Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
a6ffbbde8f
Add missing typing
Contributes to issue CURA-5330.
2018-06-01 14:53:54 +02:00
Ghostkeeper
e77592d718
Add missing typing for CuraContainerStack
This was already largely done, but not 100%.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a98b4fe35c
Fix unknown model
My IDE didn't indicate this because it is imported fine, but only if MYPY.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
b3f73594bf
Fix types of on_finished callback
It only has a QNetworkReply argument.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
8ed3bd29cb
Don't return any boolean in _update
Nothing listens to that return value, and its parent classes say that this must return None.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a946a8aaed
Add function typing for PrinterOutputDevice
This causes a lot of typing errors to surface. We'll fix this later though, when we get to it.

Contributes to issue CURA-5330.
2018-06-01 14:53:13 +02:00
Ghostkeeper
a55cf0678e
Add missing function types
The class is typed now. There's some bugs though.

Contributes to issue CURA-5330.
2018-06-01 14:53:12 +02:00
Ian Paschal
74ba10444e CURA-5357 Prevent uninstall of plugins that are not-yet-installed 2018-06-01 14:31:52 +02:00
Ghostkeeper
4157636552
Merge branch '3.4' 2018-06-01 14:03:05 +02:00
Ghostkeeper
2fbcc22123
Fix adding printers due to unused 'parent' parameter
The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder.

Contributes to issue CURA-5330.
2018-06-01 14:02:32 +02:00
Lipu Fei
e859861517 No need to set parent for ExtruderStack 2018-06-01 13:55:28 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Mark
a479176c63 The prepare button slices, so it should be a slice button 2018-06-01 13:42:48 +02:00
Mark
a0263676e1 The prepare button slices, so it should be a slice button 2018-06-01 13:36:50 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user
applies a configuration using the Sync button.
2018-06-01 13:26:14 +02:00
Diego Prado Gesto
0a573408d9 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-01 12:59:10 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
2018-06-01 12:58:08 +02:00
Ian Paschal
cca51cb74b Revert "Revert "CURA-5435 Attempt to fix "wobbly" text""
This reverts commit 9b5369a5b1.
2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1 Revert "CURA-5435 Attempt to fix "wobbly" text"
This reverts commit bc1fa5c3f9.
2018-06-01 09:38:45 +02:00
Ian Paschal
bc1fa5c3f9 CURA-5435 Attempt to fix "wobbly" text 2018-06-01 09:38:37 +02:00
Ghostkeeper
abc3cde568
No longer call initialize() since it's included in __init__
We now always run initialize() after __init__ in Uranium.
2018-05-31 21:28:21 +02:00
Jaime van Kessel
91a66d1290 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-31 17:21:27 +02:00
Jaime van Kessel
c988e0eccb Also added "none" to the state list of prints_jobs not to be matched with printers 2018-05-31 17:20:53 +02:00
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing
CURA-5367
2018-05-31 16:25:58 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered
CURA-5367
2018-05-31 15:37:48 +02:00
Mark
3fefdad14b Round margins
CURA-5435
2018-05-31 15:22:49 +02:00
Mark
a8173344a3 Hidden materials 2018-05-31 14:45:57 +02:00
Lipu Fei
c288bbb6d1
Merge pull request #3785 from Ultimaker/WIP_improve_initialization
CURA-5164 Make application initialization and start up more clear
2018-05-31 14:31:40 +02:00
Lipu Fei
b3ef1bfd51 Simplify UserAgreement 2018-05-31 14:29:56 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Lipu Fei
7d8472e588 Merge remote-tracking branch 'origin/3.4' 2018-05-31 12:25:33 +02:00
Lipu Fei
a468fc2cc4 Only load loading.gif when needed
Toolbox crashes on Mac OS X due to reaching the max limit of file
handlers. This seems to be caused by the loading the "loading.gif"
animation image. Probably because many widgets are created and each of
them has an animation image, and Qt (5.8?) seems to load everything at
the same time.
2018-05-31 12:21:53 +02:00