From: Himanshu <himanshu.t@samsung.com>
Date: Mon, 5 Aug 2013 06:58:28 +0000 (+0530)
Subject:  Fixed issue 48334
X-Git-Tag: 2.2_release~3
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=2a5fd7a39d0cd88cbb439dc5f1c628561f3346fc

 Fixed issue 48334

Change-Id: I7aefb8109e4af89dfdd4a8e63287e8df4bb37f59
Signed-off-by: Himanshu <himanshu.t@samsung.com>
---

diff --git a/inc/GlBaseForm.h b/inc/GlBaseForm.h
index 1525774..52f4dde 100644
--- a/inc/GlBaseForm.h
+++ b/inc/GlBaseForm.h
@@ -34,7 +34,7 @@ public:
 
 protected:
 	Tizen::Base::Collection::IList* GetMoveFileIndexList(Tizen::Base::String&, Tizen::Base::Collection::IList*,
-			FileListPresentationModel*);
+			FileListPresentationModel*,bool isCopyOp = false);
 
 protected:
 	bool _overlayMsg;
diff --git a/src/GlBaseForm.cpp b/src/GlBaseForm.cpp
index 6d48339..cfe5ba4 100644
--- a/src/GlBaseForm.cpp
+++ b/src/GlBaseForm.cpp
@@ -28,7 +28,7 @@ using namespace Tizen::Ui::Controls;
 using namespace Tizen::Base::Utility;
 
 IList*
-BaseForm::GetMoveFileIndexList(String& moveDir, IList* pMoveIndexList, FileListPresentationModel* pPresentationModel)
+BaseForm::GetMoveFileIndexList(String& moveDir, IList* pMoveIndexList, FileListPresentationModel* pPresentationModel, bool isCopyOp)
 {
 	if (&moveDir == null || moveDir.IsEmpty())
 	{
@@ -96,8 +96,17 @@ BaseForm::GetMoveFileIndexList(String& moveDir, IList* pMoveIndexList, FileListP
 		if (collisionCount > 0)
 		{
 			MessageBox messageBox;
+
+			if ( isCopyOp)
+			{
+				messageBox.Construct(L"", L"Unable to copy some files. Same files exists",
+								MSGBOX_STYLE_NONE, 3000);
+			}
+			else
+			{
 			messageBox.Construct(L"", L"Unable to move some files. Same files exists",
 					MSGBOX_STYLE_NONE, 3000);
+			}
 			int modalResult;
 			messageBox.ShowAndWait(modalResult);
 		}
diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index fe02b20..c5a39fa 100644
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -726,7 +726,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 					{
 						delete __pFileMove;
 						IList* pItemIndexList = pEditorPanel->GetItemCheckedIndexListN();
-						GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel);
+						GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel , __isCopyOperation);
 						__pFileMove = new (std::nothrow) FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
 						if (__isCopyOperation)
 						{
@@ -771,7 +771,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId)
 					{
 						delete __pFileMove;
 						IList* pItemIndexList = pSelectionPanel->GetItemCheckedIndexListN();
-						GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel);
+						GetMoveFileIndexList(*pDirectory, pItemIndexList, __pPresentationModel , __isCopyOperation);
 						__pFileMove = new (std::nothrow) FileMoveTimer(*pDirectory, pItemIndexList, __pPresentationModel, this);
 						if (__isCopyOperation)
 						{