From 17aee6c699df6f13496f808297fb5c0ed3b54a2e Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 6 Oct 2020 14:39:16 -0400
Subject: [PATCH] misc: remove unused component: HoverableButtonTextItem
Change-Id: If8764e701246b516a42b4a574efc94e5ace5d28b
---
qml.qrc | 1 -
.../HoverableButtonTextItem.qml | 106 ------------------
.../components/BannedContacts.qml | 4 +-
3 files changed, 1 insertion(+), 110 deletions(-)
delete mode 100644 src/commoncomponents/HoverableButtonTextItem.qml
diff --git a/qml.qrc b/qml.qrc
index 5773ee215..3afafbac7 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -52,7 +52,6 @@
<file>src/settingsview/components/NameRegistrationDialog.qml</file>
<file>src/settingsview/components/LinkDeviceDialog.qml</file>
<file>src/settingsview/components/RevokeDevicePasswordDialog.qml</file>
- <file>src/commoncomponents/HoverableButtonTextItem.qml</file>
<file>src/commoncomponents/HoverableRadiusButton.qml</file>
<file>src/commoncomponents/PasswordDialog.qml</file>
<file>src/commoncomponents/InfoLineEdit.qml</file>
diff --git a/src/commoncomponents/HoverableButtonTextItem.qml b/src/commoncomponents/HoverableButtonTextItem.qml
deleted file mode 100644
index 3ab423673..000000000
--- a/src/commoncomponents/HoverableButtonTextItem.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2020 by Savoir-faire Linux
- * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import net.jami.Models 1.0
-
-// HoverableButton containes functionalites:
-// 1. Color changes on different button state
-// 2. Radius control (rounded)
-// 3. Text content or image content
-// 4. Can use OnClicked slot to implement some click logic
-
-Button {
- id: root
-
- property int fontPointSize: 9
- property int buttonImageHeight: hoverableButtonBackground.height
- property int buttonImageWidth: hoverableButtonBackground.width
-
- property string backgroundColor: JamiTheme.normalButtonColor
- property string onPressColor: JamiTheme.pressColor
- property string onReleaseColor: backgroundColor
- property string onEnterColor: JamiTheme.hoverColor
- property string onExitColor: backgroundColor
- property string onDisabledBackgroundColor: backgroundColor
- property string textColor: "black"
-
- property alias radius: hoverableButtonBackground.radius
- property alias source: hoverableButtonImage.source
-
- property string toolTipText: ""
-
- font.pointSize: fontPointSize
- font.kerning: true
-
- hoverEnabled: true
-
- ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
- ToolTip.visible: hovered && (toolTipText.length > 0)
- ToolTip.text: toolTipText
-
- contentItem: Text {
- text: root.text
- font: root.font
- opacity: enabled ? 1.0 : 0.3
- color: textColor
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- id: hoverableButtonBackground
-
- color: root.enabled ? backgroundColor:onDisabledBackgroundColor
-
- Image {
- id: hoverableButtonImage
-
- anchors.centerIn: hoverableButtonBackground
-
- height: buttonImageHeight
- width: buttonImageWidth
-
- fillMode: Image.PreserveAspectFit
- mipmap: true
- asynchronous: true
- }
-
- MouseArea {
- enabled: root.enabled
- anchors.fill: parent
-
- hoverEnabled: true
-
- onPressed: {
- hoverableButtonBackground.color = onPressColor
- }
- onReleased: {
- hoverableButtonBackground.color = onReleaseColor
- root.clicked()
- }
- onEntered: {
- hoverableButtonBackground.color = onEnterColor
- }
- onExited: {
- hoverableButtonBackground.color = onExitColor
- }
- }
- }
-}
diff --git a/src/settingsview/components/BannedContacts.qml b/src/settingsview/components/BannedContacts.qml
index 67e468317..d96fab015 100644
--- a/src/settingsview/components/BannedContacts.qml
+++ b/src/settingsview/components/BannedContacts.qml
@@ -108,13 +108,11 @@ ColumnLayout {
- JamiTheme.preferredMarginSize * 4
}
- HoverableButtonTextItem {
+ PushButton {
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: JamiTheme.preferredFieldHeight
Layout.preferredHeight: JamiTheme.preferredFieldHeight
- radius: height / 2
-
toolTipText: JamiStrings.tipBannedContacts
source: bannedListWidget.visible?
--
GitLab