N_SE-40892

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

diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp
index 4aa63db..9ee9b4c 100644 (file)
--- a/src/GlAllListSelectionPanel.cpp
+++ b/src/GlAllListSelectionPanel.cpp
@@ -109,7 +109,7 @@ AllListSelectionPanel::OnInitializing(void)
        __pContentIconListView->SetCheckBoxPosition(ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_LEFT);
        __pContentIconListView->AddIconListViewItemEventListener(*this);
        __pContentIconListView->SetTouchAnimationEnabled(false);
-       AddControl(*__pContentIconListView);
+       AddControl(__pContentIconListView);
        __pContentIconListView->SetShowState(true);
 
        __itemCount = 0;
@@ -124,7 +124,6 @@ AllListSelectionPanel::OnTerminating(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
        __pPresentationModel->RemovePresentationModelListener(*this);
-       __pPresentationModel->RemoveContentEventListener(__pFileListEditorForm);
        if (__pSeletedIndexList != null)
        {
                delete __pSeletedIndexList;
@@ -472,7 +471,8 @@ void AllListSelectionPanel::OnFileOpComplete(enum FileActionMode actionId, enum
 
        if (GetItemCount() > 0)
        {
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST));
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE,
+                               SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        }
        else
        {
@@ -517,7 +517,7 @@ AllListSelectionPanel::OnRequestMessage(void)
 
        r = __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, null,
                        null, pDataList, null);
-       if(r == E_MAX_EXCEEDED)
+       if (r == E_MAX_EXCEEDED)
        {
                MessageBox messageBox;
                messageBox.Construct(L"", ResourceManager::GetString(L"IDS_RCS_BODY_MAXIMUM_NUMBER_OF_FILES_EXCEEDED"),
@@ -568,7 +568,7 @@ AllListSelectionPanel::OnRequestEmail(void)
        r = __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE,
                        new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
 
-       if(r == E_MAX_EXCEEDED)
+       if (r == E_MAX_EXCEEDED)
        {
                MessageBox messageBox;
                messageBox.Construct(L"", ResourceManager::GetString(L"IDS_RCS_BODY_MAXIMUM_NUMBER_OF_FILES_EXCEEDED"),
@@ -618,7 +618,7 @@ AllListSelectionPanel::OnRequestSlideShow(void)
        r = __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
                        new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
 
-       if(r == E_MAX_EXCEEDED)
+       if (r == E_MAX_EXCEEDED)
        {
                MessageBox messageBox;
                messageBox.Construct(L"", ResourceManager::GetString(L"IDS_RCS_BODY_MAXIMUM_NUMBER_OF_FILES_EXCEEDED"),
@@ -653,10 +653,7 @@ AllListSelectionPanel::ResetSelection(void)
        String bodyText = ResourceManager::GetString(L"IDS_COM_BODY_SELECTED");
        strTmp.Format(LENGTH_COUNT_LABEL, L"%ls (%d)", bodyText.GetPointer(), __itemCount);
        __pFileListEditorForm->SetTitleText(strTmp);
-       if (__pContentIconListView != null)
-       {
-               __pContentIconListView->UpdateList();
-       }
+
        SetButtonState();
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -768,3 +765,12 @@ AllListSelectionPanel::OnRotateRequested(RotateMode rotateMode)
        return E_SUCCESS;
 }
 
+void AllListSelectionPanel::CancelUpdateProgress(void)
+{
+       if( __pFileUpdateTimer!= null && __pFileUpdateTimer->IsStarted())
+       {
+               __pFileUpdateTimer->Cancel();
+               delete __pFileUpdateTimer;
+               __pFileUpdateTimer = null;
+       }
+}