1146 Commits

Author	SHA1	Message	Date
Jaime van Kessel	6c7a0d73c3	Resolve now also returns value if resolve was undefined ... CURA-2319	2016-09-21 15:01:08 +02:00
fieldOfView	7238a7b029	Expand category when clicking its inheritance button ... CURA-2361	2016-09-21 14:50:02 +02:00
Jaime van Kessel	9ba78dec54	After deletion of material the slection is refreshed ... CURA-2388	2016-09-20 13:58:44 +02:00
fieldOfView	e4cfbc8fdf	Only update camera source if the camera view is showing	2016-09-19 14:34:35 +02:00
Jaime van Kessel	482ea83284	Hiding a setting forces settingInheritance manager to re-evaluate ... CURA-2361	2016-09-16 15:32:16 +02:00
Jaime van Kessel	4f547fff8d	Category setting icon now becomes invible if clicked ... CURA-2361	2016-09-16 13:58:26 +02:00
Jaime van Kessel	132ed1d258	Pressing inheritance button for category now makes all inherited children visible ... CURA-2361	2016-09-16 13:10:14 +02:00
Jaime van Kessel	e3d78c17ea	SettingItem now uses settingInheritanceManager for visibility check ... CURA-2361	2016-09-16 11:22:50 +02:00
Jaime van Kessel	e282e35b9c	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-16 11:19:19 +02:00
Jaime van Kessel	5d84490d70	SettingInheritance manager now has a complete list of all settings that have inheritance overridden ... CURA-2361	2016-09-16 11:18:20 +02:00
Jaime van Kessel	50f7c41ae4	Added SettingsInheritanceManager ... CURA-2361	2016-09-16 09:38:52 +02:00
Jack Ha	effddcbc5e	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-15 15:30:16 +02:00
Jack Ha	5c553d7bcd	Fix custom profile visibility for different variants, materials and machines. CURA-2248	2016-09-15 15:29:57 +02:00
fieldOfView	7ab7b2f561	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-09-15 14:44:55 +02:00
fieldOfView	04ce21d48e	Only show additional components info for the currently active printer ... CURA-2276	2016-09-15 14:44:40 +02:00
Arjen Hiemstra	d0ad654108	Re-enable selectMultiple for the open file dialog ... Fixes CURA-2198	2016-09-15 13:40:25 +02:00
fieldOfView	0af26cc4a7	Prevent qml warning when no printer is connected	2016-09-15 13:15:19 +02:00
fieldOfView	790ad4a09e	Show simple extruder names in Printers menu	2016-09-15 10:20:25 +02:00
fieldOfView	cf7a6730d1	Add a menuitem to load the nozzle/material loaded on the printer ... CURA-2276	2016-09-14 17:39:49 +02:00
fieldOfView	a47ffb2288	Remove commented out code	2016-09-14 14:57:26 +02:00
fieldOfView	549766e5f6	Fix layout of buttons on profile page ... CURA-2368	2016-09-14 14:15:34 +02:00
fieldOfView	ab50ac0d89	Don't show possibly incorrect materials in print monitor	2016-09-14 13:59:00 +02:00
Jaime van Kessel	8b71364ee8	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-14 11:44:41 +02:00
Jaime van Kessel	e12acb8110	We now remove all material containers instead of the active machine variant ... CURA-2210	2016-09-14 11:44:08 +02:00
Tim Kuipers	479f9ea6d2	refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308)	2016-09-14 10:46:57 +02:00
fieldOfView	e43dbcd0b7	Code style ... CURA-2235	2016-09-14 09:37:53 +02:00
fieldOfView	6334f74fc6	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-09-14 08:52:05 +02:00
fieldOfView	21e413ca4f	Hide extruder, nozzle & material selection in Print Monitor	2016-09-14 08:19:57 +02:00
fieldOfView	e422eb6ee5	Fix sidebar height when switching to UM2 ... When switching from a multiextrusion printer to the UM2, sometimes too much whitespace would be left for the sidebar header	2016-09-14 08:15:43 +02:00
Jaime van Kessel	4d84584f59	Simplified statement as per review ... CURA-2271	2016-09-13 17:31:15 +02:00
Simon Edwards	0fdd9279bb	Resolvement strategy for bed adhesion and prime tower enable. ... Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion	2016-09-13 14:07:18 +02:00
Simon Edwards	8086646de1	When reverting a user setting be sure to delete it from all of the stacks, global and extruder. ... Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion	2016-09-13 11:33:33 +02:00
fieldOfView	8d6f7c06c1	Replace "Show Engine Log" with "Show Configuration Folder" ... inb4 string freeze	2016-09-13 10:46:33 +02:00
fieldOfView	2bd53d4ce4	Add stub (invisible) menuitems to get material/nozzle from printer ... In preparation to stringfreeze. CURA-2276	2016-09-13 09:25:10 +02:00
fieldOfView	e583425bfa	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-09-12 20:51:43 +02:00
fieldOfView	b14bc477bf	Update status text for consistency	2016-09-12 18:46:09 +02:00
Jaime van Kessel	1ebd34ac1e	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-12 17:06:52 +02:00
Jaime van Kessel	442fd3ae3d	Tool panel switching now properly triggers focus change ... CURA-2197	2016-09-12 17:05:05 +02:00
fieldOfView	4bfa0f3bb1	Move sidebar action button style into styles.qml	2016-09-12 16:53:59 +02:00
fieldOfView	0693c0284b	Show printer state on Printers preference pane ... CURA-2276	2016-09-12 16:49:55 +02:00
fieldOfView	aa39a44219	Update i18n context for consistency	2016-09-12 16:41:24 +02:00
Jack Ha	1c1be7d444	Undo material edit update resolve, breaks UM3. Contributes to CURA-2159	2016-09-12 16:16:02 +02:00
Jack Ha	8304f17efd	Fix updating resolved values when changing material. Contributes to CURA-2159	2016-09-12 15:48:30 +02:00
Jack Ha	2cde439964	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-12 14:40:41 +02:00
Jack Ha	d173952a3a	Update materialmenu when changing material type. Contributes to CURA-2159	2016-09-12 14:40:32 +02:00
Jaime van Kessel	b17f8b5dd6	Added min width & height to machine action popup.	2016-09-12 14:38:23 +02:00
Jack Ha	1e0394fb48	Cleanup, forgot to remove debugging stuff. Contributes to CURA-2159	2016-09-12 14:22:23 +02:00
Jack Ha	78c119dbde	Merge branch 'master' of github.com:Ultimaker/Cura	2016-09-12 13:55:14 +02:00
Jack Ha	fb3f03b446	Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159	2016-09-12 13:55:05 +02:00
Jaime van Kessel	31bc3d2575	Added maintenance state to display qml ... CURA-2235	2016-09-12 13:38:30 +02:00