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

Port EmoticonsPage to FormCard

Browse Source
This commit is contained in:
Tobias Fella
2023-09-01 17:21:10 +02:00
parent dfba655527
commit 063056bebd
2 changed files with 95 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/qml/Settings/EmoticonFormCard.qml
View File

@@ -6,12 +6,12 @@ import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
import org.kde.neochat 1.0
MobileForm.FormCard {
id: emoticonFormCard
FormCard.FormCard {
id: root
enum EmoticonType {
Emojis,
@@ -20,9 +20,6 @@ MobileForm.FormCard {
property var emoticonType
Layout.fillWidth: true
contentItem: ColumnLayout {
spacing: 0
Flow {
id: stickerFlow
Layout.fillWidth: true
@@ -33,26 +30,26 @@ MobileForm.FormCard {
id: stickerModel
connection: Controller.activeConnection
}
showStickers: emoticonFormCard.emoticonType === EmoticonFormCard.Stickers
showEmojis: emoticonFormCard.emoticonType === EmoticonFormCard.Emojis
showStickers: root.emoticonType === EmoticonFormCard.Stickers
showEmojis: root.emoticonType === EmoticonFormCard.Emojis
}
delegate: MobileForm.AbstractFormDelegate {
delegate: FormCard.AbstractFormDelegate {
id: stickerDelegate
width: stickerFlow.width / 4
height: width
onClicked: pageSettingStack.pushDialogLayer(emoticonEditorPage, {
onClicked: pageStack.pushDialogLayer(emoticonEditorPage, {
description: model.body ?? "",
index: model.index,
url: model.url,
shortcode: model.shortcode,
model: stickerModel,
proxyModel: emoticonFilterModel,
emoticonType: emoticonFormCard.emoticonType
emoticonType: root.emoticonType
}, {
title: emoticonFormCard.emoticonType === EmoticonFormCard.Emojis ? i18nc("@title", "Edit Emoji") : i18nc("@title", "Edit Sticker")
title: root.emoticonType === EmoticonFormCard.Emojis ? i18nc("@title", "Edit Emoji") : i18nc("@title", "Edit Sticker")
});
contentItem: ColumnLayout {
@@ -63,7 +60,7 @@ MobileForm.FormCard {
fillMode: Image.PreserveAspectFit
autoTransform: true
Kirigami.Icon {
source: emoticonFormCard.emoticonType === EmoticonFormCard.Emojis ? "preferences-desktop-emoticons" : "stickers"
source: root.emoticonType === EmoticonFormCard.Emojis ? "preferences-desktop-emoticons" : "stickers"
anchors.fill: parent
visible: parent.status !== Image.Ready
}
@@ -88,11 +85,11 @@ MobileForm.FormCard {
}
}
}
MobileForm.AbstractFormDelegate {
FormCard.AbstractFormDelegate {
width: stickerFlow.width / 4
height: width
onClicked: pageSettingStack.pushDialogLayer(emoticonEditorPage, {
onClicked: pageStack.pushDialogLayer(emoticonEditorPage, {
description: "",
index: -1,
url: "",
@@ -100,9 +97,9 @@ MobileForm.FormCard {
model: stickerModel,
proxyModel: emoticonFilterModel,
newEmoticon: true,
emoticonType: emoticonFormCard.emoticonType
emoticonType: root.emoticonType
}, {
title: emoticonFormCard.emoticonType === EmoticonFormCard.Emojis ? i18nc("@title", "Add Emoji") : i18nc("@title", "Add Sticker")
title: root.emoticonType === EmoticonFormCard.Emojis ? i18nc("@title", "Add Emoji") : i18nc("@title", "Add Sticker")
});
contentItem: ColumnLayout {
spacing: 0
@@ -111,12 +108,11 @@ MobileForm.FormCard {
Layout.fillWidth: true
}
QQC2.Label {
text: emoticonFormCard.emoticonType === EmoticonFormCard.Emojis ? i18n("Add Emoji") : i18n("Add Sticker")
text: root.emoticonType === EmoticonFormCard.Emojis ? i18n("Add Emoji") : i18n("Add Sticker")
horizontalAlignment: Qt.AlignHCenter
Layout.fillWidth: true
}
}
}
}
}
}

22
src/qml/Settings/EmoticonsPage.qml
View File

@@ -5,37 +5,31 @@ import QtQuick 2.15
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.19 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
import org.kde.kirigamiaddons.formcard 1.0 as FormCard
import org.kde.neochat 1.0
Kirigami.ScrollablePage {
FormCard.FormCardPage {
id: root
title: emoticonType === EmoticonFormCard.Emojis ? i18n("Emojis") : i18n("Stickers")
topPadding: 0
leftPadding: 0
rightPadding: 0
title: i18nc("@title", "Stickers & Emojis")
ColumnLayout {
spacing: 0
MobileForm.FormHeader {
Layout.fillWidth: true
FormCard.FormHeader {
title: i18n("Emojis")
}
EmoticonFormCard {
emoticonType: EmoticonFormCard.Emojis
}
MobileForm.FormHeader {
Layout.fillWidth: true
FormCard.FormHeader {
title: i18n("Stickers")
}
EmoticonFormCard {
emoticonType: EmoticonFormCard.Stickers
}
}
Component {
property Component emoticonEditorPage: Component {
id: emoticonEditorPage
EmoticonEditorPage {}
}