577 Commits

Author	SHA1	Message	Date
Lipu Fei	d24bc0b41b	Fix code style in MaterialView.qml	2018-03-03 16:23:54 +01:00
Lipu Fei	c93643bc2f	Move createMaterial() to MaterialManager	2018-03-02 17:30:19 +01:00
Lipu Fei	5f0bb3a283	Move removeMaterial() to MaterialManager	2018-03-02 17:20:26 +01:00
Lipu Fei	7642afb9fe	Move duplicateMaterial() to MaterialManager	2018-03-02 17:16:35 +01:00
Lipu Fei	ca785c9df3	Move duplicateQualityChanges() to QualityManager	2018-03-02 17:08:58 +01:00
Lipu Fei	355b8cbac3	Move renameQualityChangesGroup() into QualityManager	2018-03-02 16:58:50 +01:00
Lipu Fei	8324f4f44e	Move removeQualityChangesGroup() into QualityManager	2018-03-02 16:47:25 +01:00
Lipu Fei	c6128ef5ba	Move setMaterialName() into MaterialManager	2018-03-02 16:22:22 +01:00
Lipu Fei	71e8478419	Rename to selected_position	2018-03-01 16:26:12 +01:00
Lipu Fei	580244a546	Split material models into separate files	2018-03-01 11:50:55 +01:00
Lipu Fei	b5cf6b7531	Rename selectedQualityItem and add docs	2018-03-01 11:16:22 +01:00
Jack Ha	df46241225	CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack	2018-02-27 13:03:08 +01:00
Jack Ha	d79206301d	CURA-4606 CURA-5012 fix incompatible diameter update message in materialview	2018-02-27 11:43:54 +01:00
Jack Ha	22cf5abec2	Merge branch 'master' into refactoring_machine_manager	2018-02-27 10:24:56 +01:00
Jack Ha	c23827cfa1	CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change	2018-02-26 16:33:25 +01:00
Ghostkeeper	c16214e0f3	Traditional Chinese is complete again ... At least, complete for 3.2.	2018-02-26 15:48:04 +01:00
Jack Ha	11be94c735	Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager	2018-02-26 09:30:33 +01:00
Lipu Fei	f487c5b084	Fix profile management page	2018-02-22 23:31:41 +01:00
Lipu Fei	dec7ad25e2	Fix activate newly created custom quality profile	2018-02-22 23:08:26 +01:00
Jack Ha	cad6a3bb3d	CURA-4606 CURA-5003 select and activate material after create, duplicate	2018-02-22 17:14:23 +01:00
Lipu Fei	d2ffd59431	Switch to the new quality profile when it is created	2018-02-22 16:53:13 +01:00
Jack Ha	b23a85aa37	Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager	2018-02-22 16:14:24 +01:00
Jack Ha	b209badf68	CURA-4606 CURA-5003 fix density and diameter in material manager	2018-02-22 16:14:11 +01:00
Lipu Fei	32e1015f25	WIP: Cleanup PrintInformation	2018-02-22 16:07:56 +01:00
Jack Ha	c7499d6e17	CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback	2018-02-22 15:52:02 +01:00
Jack Ha	b29d091b1d	Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager	2018-02-22 14:28:09 +01:00
Jack Ha	32afa9bfd4	CURA-4606 CURA-5003 fixed sometimes crash material management page upon opening, provide correct containerId to MaterialView	2018-02-22 14:27:58 +01:00
Lipu Fei	b014800eac	Fix various quality related issues	2018-02-22 11:00:32 +01:00
Lipu Fei	47e4b35e70	WIP: Cleanup	2018-02-21 19:44:42 +01:00
Lipu Fei	7ea245a57d	Fix: Show longer names on profile management page	2018-02-21 17:28:32 +01:00
Jack Ha	605043235a	CURA-4606 fixed create profile from profile context menu	2018-02-20 11:36:51 +01:00
Lipu Fei	6cc65e97f2	WIP: Cleanup MaterialsModel	2018-02-20 09:13:11 +01:00
Lipu Fei	27f7d16a57	WIP: Make import/export profile work	2018-02-19 21:47:12 +01:00
Lipu Fei	0c3ac090c9	WIP: Cleanup	2018-02-19 21:11:01 +01:00
Lipu Fei	5b37de8adb	WIP: Fix quality renaming	2018-02-19 20:33:36 +01:00
Lipu Fei	486bcae677	WIP: Fix remove quality	2018-02-19 20:21:02 +01:00
Lipu Fei	65e01d6203	WIP: Refactor Profile management code	2018-02-19 20:01:51 +01:00
Jack Ha	bd10f23311	CURA-4606 reimplemented duplicate profile	2018-02-19 16:47:04 +01:00
Jack Ha	7a78f9821f	CURA-4606 fixed Create profile	2018-02-19 16:15:35 +01:00
Jack Ha	8efe13a55a	CURA-4606 fix profiles page Active button	2018-02-19 15:24:58 +01:00
Jack Ha	3ff9cb6b1e	CURA-4606 added first Profile management page	2018-02-19 15:07:50 +01:00
Jack Ha	5d4a2a7e49	CURA-4606 qtquick dialogs 1.2 to be compatible with older pyqt	2018-02-19 11:04:45 +01:00
Lipu Fei	96f1264364	WIP: Rework profile management page	2018-02-16 16:40:09 +01:00
Lipu Fei	bed2106fc6	WIP: Backup old profile management QMLs	2018-02-16 14:26:04 +01:00
Lipu Fei	f7f9c68fcc	WIP: Refactor setMaterialName()	2018-02-16 14:23:11 +01:00
Lipu Fei	850661fbdc	WIP: Remove old material management QMLs	2018-02-16 14:23:11 +01:00
Lipu Fei	581699cd8d	WIP: Make material import work	2018-02-16 14:23:11 +01:00
Lipu Fei	0b859bb308	WIP: Make material export work	2018-02-16 14:23:11 +01:00
Lipu Fei	4f29fc9ab2	WIP: make material creation work	2018-02-16 14:23:11 +01:00
Lipu Fei	779f49f545	WIP: Make material removal work in material management dialog	2018-02-16 14:23:11 +01:00