Fixed issues 42819, 42731

[apps/osp/Gallery.git] / src / GlFileListEditorForm.cpp

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 1236ea5..232250c 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -44,7 +44,7 @@ using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Base::Utility;
 
 static const int GAP_W_POPUP_ITEM = 5;
-static const int W_DELETE_POPUP = 600;
+static const int W_DELETE_POPUP = 620;
 static const int H_DELETE_POPUP = 300;
 static const int H_DELETE_LABEL = 180;
 static const int Y_DELETE_BUTTON = 180;
@@ -170,14 +170,13 @@ FileListEditorForm::InitializeFooter(void)
                {
                        pFooter->SetStyle(FOOTER_STYLE_SEGMENTED_TEXT);
                }
-               pFooter->SetBackButton();
+
                SetFormBackEventListener(this);
 
        }
        else
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
-               pFooter->SetMenuButton();
                SetFormMenuEventListener(this);
 
                FooterItem footerShare;
@@ -214,7 +213,6 @@ FileListEditorForm::InitializeFooter(void)
                delete pBitmapDeleteDim;
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r));
 
-               pFooter->SetBackButton();
                SetFormBackEventListener(this);
 
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -875,7 +873,7 @@ FileListEditorForm::SetUpPopup(void)
        __pDeletePopup->AddControl(pLabelText);
 
        Button* pDeleteButton = new (std::nothrow) Button();
-       pDeleteButton->Construct(Rectangle(0, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON),
+       pDeleteButton->Construct(Rectangle(10, 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);
@@ -886,7 +884,7 @@ FileListEditorForm::SetUpPopup(void)
 
        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, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
+                       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);
@@ -1053,13 +1051,11 @@ FileListEditorForm::SetFooterButtonsState(const bool enableState)
        {
                if (enableState == true)
                {
-                       pFooter->SetMenuButtonEnabled(true);
                        pFooter->SetItemEnabled(0, true);
                        pFooter->SetItemEnabled(1, true);
                }
                else
                {
-                       pFooter->SetMenuButtonEnabled(false);
                        pFooter->SetItemEnabled(0, false);
                        pFooter->SetItemEnabled(1, false);
                }