ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to KirigamAddons.Banner

Browse Source 
(cherry picked from commit 3263a69880)
This commit is contained in:
Carl Schwan
2023-07-19 22:46:36 +02:00
parent 147ce42c04
commit 3745414635
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qml/Page/ImageEditorPage.qml
View File

@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.15
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import org.kde.kirigami 2.15 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
import org.kde.kquickimageeditor 1.0 as KQuickImageEditor import org.kde.kquickimageeditor 1.0 as KQuickImageEditor
Kirigami.Page { Kirigami.Page {
@@ -170,7 +171,7 @@ Kirigami.Page {
} }
} }
footer: Kirigami.InlineMessage { footer: KirigamiComponents.Banner {
id: msg id: msg
type: Kirigami.MessageType.Error type: Kirigami.MessageType.Error
showCloseButton: true showCloseButton: true

18
src/qml/Page/RoomPage.qml
View File

@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
import org.kde.kirigami 2.19 as Kirigami import org.kde.kirigami 2.19 as Kirigami
import org.kde.kitemmodels 1.0 import org.kde.kitemmodels 1.0
@@ -42,14 +43,9 @@ Kirigami.Page {
} }
} }
header: QQC2.Control { header: KirigamiComponents.Banner {
height: visible ? implicitHeight : 0 showCloseButton: true
visible: false visible: false
padding: Kirigami.Units.smallSpacing
contentItem: Kirigami.InlineMessage {
showCloseButton: true
visible: true
}
} }
Loader { Loader {
@@ -166,15 +162,15 @@ Kirigami.Page {
Connections { Connections {
target: currentRoom target: currentRoom
function onShowMessage(messageType, message) { function onShowMessage(messageType, message) {
root.header.contentItem.text = message; root.header.text = message;
root.header.contentItem.type = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : messageType === ActionsHandler.Positive ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information; root.headertype = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : messageType === ActionsHandler.Positive ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information;
root.header.visible = true; root.header.visible = true;
} }
} }
function warning(title, message) { function warning(title, message) {
root.header.contentItem.text = `${title}<br />${message}`; root.header.text = `${title}<br />${message}`;
root.header.contentItem.type = Kirigami.MessageType.Warning; root.header.type = Kirigami.MessageType.Warning;
root.header.visible = true; root.header.visible = true;
} }