NABI_SE issues resolved

[apps/osp/MyFiles.git] / src / MfSubFolderFileListForm.cpp

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index 5067cc7..f0fb640 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -617,7 +617,7 @@ SubFolderFileListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        }
        return;
 
-       CATCH:
+CATCH:
        if (pArgs != null)
        {
                pArgs->RemoveAll(false);
@@ -965,7 +965,7 @@ SubFolderFileListForm::ShowParentDirectoryView(void)
                //AddPath to add FileEventListener for Parent Directory Path
                if(_pFileEventManager != null)
                {
-                       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE );
+                       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVE_SELF);
                }
 
                FolderNavigationPresentationModel::SetCurrentFilePath(__currentDirectoryPath);
@@ -1065,14 +1065,24 @@ SubFolderFileListForm::OnNotificationReceived(Tizen::Base::Collection::ArrayList
        _pFolderEntryPM->RefreshFolderEntries();                        
        _pFolderEntryPM->InitThumbnailManager();                        //for thumbnail issues/disappering images/defulat images etc...
 
+       if (_pFolderEntryPM->GetFolderEntryList()->GetCount() == 0)
+       {
+               _bIsDirectoryEmpty = true;
+       }
+       else
+       {
+               _bIsDirectoryEmpty = false;
+       }
+
+       _pListView->UpdateList();
        SetFooterVisibility();
+
 CATCH:
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-       ///return this;
 }
 
 void
@@ -1342,7 +1352,7 @@ SubFolderFileListForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::Scen
        _pFileEventManager = new (std::nothrow)FileEventManager();
        _pFileEventManager->Construct(*this);
 
-       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE );
+       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVE_SELF);
 
        _pFolderEntryPM->GetFolderEntryCount(FolderNavigationPresentationModel::GetCurrentPath(),folderCount, fileCount);
 
@@ -1525,6 +1535,11 @@ SubFolderFileListForm::OnFileEventOccured(const unsigned long events,const Tizen
                        _pFolderEntryPM->InitThumbnailManager();
                }
        }
+       else if (events & FILE_EVENT_TYPE_MOVE_SELF)
+       {
+               FolderNavigationPresentationModel::SetCurrentFilePath(FolderNavigationPresentationModel::GetParentPath());
+               SceneManager::GetInstance()->GoBackward(BackwardSceneTransition());
+       }
 
        _indexTracker = -1;
        AppLogDebug("OnFileEventOccured: Exit");