Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
d21bf53230 Add version upgrade for 4.0
Contributes to CURA-6011 and CURA-5995
2019-01-07 10:34:22 +01:00
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again
CURA-5932
2019-01-04 14:59:26 +01:00
Jaime van Kessel
b363be4afb Fix typing 2019-01-04 11:48:06 +01:00
Jaime van Kessel
bca070d567 Fixed typing
CURA-6005
2019-01-04 11:41:21 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
08dc035f6e Merge remote-tracking branch 'origin/4.0' 2019-01-03 08:30:27 +01:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.

Contributes to issue CURA-6069.
2019-01-02 14:05:17 +01:00
Jaime van Kessel
2a4c66888e Use getNumInstances instead of counting the number of instances in machinemanager
This should prevent having to initiate the cached values if we only want to know the number of settings.
2019-01-02 09:39:44 +01:00
Jaime van Kessel
e8febaff59 Remove code duplication 2019-01-02 09:23:20 +01:00
Jaime van Kessel
0b0f674e4b Remove unused code 2019-01-02 09:22:50 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
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
d9d1c93bd0 Use "NotConnected" as default for the connection state
CURA-6011
2018-12-31 11:25:23 +01:00
Jaime van Kessel
89040b6d8f Remove unneeded nameChanged signal connection
CURA-6011
2018-12-31 11:18:17 +01:00
Jaime van Kessel
1277fbabc5 Fix connection type not always being seen correctly
CURA-6011
2018-12-31 11:15:03 +01:00
Jaime van Kessel
fd9b29fee2 Rename printersModel to GlobalStacksModel
This is a better description for the model anyway.

CURA-6011
2018-12-31 11:09:39 +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
Remco Burema
f62e8b4bb2 Create 'brim for prime tower only' option (see also backend PR). [CURA-5864] 2018-12-21 17:38:30 +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
ChrisTerBeke
64f5c4f263 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 13:33:16 +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
ChrisTerBeke
3f82cd4916 Add missing new-line 2018-12-20 15:55:04 +01:00
ChrisTerBeke
119d3e9974 Fix printer selector sections 2018-12-20 15:47:48 +01:00
ChrisTerBeke
1012eb7553 Assure bool 2018-12-20 14:48:56 +01:00
ChrisTerBeke
bbddbcde9a cleanup 2018-12-20 14:29:39 +01:00
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
0edeb11a78 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 13:14:24 +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
Lipu Fei
d93e19d530 Add getAllMaterialGroups()
CURA-6035
2018-12-20 10:45:05 +01:00
Remco Burema
a9f4b70b5c Emit 'number of extruders changed' signal after add machine. [CURA-6045] 2018-12-20 09:53:58 +01:00
ChrisTerBeke
21cde5535a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 14:15:19 +01:00
ChrisTerBeke
beb68213f4 Remove much logging or use debug level, fix cloud icon not appearing right away 2018-12-19 14:14:44 +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
ChrisTerBeke
80d2a78463 Fix optional type for output device 2018-12-19 11:47:41 +01:00