From 0aa3275b932d9f93bb71d6aa94fd1c9b05dc266d Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 22 Jul 2021 14:54:36 -0400
Subject: [PATCH] misc: use BackButton when necessary
Change-Id: I220038edeb4dc83d85d8e4048168c97c2a992940
---
src/constant/JamiStrings.qml | 1 +
src/mainview/components/PluginHandlerPicker.qml | 9 ++++-----
src/settingsview/components/SettingsHeader.qml | 9 +--------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index f8876d7d0..ef6dfe467 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -430,6 +430,7 @@ Item {
// PluginListSettingsView
property string addNewPlugin: qsTr("Add new plugin")
+ property string goBackToPluginsList: qsTr("Go back to plugins list")
// PreferenceItemDelegate
property string selectFile: qsTr("Select a file")
diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml
index 5b2bca669..75a399c2a 100644
--- a/src/mainview/components/PluginHandlerPicker.qml
+++ b/src/mainview/components/PluginHandlerPicker.qml
@@ -201,15 +201,14 @@ Popup {
RowLayout {
height: JamiTheme.preferredFieldHeight
- PushButton {
+ BackButton {
id: backButton
+
Layout.leftMargin: 5
Layout.topMargin: 5
- imageColor: JamiTheme.textColor
- source: JamiResources.ic_arrow_back_24dp_svg
- toolTipText: qsTr("Go back to plugins list")
- hoverEnabled: true
+ toolTipText: JamiStrings.goBackToPluginsList
+
onClicked: {
stack.pop(null, StackView.Immediate)
}
diff --git a/src/settingsview/components/SettingsHeader.qml b/src/settingsview/components/SettingsHeader.qml
index b5336b59d..ff3302beb 100644
--- a/src/settingsview/components/SettingsHeader.qml
+++ b/src/settingsview/components/SettingsHeader.qml
@@ -33,19 +33,12 @@ RowLayout {
property string title: ""
signal backArrowClicked
- PushButton {
+ BackButton {
id: backToSettingsMenuButton
Layout.preferredWidth: JamiTheme.preferredFieldHeight
Layout.preferredHeight: JamiTheme.preferredFieldHeight
- radius: JamiTheme.preferredFieldHeight
- source: JamiResources.ic_arrow_back_24dp_svg
- normalColor: JamiTheme.backgroundColor
- imageColor: JamiTheme.textColor
- toolTipText: JamiStrings.back
- hoverEnabled: true
-
visible: mainView.sidePanelOnly
onClicked: backArrowClicked()
--
GitLab