From 89f3704109a814c882af3a95b29924e2ae6dc07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 29 Nov 2021 10:51:52 -0500
Subject: [PATCH] pluginview: use ToggleSwitch to homogeneize style
Change-Id: I9c3a0e146173c16414e000080086c805cbbd6c95
GitLab: #601
---
.../PreferenceItemDelegate.qml | 5 ++--
.../components/PluginItemDelegate.qml | 23 ++-----------------
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/src/commoncomponents/PreferenceItemDelegate.qml b/src/commoncomponents/PreferenceItemDelegate.qml
index c0d07e463..3708a2455 100644
--- a/src/commoncomponents/PreferenceItemDelegate.qml
+++ b/src/commoncomponents/PreferenceItemDelegate.qml
@@ -25,6 +25,7 @@ import net.jami.Adapters 1.1
import net.jami.Constants 1.1
import "../commoncomponents"
+import "../settingsview/components"
ItemDelegate {
id: root
@@ -130,7 +131,7 @@ ItemDelegate {
opacity: enabled ? 1.0 : 0.5
}
- Switch {
+ ToggleSwitch {
id: btnPreferenceSwitch
visible: preferenceType === PreferenceItemDelegate.SWITCH
@@ -140,7 +141,7 @@ ItemDelegate {
Layout.preferredWidth: 30
checked: preferenceCurrentValue === "1"
- onToggled: getNewPreferenceValueSlot(checked)
+ onSwitchToggled: getNewPreferenceValueSlot(checked)
opacity: enabled ? 1.0 : 0.5
}
diff --git a/src/settingsview/components/PluginItemDelegate.qml b/src/settingsview/components/PluginItemDelegate.qml
index 45bbdf74d..d8dad4707 100644
--- a/src/settingsview/components/PluginItemDelegate.qml
+++ b/src/settingsview/components/PluginItemDelegate.qml
@@ -94,7 +94,7 @@ ItemDelegate {
verticalAlignment: Text.AlignVCenter
}
- Switch {
+ ToggleSwitch {
id: loadSwitch
Layout.fillHeight: true
property bool isHovering: false
@@ -106,29 +106,10 @@ ItemDelegate {
ToolTip.text: qsTr("Load/Unload")
checked: isLoaded
- onClicked: {
+ onSwitchToggled: {
btnLoadPluginToggled()
pluginListPreferencesView.isLoaded = root.isLoaded
}
-
- background: Rectangle {
- id: switchBackground
-
- color: "transparent"
- MouseArea {
- id: btnMouseArea
- hoverEnabled: true
- onReleased: {
- loadSwitch.clicked()
- }
- onEntered: {
- loadSwitch.isHovering = true
- }
- onExited: {
- loadSwitch.isHovering = false
- }
- }
- }
}
PushButton {
--
GitLab