Commit aa87fd8b authored by Jonah Brüchert's avatar Jonah Brüchert 🌳 Committed by Linus Jahn

Port from IconButton to ToolButton and drop IconButton class.

IconButton was still from the early times of QtQuickControls 2, when it didn't support icons natively.
parent c579a63e
Pipeline #16989 canceled with stages
...@@ -351,11 +351,16 @@ ChatPageBase { ...@@ -351,11 +351,16 @@ ChatPageBase {
Enums.MessageType.MessageDocument Enums.MessageType.MessageDocument
] ]
delegate: IconButton { delegate: Controls.ToolButton {
height: ListView.view.height height: ListView.view.height
width: height width: height
buttonText: MediaUtilsInstance.label(model.modelData) text: MediaUtilsInstance.label(model.modelData)
iconSource: MediaUtilsInstance.iconName(model.modelData) icon {
name: MediaUtilsInstance.iconName(model.modelData)
height: Kirigami.Units.gridUnit * 5
width: icon.height
}
display: Controls.AbstractButton.TextUnderIcon
onClicked: { onClicked: {
switch (model.modelData) { switch (model.modelData) {
......
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2020 Kaidan developers and contributors
* (see the LICENSE file for a full list of copyright authors)
*
* Kaidan 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.
*
* In addition, as a special exception, the author of Kaidan gives
* permission to link the code of its release with the OpenSSL
* project's "OpenSSL" library (or with modified versions of it that
* use the same license as the "OpenSSL" library), and distribute the
* linked executables. You must obey the GNU General Public License in
* all respects for all of the code used other than "OpenSSL". If you
* modify this file, you may extend this exception to your version of
* the file, but you are not obligated to do so. If you do not wish to
* do so, delete this exception statement from your version.
*
* Kaidan 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 Kaidan. If not, see <http://www.gnu.org/licenses/>.
*/
import org.kde.kirigami 2.8 as Kirigami
import QtQuick.Controls 2.12 as Controls
import QtQuick.Layouts 1.12
Controls.ToolButton {
id: button
property string buttonText
property string iconSource
property real scaleFactor: 5
Layout.fillHeight: true
Layout.preferredHeight: Kirigami.Units.gridUnit * (scaleFactor + 2)
Layout.preferredWidth: Kirigami.Units.gridUnit * scaleFactor + Kirigami.Units.smallSpacing * 2
contentItem: ColumnLayout {
Kirigami.Icon {
id: icon
Layout.fillHeight: true
Layout.fillWidth: true
height: Kirigami.Units.gridUnit * scaleFactor
width: Kirigami.Units.gridUnit * scaleFactor
Layout.leftMargin: Kirigami.Units.smallSpacing
Layout.rightMargin: Kirigami.Units.smallSpacing
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
source: iconSource
}
Controls.Label {
text: buttonText
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
}
}
}
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
<file>elements/CenteredAdaptiveButton.qml</file> <file>elements/CenteredAdaptiveButton.qml</file>
<file>elements/CenteredAdaptiveHighlightedButton.qml</file> <file>elements/CenteredAdaptiveHighlightedButton.qml</file>
<file>elements/CenteredAdaptiveText.qml</file> <file>elements/CenteredAdaptiveText.qml</file>
<file>elements/IconButton.qml</file>
<file>elements/FileChooser.qml</file> <file>elements/FileChooser.qml</file>
<file>elements/SendMediaSheet.qml</file> <file>elements/SendMediaSheet.qml</file>
<file>elements/BinaryDecisionPage.qml</file> <file>elements/BinaryDecisionPage.qml</file>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment