From e3fe1703faa6560cfb6f830b0b676a7844567a7e Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Thu, 7 Dec 2023 00:59:03 +0100 Subject: Create ImagePackDeleteDialog component --- resources/qml/dialogs/ImagePackDeleteDialog.qml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/qml/dialogs/ImagePackDeleteDialog.qml (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackDeleteDialog.qml b/resources/qml/dialogs/ImagePackDeleteDialog.qml new file mode 100644 index 00000000..b674de2b --- /dev/null +++ b/resources/qml/dialogs/ImagePackDeleteDialog.qml @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + +import Qt.labs.platform 1.1 as P +import QtQuick +import im.nheko + +P.MessageDialog { + id: deleteStickerPackRoot + + property SingleImagePackModel imagePack + + text: "This will delete the sticker pack: " + imagePack.packname + informativeText: "Are you sure you wish to delete the Sticker pack?" + modality: Qt.ApplicationModal + flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint + buttons: P.MessageDialog.Yes | P.MessageDialog.No + + onAccepted: { + console.info("DELETE PACK: " + imagePack.packname); + imagePack.remove() + timelineRoot.destroyOnClose(dialog); + } +} -- cgit 1.4.1 From 2aefe78a63ef7cbb03f46e20273564c2c74f9464 Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Thu, 7 Dec 2023 01:00:06 +0100 Subject: Integrate ImagePackDeleteDialog in ImagePackSettingsDialog as delete confirmation --- resources/qml/dialogs/ImagePackSettingsDialog.qml | 36 +++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml index 9f807e65..12b4fd37 100644 --- a/resources/qml/dialogs/ImagePackSettingsDialog.qml +++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml @@ -32,7 +32,11 @@ ApplicationWindow { ImagePackEditorDialog { } + } + Component { + id: packDeleteDialog + ImagePackDeleteDialog {} } AdaptiveLayout { @@ -189,16 +193,30 @@ ApplicationWindow { } - Button { + RowLayout { Layout.alignment: Qt.AlignHCenter - text: qsTr("Edit") - enabled: currentPack.canEdit - onClicked: { - var dialog = packEditor.createObject(timelineRoot, { - "imagePack": currentPack - }); - dialog.show(); - timelineRoot.destroyOnClose(dialog); + + Button { + text: qsTr("Edit") + enabled: currentPack.canEdit + onClicked: { + var dialog = packEditor.createObject(timelineRoot, { + "imagePack": currentPack + }); + dialog.show(); + timelineRoot.destroyOnClose(dialog); + } + } + Button { + text: qsTr("Remove") + enabled: currentPack.canEdit + onClicked: { + var dialog = packDeleteDialog.createObject(timelineRoot, { + "imagePack": currentPack + }); + dialog.open(); + timelineRoot.destroyOnClose(packDeleteDialog); + } } } -- cgit 1.4.1 From adc7fb8655ee5dda2b22d6a010ca752149bf1254 Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Thu, 7 Dec 2023 02:08:28 +0100 Subject: remove unnecessary destryoOnClose --- resources/qml/dialogs/ImagePackSettingsDialog.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml index 12b4fd37..d2e58db6 100644 --- a/resources/qml/dialogs/ImagePackSettingsDialog.qml +++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml @@ -215,7 +215,6 @@ ApplicationWindow { "imagePack": currentPack }); dialog.open(); - timelineRoot.destroyOnClose(packDeleteDialog); } } } -- cgit 1.4.1 From b91c70a8eadca602e2920ab5158ae60497880bd1 Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Thu, 7 Dec 2023 15:48:24 +0100 Subject: Fix review issues --- resources/qml/dialogs/ImagePackDeleteDialog.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackDeleteDialog.qml b/resources/qml/dialogs/ImagePackDeleteDialog.qml index b674de2b..38d2ab98 100644 --- a/resources/qml/dialogs/ImagePackDeleteDialog.qml +++ b/resources/qml/dialogs/ImagePackDeleteDialog.qml @@ -11,14 +11,13 @@ P.MessageDialog { property SingleImagePackModel imagePack - text: "This will delete the sticker pack: " + imagePack.packname - informativeText: "Are you sure you wish to delete the Sticker pack?" + text: "Are you sure you wish to delete the sticker pack \"" + imagePack.packname + "\"?" modality: Qt.ApplicationModal flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint buttons: P.MessageDialog.Yes | P.MessageDialog.No onAccepted: { - console.info("DELETE PACK: " + imagePack.packname); + console.info("deleting image pack " + imagePack.packname); imagePack.remove() timelineRoot.destroyOnClose(dialog); } -- cgit 1.4.1 From c605fb6ca8a9338caeccceca8b40459fd07ba3ca Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Thu, 7 Dec 2023 15:56:18 +0100 Subject: make ImagePackDialog text translatable --- resources/qml/dialogs/ImagePackDeleteDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackDeleteDialog.qml b/resources/qml/dialogs/ImagePackDeleteDialog.qml index 38d2ab98..7ac96b91 100644 --- a/resources/qml/dialogs/ImagePackDeleteDialog.qml +++ b/resources/qml/dialogs/ImagePackDeleteDialog.qml @@ -11,7 +11,7 @@ P.MessageDialog { property SingleImagePackModel imagePack - text: "Are you sure you wish to delete the sticker pack \"" + imagePack.packname + "\"?" + text: qsTr("Are you sure you wish to delete the sticker pack '%1'?").arg(imagePack.packname) modality: Qt.ApplicationModal flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint buttons: P.MessageDialog.Yes | P.MessageDialog.No -- cgit 1.4.1 From c254697eaaa411870d130b3ccba8989219ed2699 Mon Sep 17 00:00:00 2001 From: FallenValkyrie Date: Tue, 19 Dec 2023 16:20:29 +0100 Subject: move destroyOnClose into ImagePackSettingsDialog --- resources/qml/dialogs/ImagePackDeleteDialog.qml | 1 - resources/qml/dialogs/ImagePackSettingsDialog.qml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/qml/dialogs/ImagePackDeleteDialog.qml b/resources/qml/dialogs/ImagePackDeleteDialog.qml index 7ac96b91..91407a9e 100644 --- a/resources/qml/dialogs/ImagePackDeleteDialog.qml +++ b/resources/qml/dialogs/ImagePackDeleteDialog.qml @@ -19,6 +19,5 @@ P.MessageDialog { onAccepted: { console.info("deleting image pack " + imagePack.packname); imagePack.remove() - timelineRoot.destroyOnClose(dialog); } } diff --git a/resources/qml/dialogs/ImagePackSettingsDialog.qml b/resources/qml/dialogs/ImagePackSettingsDialog.qml index d2e58db6..69068405 100644 --- a/resources/qml/dialogs/ImagePackSettingsDialog.qml +++ b/resources/qml/dialogs/ImagePackSettingsDialog.qml @@ -215,6 +215,7 @@ ApplicationWindow { "imagePack": currentPack }); dialog.open(); + timelineRoot.destroyOnClose(dialog); } } } -- cgit 1.4.1