18863 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	b5c406dc43	Make default font size slightly smaller ... In accordance with the designs. Contributes to issue CURA-6025.	2018-12-31 13:11:24 +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
Ghostkeeper	c333899d18	Fix reference to renamed file	2018-12-31 11:09:26 +01:00
Jaime van Kessel	a16e406507	Properly display the full type + brand of unknown material ... CURA-6033	2018-12-31 11:01:30 +01:00
Jaime van Kessel	c08339e191	Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0	2018-12-31 10:33:01 +01:00
Jaime van Kessel	37af42aa93	Merge branch '4.0' of github.com:Ultimaker/Cura	2018-12-31 10:28:53 +01:00
Jaime van Kessel	f9e76aa6c9	Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0	2018-12-31 10:09:33 +01:00
Jaime van Kessel	52d97dfbd2	Change back the behavior of the output device selector to the old way ... Although the new way was discussed with our UXers, we got a number of reports that it was confusing. I also accidentally started a print while using it	2018-12-31 09:32:16 +01:00
Ghostkeeper	b54312fb9b	Merge branch '4.0' into unify_font_types	2018-12-28 15:51:54 +01:00
Ghostkeeper	265a1b3fa0	Add version upgrade plug-in for 4.0 to 4.1 ... This currently only updates the stack files, but all files have to be upgraded because of that stupid setting_version. Contributes to issue CURA-5848.	2018-12-27 16:50:05 +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	88d6e0bcaf	Correct inst.cfg version ... Contributes to issue CURA-5848.	2018-12-27 16:27:26 +01:00
Ghostkeeper	542a0cb2d1	Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1 ... Conflicts: resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg -> Profile weight vs. new global property resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg -> Profile weight vs. new global property	2018-12-27 16:20:37 +01:00
Ghostkeeper	abe684c1bd	Use Item instead of rectangle without defined colour ... Item should be faster to render. Contributes to issue CURA-6056.	2018-12-27 13:36:17 +01:00
Ghostkeeper	02f7a14765	Fix ordering of a bunch of profiles	2018-12-27 11:29:45 +01:00
Ghostkeeper	f2a32e62fc	Rename 'Protected profiles' to 'Default profiles' ... We agreed that it looks better, especially when listed right above 'Custom profiles'.	2018-12-27 11:06:09 +01:00
Ghostkeeper	c6c09a8327	Limit height of settings drop-down to window size ... It seems to be very hard to limit it to not overlap with the action panel. Well, going out of the window is a bigger problem so at least we can fix that. Contributes to issue CURA-6054.	2018-12-24 16:16:23 +01:00
Ghostkeeper	b7a23399f5	Move action panel in front of settings panel ... The settings panel can now be so long that they overlap (if the user so chooses). This causes the action panel to be hidden behind the settings. We'd prefer to show the action panel in front, always. Contributes to issue CURA-6054.	2018-12-24 15:37:48 +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 85f10e7c4f9bc48afd2fe43903e565b128e03189. 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	4065c83188	Show settings prime-tower-only brim depends on when active. [CURA-5864]	2018-12-21 17:57:47 +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
Ghostkeeper	2277a3d316	Prevent syncing with invalid configurations ... Contributes to issue CURA-6033.	2018-12-21 16:43:45 +01:00
Ghostkeeper	a720cca5b6	Fix background colour for dark theme ... The default colour for Rectangle is white. So this Rectangle, not defining a colour, became white. Instead we should use an Item, which cannot have a background colour and thus becomes transparent, making the background colour the same as the button below, which was intended. It's also slightly faster to render. Contributes to issue CURA-6033.	2018-12-21 16:40:24 +01:00
Ghostkeeper	5e98544541	Don't change the model depending on isValidMaterial ... That would cause a circular dependency in a way. Contributes to issue CURA-6033.	2018-12-21 16:33:16 +01:00
Ghostkeeper	e8ea742cf6	Retain binding with isValidMaterial on hover ... So that if a material becomes valid, it updates this property. Contributes to issue CURA-6033.	2018-12-21 16:27:38 +01:00
ChrisTerBeke	912652654b	Merge branch '4.0' into STAR-322_cloud-connection	2018-12-21 15:28:56 +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
Marijn Dee	12a4a5e9f5	Fixing the rest of the automatic test failures	2018-12-21 15:06:02 +01:00
alekseisasin	facf1428d6	Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips ... Cura 6004 missing tooltips	2018-12-21 14:57:06 +01:00
Jaime van Kessel	432b0837ce	Merge branch '4.0' of github.com:Ultimaker/Cura	2018-12-21 14:48:50 +01:00
Aleksei S	c8994102da	Use short for each javascript function ... CURA-6033	2018-12-21 14:44:25 +01:00
Jaime van Kessel	766fc2293e	Fix visibility for machine icon in dark theme	2018-12-21 14:35:41 +01:00
Aleksei S	01783e7f68	Check material name instead of material brand ... CURA-6033	2018-12-21 13:54:01 +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
Jaime van Kessel	59b7e62c01	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-21 11:54:33 +01:00
Jaime van Kessel	7269065cca	Only clear the stored optimized layer data if the slice started	2018-12-21 11:54:11 +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
Jaime van Kessel	b0cba98ec4	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2018-12-21 11:20:33 +01:00