CURA-5035 Added already installed plugins

This commit is contained in:
Ian Paschal 2018-04-12 17:22:50 +02:00
parent 0f966115e6
commit 5d395f549a
10 changed files with 51 additions and 206 deletions

View file

@ -42,8 +42,8 @@ Item
onClicked:
{
toolbox.viewPage = "overview"
toolbox.filterPackages("type", toolbox.viewCategory)
toolbox.filterAuthors("type", toolbox.viewCategory)
toolbox.filterModelByProp("packages", "type", toolbox.viewCategory)
toolbox.filterModelByProp("authors", "type", toolbox.viewCategory)
}
style: ButtonStyle
{

View file

@ -92,15 +92,15 @@ Item
{
toolbox.viewSelection = model.name
toolbox.viewPage = "author"
toolbox.filterAuthors("name", model.name)
toolbox.filterPackages("author_name", model.name)
toolbox.filterModelByProp("authors", "name", model.name)
toolbox.filterModelByProp("packages", "author_name", model.name)
}
else
{
toolbox.viewSelection = model.id
toolbox.viewPage = "detail"
toolbox.filterAuthors("name", model.author_name)
toolbox.filterPackages("id", model.id)
toolbox.filterModelByProp("authors", "name", model.author_name)
toolbox.filterModelByProp("packages", "id", model.id)
}
}
}

View file

@ -56,14 +56,14 @@ Item
case "material":
toolbox.viewSelection = model.name
toolbox.viewPage = "author"
toolbox.filterAuthors("name", model.name)
toolbox.filterPackages("author_name", model.name)
toolbox.filterModelByProp("authors", "name", model.name)
toolbox.filterModelByProp("packages", "author_name", model.name)
break
default:
toolbox.viewSelection = model.id
toolbox.viewPage = "detail"
toolbox.filterAuthors("name", model.author_name)
toolbox.filterPackages("id", model.id)
toolbox.filterModelByProp("authors", "name", model.author_name)
toolbox.filterModelByProp("packages", "id", model.id)
break
}
}

View file

@ -6,9 +6,6 @@ import QtQuick.Dialogs 1.1
import QtQuick.Window 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
import UM 1.1 as UM
Rectangle {
@ -55,8 +52,8 @@ Rectangle {
}
onClicked:
{
toolbox.filterPackages("type", "plugin")
toolbox.filterAuthors("type", "plugin")
toolbox.filterModelByProp("packages", "type", "plugin")
toolbox.filterModelByProp("authors", "type", "plugin")
toolbox.viewCategory = "plugin"
toolbox.viewPage = "overview"
}
@ -92,8 +89,8 @@ Rectangle {
}
onClicked:
{
toolbox.filterPackages("type", "material")
toolbox.filterAuthors("type", "material")
toolbox.filterModelByProp("packages", "type", "material")
toolbox.filterModelByProp("authors", "type", "material")
toolbox.viewCategory = "material"
toolbox.viewPage = "overview"
}

View file

@ -58,7 +58,7 @@ ScrollView
Repeater
{
id: materialList
model: toolbox.packagesModel
model: toolbox.pluginsInstalledModel
delegate: ToolboxInstalledTile {}
}
}
@ -93,7 +93,7 @@ ScrollView
Repeater
{
id: pluginList
model: toolbox.packagesModel
model: toolbox.materialsInstalledModel
delegate: ToolboxInstalledTile {}
}
}

View file

@ -103,7 +103,7 @@ Item
Button {
id: removeButton
text: "Uninstall"
visible: model.can_uninstall && model.status == "installed"
// visible: model.can_uninstall && model.status == "installed"
enabled: !toolbox.isDownloading
style: ButtonStyle
{
@ -131,7 +131,7 @@ Item
Button {
id: updateButton
text: "Update"
enabled: model.can_update
// enabled: model.can_update
style: ButtonStyle
{
background: Rectangle
@ -157,9 +157,9 @@ Item
ProgressBar
{
id: progressbar
anchors.left: installButton.left
anchors.right: installButton.right
anchors.top: installButton.bottom
anchors.left: updateButton.left
anchors.right: updateButton.right
anchors.top: updateButton.bottom
anchors.topMargin: 4
value: toolbox.isDownloading ? toolbox.downloadProgress : 0
visible: toolbox.isDownloading