Jaime van Kessel
4be228a4e2
Fix merging & grouping
...
I made a boo-boo while adding typing.
CURA-6058
2018-12-31 13:43:47 +01:00
Jaime van Kessel
37af42aa93
Merge branch '4.0' of github.com:Ultimaker/Cura
2018-12-31 10:28:53 +01:00
Ghostkeeper
139ab2e0bb
Increment setting_version to 6
...
Because Cura 4.1 is going to have a version upgrade to change the stack files.
Contributes to issue CURA-5848.
2018-12-27 16:39:05 +01:00
Ghostkeeper
c6f4cb4927
Make the settings panel resizable
...
You can now drag the bottom side of the panel to make it bigger or smaller.
Contributes to issue CURA-6054.
2018-12-24 15:31:47 +01:00
Ghostkeeper
42058a2e8f
Revert "Prevent some unneeded calling of signals"
...
This reverts commit 85f10e7c4f .
The second time you start Cura, it won't slice due to the number of extruders being wrong.
2018-12-24 09:37:17 +01:00
Jaime van Kessel
e4af883f25
Add missing signal
2018-12-21 18:19:34 +01:00
Jaime van Kessel
972be1b54a
Merge branch '4.0' of github.com:Ultimaker/Cura
2018-12-21 18:13:43 +01:00
Jaime van Kessel
f627560751
Add timer to QualityProfilesDropdownMenuModel to prevent unneeded updates
...
It's the same old trick we've pulled off quite often, so this should be pretty safe
2018-12-21 17:12:07 +01:00
Jaime van Kessel
85f10e7c4f
Prevent some unneeded calling of signals
2018-12-21 16:57:52 +01:00
Jaime van Kessel
4ab79f963a
Remove deprecated functions
2018-12-21 15:10:14 +01:00
Jaime van Kessel
33c97fcf4a
Updated typing
2018-12-21 15:09:09 +01:00
Ghostkeeper
d880194c8c
Merge branch '4.0'
2018-12-21 11:59:41 +01:00
Ghostkeeper
07f0433751
Correct link to manual
...
They changed this on the website, breaking all previous releases of Cura in the process.
2018-12-21 11:59:12 +01:00
Ghostkeeper
8308e48c2d
Merge branch '4.0'
2018-12-21 11:51:04 +01:00
Ghostkeeper
a5500b028f
Use HTTPS for Help links
...
The Ultimaker website doesn't even accept anything else any more.
2018-12-21 11:50:46 +01:00
Ghostkeeper
e51b5993d3
Don't create system tray icon in headless mode
2018-12-20 21:56:27 +01:00
Jaime van Kessel
36efa171c6
Add a bit more logging to the authorization service
2018-12-20 11:31:01 +01:00
Jaime van Kessel
881e98c642
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-20 11:09:32 +01:00
Jaime van Kessel
dc473dc78d
Add missing typing for setting visibility preset model
2018-12-20 11:09:02 +01:00
Remco Burema
a9f4b70b5c
Emit 'number of extruders changed' signal after add machine. [CURA-6045]
2018-12-20 09:53:58 +01:00
Ghostkeeper
a5134001e9
Sort unique printer types
...
So that they appear in a consistent order everywhere.
2018-12-19 14:02:08 +01:00
Ghostkeeper
66ed9ed201
Remove optimisation that broke updates of models upon metadata change
...
If the metadata changed, such as whether a material was favourite or not, then the materials models were not updating any more because the actual list of available materials was still the same.
I've removed this optimisation and tested performance locally. It seems to be slightly slower (though that might be placebo or measurement error). However most of the performance boost of cura-6016 was resulting from different changes there so the interface still seems to be quite a lot faster than what it used to be.
Contributes to issue CURA-6032.
2018-12-18 16:52:04 +01:00
Ghostkeeper
1b11164340
Remove unused import and add documentation
2018-12-18 16:09:19 +01:00
alekseisasin
59f38c66a0
Merge pull request #4936 from Ultimaker/CURA-5867_scale_tool
...
CURA-5867 Fix: if load a model and scale it up to 0.1mm and then load another m…
2018-12-18 15:59:53 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
...
[4.0] Every output device should define its connection type
2018-12-18 13:23:02 +01:00
Jaime van Kessel
aa0c8c75ee
Add a sane default to connection type
...
CURA-6011
2018-12-18 09:45:26 +01:00
Jaime van Kessel
d4bb50886f
Merge branch 'CURA-6011_connection_types' of github.com:Ultimaker/Cura into CURA-6011_connection_types
2018-12-18 09:40:20 +01:00
Jaime van Kessel
84a7f2e5a2
Fix review comments
...
CURA-6011
2018-12-18 09:40:08 +01:00
Lipu Fei
6017c2b4d2
Replace isProfileUserCreated with hasCustomQuality
...
CURA-6028
2018-12-18 08:56:56 +01:00
Diego Prado Gesto
b5d8db6a77
Merge branch '4.0' into CURA-6011_connection_types
2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
...
Increment API version to 6
2018-12-17 15:43:09 +01:00
Jaime van Kessel
aad7540366
Fix situation where multiple connect configurations would cause issues
...
CURA-6011
2018-12-17 13:31:38 +01:00
Jaime van Kessel
ee74b9f89f
Once the connectiontype is recovered, it's converted to a string
...
So we need to check if that's the case.
CURA-6011
2018-12-17 13:09:01 +01:00
Diego Prado Gesto
ab83af3a03
Fix code-style
2018-12-17 12:20:30 +01:00
Jaime van Kessel
938287095f
Use connection type instead of um_network_key to see if a printer has a network connection
...
CURA-6011
2018-12-17 10:47:14 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6
...
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.
Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Jaime van Kessel
b8a4d8e80d
Remove the cluster connection type
...
CURA-6011
2018-12-14 17:14:56 +01:00
Jaime van Kessel
226d052468
Move the machines from machinelist into their own model
...
CURA-6011
2018-12-14 17:10:58 +01:00
Aleksei S
9146a775a4
After resetting the custom settings the quality slider did not update selected value
...
CURA-6028
2018-12-14 16:17:05 +01:00
Lipu Fei
a02bccf74d
Fix NozzleModel to work with new ListModel data update
...
CURA-6015
ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
2018-12-14 13:00:06 +01:00
Lipu Fei
cd3a9e02d6
Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash
2018-12-14 11:45:51 +01:00
Lipu Fei
a18203b286
Fix typing
...
CURA-6011
2018-12-14 11:37:32 +01:00
Lipu Fei
4252b95603
Make ConnectionType Enum type accessible to QML
...
CURA-6011
2018-12-14 11:28:21 +01:00
Lipu Fei
a1ad7851d9
Merge remote-tracking branch 'origin/4.0' into CURA-6011_connection_types
2018-12-14 11:11:40 +01:00
Lipu Fei
99cee1dfe7
Use double-quotes for custom type hinting in functions
...
CURA-6011
2018-12-14 10:54:54 +01:00
Lipu Fei
8bb8ae8652
Rename ConnectionType.none to ConnectionType.Unknown
...
CURA-6011
Cannot use None
2018-12-14 10:48:26 +01:00
Lipu Fei
3e1993d876
Rename Enum name to camal cases
...
CURA-6011
2018-12-14 10:11:10 +01:00
Lipu Fei
644944bc41
Remove unused function setConnectionType()
...
CURA-6011
2018-12-14 10:00:21 +01:00
Lipu Fei
0aa49270eb
Remove unused function checkConnectionType()
...
CURA-6011
2018-12-14 09:57:43 +01:00
Lipu Fei
6bf39a32a9
Rename Enum names to camal cases
...
CURA-6011
2018-12-14 09:56:10 +01:00