Skip to content
Snippets Groups Projects
Commit 72646960 authored by Aline Gondim Santos's avatar Aline Gondim Santos Committed by Aline Gondim Santos
Browse files

plugin: fix load/unload

Change-Id: If527d5c8ca3947943ac17ef627cb5bf73a4530bd
parent be70e36b
Branches
Tags
No related merge requests found
......@@ -43,6 +43,8 @@ Rectangle {
visible: false
signal uninstalled
function resetPluginSlot() {
resetPluginMessageBox.open()
}
......@@ -64,6 +66,7 @@ Rectangle {
function uninstallPlugin() {
PluginModel.uninstallPlugin(pluginId)
uninstalled()
}
function setPreference(pluginId, preferenceKey, preferenceNewValue)
......@@ -72,11 +75,9 @@ Rectangle {
PluginModel.unloadPlugin(pluginId)
PluginModel.setPluginPreference(pluginId, preferenceKey, preferenceNewValue)
PluginModel.loadPlugin(pluginId)
}
else {
} else
PluginModel.setPluginPreference(pluginId, preferenceKey, preferenceNewValue)
}
}
MessageDialog {
id: uninstallPluginMessageBox
......
......@@ -24,6 +24,7 @@ import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14
import net.jami.Models 1.0
import net.jami.Adapters 1.0
import "../../commoncomponents"
Rectangle {
......@@ -31,6 +32,14 @@ Rectangle {
property PluginListPreferencesView pluginListPreferencesView
Connections {
target: pluginListPreferencesView
function onUninstalled() {
pluginListView.model = PluginAdapter.getPluginSelectableModel()
}
}
visible: false
function openPluginFileSlot() {
......@@ -79,6 +88,7 @@ Rectangle {
onAccepted: {
var url = UtilsAdapter.getAbsPath(file.toString())
PluginModel.installPlugin(url, true)
pluginListView.model = PluginAdapter.getPluginSelectableModel()
}
}
......@@ -117,9 +127,7 @@ Rectangle {
text: qsTr("Install Plugin")
onClicked: {
openPluginFileSlot()
}
onClicked: openPluginFileSlot()
}
ListView {
......@@ -142,17 +150,14 @@ Rectangle {
pluginIcon: PluginIcon
isLoaded: IsLoaded
onClicked: {
pluginListView.currentIndex = index
}
onClicked: pluginListView.currentIndex = index
onBtnLoadPluginToggled: {
loadPluginSlot(pluginId, isLoaded)
pluginListView.model = PluginAdapter.getPluginSelectableModel()
}
onBtnPreferencesPluginClicked:{
openPreferencesPluginSlot(pluginName, pluginIcon, pluginId, isLoaded)
}
onBtnPreferencesPluginClicked: openPreferencesPluginSlot(pluginName, pluginIcon, pluginId, isLoaded)
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment