Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
72646960
Commit
72646960
authored
4 years ago
by
Aline Gondim Santos
Committed by
Aline Gondim Santos
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
plugin: fix load/unload
Change-Id: If527d5c8ca3947943ac17ef627cb5bf73a4530bd
parent
be70e36b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/settingsview/components/PluginListPreferencesView.qml
+12
-11
12 additions, 11 deletions
src/settingsview/components/PluginListPreferencesView.qml
src/settingsview/components/PluginListSettingsView.qml
+24
-19
24 additions, 19 deletions
src/settingsview/components/PluginListSettingsView.qml
with
36 additions
and
30 deletions
src/settingsview/components/PluginListPreferencesView.qml
+
12
−
11
View file @
72646960
...
...
@@ -43,12 +43,14 @@ Rectangle {
visible
:
false
function
resetPluginSlot
(){
signal
uninstalled
function
resetPluginSlot
()
{
resetPluginMessageBox
.
open
()
}
function
resetPlugin
(){
if
(
isLoaded
){
function
resetPlugin
()
{
if
(
isLoaded
)
{
PluginModel
.
unloadPlugin
(
pluginId
)
PluginModel
.
resetPluginPreferencesValues
(
pluginId
)
PluginModel
.
loadPlugin
(
pluginId
)
...
...
@@ -58,27 +60,26 @@ Rectangle {
pluginPreferenceView
.
model
=
PluginAdapter
.
getPluginPreferencesModel
(
pluginId
)
}
function
uninstallPluginSlot
(){
function
uninstallPluginSlot
()
{
uninstallPluginMessageBox
.
open
()
}
function
uninstallPlugin
(){
function
uninstallPlugin
()
{
PluginModel
.
uninstallPlugin
(
pluginId
)
uninstalled
()
}
function
setPreference
(
pluginId
,
preferenceKey
,
preferenceNewValue
)
{
if
(
isLoaded
){
if
(
isLoaded
)
{
PluginModel
.
unloadPlugin
(
pluginId
)
PluginModel
.
setPluginPreference
(
pluginId
,
preferenceKey
,
preferenceNewValue
)
PluginModel
.
loadPlugin
(
pluginId
)
}
else
{
}
else
PluginModel
.
setPluginPreference
(
pluginId
,
preferenceKey
,
preferenceNewValue
)
}
}
MessageDialog
{
MessageDialog
{
id
:
uninstallPluginMessageBox
title
:
qsTr
(
"
Uninstall plugin
"
)
...
...
@@ -92,7 +93,7 @@ Rectangle {
}
}
MessageDialog
{
MessageDialog
{
id
:
resetPluginMessageBox
title
:
qsTr
(
"
Reset preferences
"
)
...
...
This diff is collapsed.
Click to expand it.
src/settingsview/components/PluginListSettingsView.qml
+
24
−
19
View file @
72646960
...
...
@@ -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,29 +32,37 @@ Rectangle {
property
PluginListPreferencesView
pluginListPreferencesView
Connections
{
target
:
pluginListPreferencesView
function
onUninstalled
()
{
pluginListView
.
model
=
PluginAdapter
.
getPluginSelectableModel
()
}
}
visible
:
false
function
openPluginFileSlot
(){
function
openPluginFileSlot
()
{
pluginPathDialog
.
open
()
}
function
loadPluginSlot
(
pluginId
,
isLoaded
){
function
loadPluginSlot
(
pluginId
,
isLoaded
)
{
var
loaded
=
false
if
(
isLoaded
)
PluginModel
.
unloadPlugin
(
pluginId
)
else
loaded
=
PluginModel
.
loadPlugin
(
pluginId
)
if
(
pluginListPreferencesView
.
pluginId
===
pluginId
)
if
(
pluginListPreferencesView
.
pluginId
===
pluginId
)
pluginListPreferencesView
.
isLoaded
=
loaded
}
function
openPreferencesPluginSlot
(
pluginName
,
pluginIcon
,
pluginId
,
isLoaded
){
function
openPreferencesPluginSlot
(
pluginName
,
pluginIcon
,
pluginId
,
isLoaded
)
{
if
(
pluginListPreferencesView
.
pluginId
==
pluginId
||
pluginListPreferencesView
.
pluginId
==
""
)
pluginListPreferencesView
.
visible
=
!
pluginListPreferencesView
.
visible
if
(
!
pluginListPreferencesView
.
visible
){
if
(
!
pluginListPreferencesView
.
visible
)
{
pluginListPreferencesView
.
pluginId
=
""
}
else
{
}
else
{
pluginListPreferencesView
.
pluginName
=
pluginName
pluginListPreferencesView
.
pluginIcon
=
pluginIcon
pluginListPreferencesView
.
pluginId
=
pluginId
...
...
@@ -61,7 +70,7 @@ Rectangle {
}
}
function
hidePreferences
(){
function
hidePreferences
()
{
pluginListPreferencesView
.
pluginId
=
""
pluginListPreferencesView
.
visible
=
false
}
...
...
@@ -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
{
...
...
@@ -131,28 +139,25 @@ Rectangle {
model
:
PluginAdapter
.
getPluginSelectableModel
()
delegate
:
PluginItemDelegate
{
delegate
:
PluginItemDelegate
{
id
:
pluginItemDelegate
width
:
pluginListView
.
width
height
:
50
pluginName
:
PluginName
pluginName
:
PluginName
pluginId
:
PluginId
pluginIcon
:
PluginIcon
isLoaded
:
IsLoaded
onClicked
:
{
pluginListView
.
currentIndex
=
index
}
onClicked
:
pluginListView
.
currentIndex
=
index
onBtnLoadPluginToggled
:{
onBtnLoadPluginToggled
:
{
loadPluginSlot
(
pluginId
,
isLoaded
)
pluginListView
.
model
=
PluginAdapter
.
getPluginSelectableModel
()
}
onBtnPreferencesPluginClicked
:{
openPreferencesPluginSlot
(
pluginName
,
pluginIcon
,
pluginId
,
isLoaded
)
}
onBtnPreferencesPluginClicked
:
openPreferencesPluginSlot
(
pluginName
,
pluginIcon
,
pluginId
,
isLoaded
)
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment