Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager

This commit is contained in:
Jack Ha 2018-02-22 15:52:22 +01:00
commit 5a6e84a57f
26 changed files with 162 additions and 73 deletions

View file

@ -519,6 +519,9 @@ UM.MainWindow
insertPage(4, catalog.i18nc("@title:tab", "Profiles"), Qt.resolvedUrl("Preferences/ProfilesPage.qml"));
// Remove plug-ins page because we will use the shiny new plugin browser:
removePage(5);
//Force refresh
setPage(0);
}
@ -630,17 +633,6 @@ UM.MainWindow
}
}
// show the installed plugins page in the preferences dialog
Connections
{
target: Cura.Actions.configurePlugins
onTriggered:
{
preferences.visible = true
preferences.setPage(5)
}
}
UM.ExtensionModel {
id: curaExtensions
}