From: Abhismita Ghosh <g.abhismita@samsung.com>
Date: Fri, 12 Jul 2013 06:53:59 +0000 (+0900)
Subject: Popup OK/Cancel -> Cancel/OK
X-Git-Tag: submit/tizen_2.2/20130714.134410^0
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=0ce8bf659fa993364450d7150ec6e36d11f198c0

Popup OK/Cancel -> Cancel/OK

Change-Id: I4a32d22004214f13119136a86443760a3e5a9410
---

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index 6cded72..3cabb66 100644
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -202,8 +202,7 @@ AlbumListEditorForm::InitializePopup(void)
 		pLabel->SetTextConfig(34,LABEL_TEXT_STYLE_BOLD);
 
 		Button* pDeleteButton = new (std::nothrow) Button();
-		pDeleteButton->Construct(
-				Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+		pDeleteButton->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,	popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
 				ResourceManager::GetString(L"IDS_COM_BODY_DELETE"));
 		pDeleteButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_DELETE_BUTTON_NORMAL);
 		pDeleteButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_DELETE_BUTTON_PRESSED);
@@ -212,10 +211,8 @@ AlbumListEditorForm::InitializePopup(void)
 		pDeleteButton->AddActionEventListener(*this);
 
 		Button* pCancelButton = new (std::nothrow) Button();
-		pCancelButton->Construct(
-				Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,
-						popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
-						ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
+		pCancelButton->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+				ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
 		pCancelButton->SetActionId(IDA_DELETE_POPUP_CANCEL);
 		pCancelButton->AddActionEventListener(*this);
 
diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 94052ac..2c33ea5 100644
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -890,7 +890,7 @@ FileListEditorForm::SetUpPopup(void)
 	__pDeletePopup->AddControl(pLabelText);
 
 	Button* pDeleteButton = new (std::nothrow) Button();
-	pDeleteButton->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+	pDeleteButton->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
 			ResourceManager::GetString(L"IDS_COM_BODY_DELETE"));
 	pDeleteButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_DELETE_BUTTON_NORMAL);
 	pDeleteButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_DELETE_BUTTON_PRESSED);
@@ -900,8 +900,8 @@ FileListEditorForm::SetUpPopup(void)
 	__pDeletePopup->AddControl(pDeleteButton);
 
 	Button* pButtonCancel = new (std::nothrow) Button();
-	pButtonCancel->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON,
-			popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
+	pButtonCancel->Construct(Rectangle(10, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM -10, H_DELETE_BUTTON),
+			ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
 	pButtonCancel->SetActionId(IDA_DELETE_POPUP_CANCEL);
 	pButtonCancel->AddActionEventListener(*this);
 	__pDeletePopup->AddControl(pButtonCancel);