Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension

CURA-5570 More decision points in material and quality lookup!
This commit is contained in:
Diego Prado Gesto 2018-08-13 12:06:29 +02:00 committed by GitHub
commit 152005ab14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 790 additions and 241 deletions

View file

@ -231,8 +231,8 @@ UM.MainWindow
onObjectRemoved: settingsMenu.removeItem(object)
}
// TODO Temporary hidden, add back again when feature ready
// BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
// TODO Only show in dev mode. Remove check when feature ready
BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: CuraSDKVersion == "dev" ? Cura.MachineManager.hasVariantBuildplates : false }
ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); }
MenuSeparator { }

View file

@ -476,8 +476,8 @@ Column
{
id: buildplateRow
height: UM.Theme.getSize("sidebar_setup").height
// TODO Temporary hidden, add back again when feature ready
visible: false //Cura.MachineManager.hasVariantBuildplates && !sidebar.hideSettings
// TODO Only show in dev mode. Remove check when feature ready
visible: CuraSDKVersion == "dev" ? Cura.MachineManager.hasVariantBuildplates && !sidebar.hideSettings : false
anchors
{