522 Commits

Author SHA1 Message Date
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well
CURA-2424
2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent.
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 15:26:20 +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
0af26cc4a7 Prevent qml warning when no printer is connected 2016-09-15 13:15:19 +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
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
Jack Ha
d173952a3a Update materialmenu when changing material type. Contributes to CURA-2159 2016-09-12 14:40:32 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from
CURA-1780
2016-09-08 18:49:34 +02:00
fieldOfView
25fb4d0b27 Show generic materials by display name instead of by material 2016-08-30 18:39:02 +02:00
fieldOfView
b004c53c6d Fix upadting list of materials when switching printers
CURA-2209
2016-08-30 14:42:43 +02:00
fieldOfView
71a77c1fb7 Decrease number of instances of InstanceContainerModel
Updates to InstanceContainerModel are becoming expensive because there are so many instances of that model. The MaterialMenu used three, and the MaterialMenu is instantiated three times for a dual extrusion printer.

CURA-2193
2016-08-29 15:35:14 +02:00
fieldOfView
3b1c11bfcf Put materials into branded material submenus
CURA-2194
2016-08-26 15:43:50 +02:00
fieldOfView
0799a9e278 Move branded materials into a submenu
CURA-2194
2016-08-26 11:59:19 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page
CURA-2108
2016-08-22 17:34:33 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality
CURA-2095
2016-08-22 11:31:31 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly
Contributes to CURA-2006
2016-08-10 10:58:44 +02:00
Arjen Hiemstra
70dee38c95 Show quality_changes instance containers for custom containers in the profile menu
Contributes to CURA-2006
2016-08-04 17:35:33 +02:00
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown
CURA-1887
2016-07-11 14:54:08 +02:00
Arjen Hiemstra
0da07b55ce Display brand and color name in the material menu if they are different than "generic"
Contributes to CURA-341
2016-07-07 01:43:18 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them
Contributes to CURA-342
2016-06-28 17:32:50 +02:00