3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Plugin browswer updates

Browse source 
- Partial refactor
- Preparation for merge with plugins in preferences
This commit is contained in:
Ian Paschal 2018-01-23 16:20:19 +01:00
parent f27dc4473e
commit dcb1ac5deb
2 changed files with 205 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

130
plugins/PluginBrowser/PluginBrowser.qml
View file

@ -1,4 +1,6 @@
import UM 1.1 as UM
// Copyright (c) 2017 Ultimaker B.V.
// PluginBrowser is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.2
@ -7,18 +9,34 @@ import QtQuick.Controls.Styles 1.4
// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
import UM 1.1 as UM
UM.Dialog {
id: base
title: catalog.i18nc("@title:tab", "Plugins");
width: 800 * screenScaleFactor
height: 600 * screenScaleFactor
height: 640 * screenScaleFactor
minimumWidth: 350 * screenScaleFactor
minimumHeight: 350 * screenScaleFactor
Item {
anchors.fill: parent
Column {
// anchors.fill: parent
height: parent.height
width: parent.width
spacing: UM.Theme.getSize("default_margin").height
Rectangle {
id: topBar
width: parent.width
color: "red"
height: 30
Text {
text: "Search"
}
}
/*
Item {
id: topBar
height: childrenRect.height;
@ -39,15 +57,24 @@ UM.Dialog {
enabled: !manager.isDownloading
}
}
*/
// Scroll view breaks in QtQuick.Controls 2.x
Label {
text: "Installed Plugins"
}
ScrollView {
id: installedPluginList
width: parent.width
height: 280
/*
anchors.top: topBar.bottom
anchors.bottom: bottomBar.top
anchors.bottom: availiblePluginList.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
*/
frameVisible: true
ListView {
id: pluginList
model: manager.pluginsModel
@ -56,13 +83,45 @@ UM.Dialog {
delegate: pluginDelegate
}
}
Label {
text: "Availible plugins..."
}
/*
Rectangle {
width: parent.width
color: "red"
height: 200
Text {
text: "Plugins not installed yet"
}
}
*/
Item {
// Scroll view breaks in QtQuick.Controls 2.x
ScrollView {
id: availiblePluginList
width: parent.width
/*
anchors.top: installedPluginList.bottom
anchors.bottom: bottomBar.top
anchors.bottomMargin: UM.Theme.getSize("default_margin").height
*/
frameVisible: true
height: 180
Rectangle {
width: parent.width
color: "red"
height: 1000
}
}
Rectangle {
id: bottomBar
width: parent.width
height: closeButton.height
anchors.bottom: parent.bottom
anchors.left: parent.left
height: childrenRect.height;
// anchors.bottom: parent.bottom
// anchors.left: parent.left
Button {
id: closeButton
@ -79,7 +138,7 @@ UM.Dialog {
}
}
Item {
Rectangle {
Component {
id: pluginDelegate
@ -109,7 +168,8 @@ UM.Dialog {
pixelSize: 13
bold: true
}
color: model.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("secondary")
// color: model.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("secondary")
color: UM.Theme.getColor("text")
}
Label {
@ -367,11 +427,9 @@ UM.Dialog {
}
UM.I18nCatalog { id: catalog; name: "cura" }
Connections
{
Connections {
target: manager
onShowLicenseDialog:
{
onShowLicenseDialog: {
licenseDialog.pluginName = manager.getLicenseDialogPluginName();
licenseDialog.licenseContent = manager.getLicenseDialogLicenseContent();
licenseDialog.pluginFileLocation = manager.getLicenseDialogPluginFileLocation();
@ -379,8 +437,7 @@ UM.Dialog {
}
}
UM.Dialog
{
UM.Dialog {
id: licenseDialog
title: catalog.i18nc("@title:window", "Plugin License Agreement")
@ -444,5 +501,44 @@ UM.Dialog {
}
]
}
Connections {
target: manager
onShowRestartDialog: {
restartDialog.message = manager.getRestartDialogMessage();
restartDialog.show();
}
}
UM.Dialog {
id: restartDialog
// title: catalog.i18nc("@title:tab", "Plugins");
width: 360 * screenScaleFactor
height: 180 * screenScaleFactor
minimumWidth: 360 * screenScaleFactor
minimumHeight: 180 * screenScaleFactor
property var message;
Text {
id: message
text: restartDialog.message != null ? restartDialog.message : ""
}
Button {
id: laterButton
text: "Later"
onClicked: restartDialog.close();
anchors.left: parent.left
anchors.bottom: parent.bottom
}
Button {
id: restartButton
text: "Restart now"
onClicked: restartDialog.close();
anchors.right: parent.right
anchors.bottom: parent.bottom
}
}
}
}