29 Commits

Author SHA1 Message Date
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers
CURA-2242
2016-09-08 14:15:00 +02:00
Jack Ha
e9d9597caa Commented out duplicate and import, on OS X 'visible' does not work 2016-09-01 11:22:38 +02:00
Jack Ha
57f13869e6 For the beta release, removed duplicate and import material. 2016-08-31 12:47:21 +02:00
fieldOfView
42010e34d2 Show material by its displayname instead of its color 2016-08-30 18:30:45 +02:00
fieldOfView
6c16d82736 Add material type as a column in the Material manager
...and a color swatch for good measure.
2016-08-29 16:35:10 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec)
CURA-1968
2016-08-24 15:50:12 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use
CURA-2168
2016-08-24 14:48:20 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID
CURA-1969
2016-08-18 10:55:51 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
2016-07-28 18:08:17 +02:00
Jack Ha
dc6d415cf5 Disabled duplicate material, because it has a lot of issues.
CURA-1969.
2016-07-28 09:13:35 +02:00
Jack Ha
7731f9406c Dialog_profile/material/load_path is now saved and used.
CURA-1900
2016-07-19 15:59:44 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page
CURA-342
2016-07-11 17:25:59 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry
Contributes to CURA-342
2016-07-11 16:41:57 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
Arjen Hiemstra
17ff92bdc9 Add support for import/export to the Materials page
Contributes to CURA-341
2016-07-07 01:43:44 +02:00
Arjen Hiemstra
aba60b0105 Remove "Rename" button from Materials page and make the other ones work
Since the name is generated from the metadata

Contributes to CURA-341
2016-07-05 16:48:43 +02:00
Arjen Hiemstra
3798a6e26a Update MaterialsPage with the new way of handling buttons
Contributes to CURA-342
2016-06-30 01:54:25 +02:00
Arjen Hiemstra
47079dc2dd Start enabling some material management things 2016-06-28 17:43:52 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page
Contributes to CURA-342
2016-06-23 17:31:50 +02:00
Arjen Hiemstra
b33ce573c1 Also filter materials and profiles preference pages by machine etc. when desired
Contriubtes to CURA-1612
2016-06-04 19:22:42 +02:00
fieldOfView
2a288cd7a2 Fix typo causing a minor error when opening MaterialsPage.qml
CURA-339
2016-06-01 11:51:42 +02:00
fieldOfView
38c9d9e4a1 Fix highlighting the currently active (printer|quality|material) on their management pages
CURA-1278
2016-06-01 10:47:04 +02:00
Arjen Hiemstra
9bb4917ae7 Import Cura in materials preferences page so we can use the active definition id 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
b2a8810d04 Filter available materials by the machine definition
Since we now have some machine-specific materials
2016-05-25 11:31:48 +02:00
Arjen Hiemstra
f68a9ae90f Fix materials page so it displays the proper data
Also, make sure the code is reasonably clean
2016-05-23 14:43:56 +02:00
Arjen Hiemstra
b452cf7ba4 Add a materials management page
Based off Aldo's work which is in a different branch
2016-05-23 02:19:11 +02:00