From 4b8d41214bb4c3a13050956fcf6f4aaee571e52a Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 10 Aug 2010 19:16:18 +0300
Subject: [PATCH] EXT-8255 FIXED Added confirmation dialog when removing items.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/849/
--HG--
branch : product-engine
---
indra/newview/llfolderview.cpp | 12 ++++++++++++
indra/newview/llfolderview.h | 2 ++
.../newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
indra/newview/skins/default/xui/en/strings.xml | 4 ++++
4 files changed, 31 insertions(+)
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index e8891d1cc53..ab36a761534 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -62,6 +62,7 @@
#include "llviewerwindow.h"
#include "llvoavatar.h"
#include "llfloaterproperties.h"
+#include "llnotificationsutil.h"
// Linden library includes
#include "lldbstrings.h"
@@ -1024,6 +1025,17 @@ void LLFolderView::closeRenamer( void )
void LLFolderView::removeSelectedItems( void )
{
+ if (mSelectedItems.empty()) return;
+ LLSD args;
+ args["QUESTION"] = LLTrans::getString(mSelectedItems.size() > 1 ? "DeleteItems" : "DeleteItem");
+ LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLFolderView::onItemsRemovalConfirmation, this, _1, _2));
+}
+
+void LLFolderView::onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response)
+{
+ S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+ if (option != 0) return; // canceled
+
if(getVisible() && getEnabled())
{
// just in case we're removing the renaming item.
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index a7763e8eeb4..f5f229a6029 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -293,6 +293,8 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
BOOL addNoOptions(LLMenuGL* menu) const;
+ void onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response);
+
protected:
LLHandle<LLView> mPopupMenuHandle;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3576462cca5..609a9b09be4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4021,6 +4021,19 @@ Are you sure you want to quit?
<unique/>
</notification>
+ <notification
+ icon="alertmodal.tga"
+ name="DeleteItems"
+ type="alertmodal">
+ [QUESTION]
+ <usetemplate
+ ignoretext="Confirm before deleting items"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ <unique/>
+ </notification>
+
<notification
icon="alertmodal.tga"
name="HelpReportAbuseEmailLL"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9941732c30a..2aa34b746bd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3258,4 +3258,8 @@ Abuse Report</string>
<string name="Notices">Notices</string>
<string name="Chat">Chat</string>
+ <!-- Question strings for delete items notifications -->
+ <string name="DeleteItems">Delete selected items?</string>
+ <string name="DeleteItem">Delete selected item?</string>
+
</strings>
--
GitLab