3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Moved qml pages of toolbox to a loader"

Browse source 
This reverts commit 838949dac7.
This commit is contained in:
Jaime van Kessel 2018-12-06 14:12:35 +01:00
parent 2602d5bf02
commit 54def4edee
2 changed files with 62 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

55
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -44,31 +44,36 @@ Window
top: header.bottom
bottom: footer.top
}
Loader
// TODO: This could be improved using viewFilter instead of viewCategory
ToolboxLoadingPage
{
anchors.fill:parent
source:
{
if(toolbox.viewCategory == "installed")
{
return "ToolboxInstalledPage.qml"
}
switch (toolbox.viewPage)
{
case "loading":
return "ToolboxLoadingPage.qml"
case "errored":
return "ToolboxErrorPage.qml"
case "overview":
return "ToolboxDownloadsPage.qml"
case "detail":
return "ToolboxDetailPage.qml"
case "author":
return "ToolboxAuthorPage.qml"
}
}
id: viewLoading
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
}
ToolboxErrorPage
{
id: viewErrored
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
}
ToolboxDownloadsPage
{
id: viewDownloads
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview"
}
ToolboxDetailPage
{
id: viewDetail
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail"
}
ToolboxAuthorPage
{
id: viewAuthor
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author"
}
ToolboxInstalledPage
{
id: installedPluginList
visible: toolbox.viewCategory == "installed"
}
}
@ -90,7 +95,7 @@ Window
licenseDialog.show();
}
}
ToolboxLicenseDialog
{
id: licenseDialog