NABI_SE issues resolved

Change-Id: I4bf8c48f183f477eb800aacd268c883c09cd80dd

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index 4f6d0b3..4cfab57 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -891,5 +891,16 @@ CategorySearch::OnDeviceChange(ComponentType deviceType, const Tizen::Base::Stri
 void
 CategorySearch::OnAppControlCompleted(void)
 {
+       if (_pFilenames != null)
+       {
+               if (_pFilenames->GetCount() == 0)
+               {
+                       SetFooterItemsVisibility(DISABLE_FOOTER_ITEM);
+               }
+               else
+               {
+                       SetFooterItemsVisibility(ENABLE_FOOTER_ITEM);
+               }
+       }
        SubBaseFolderEntryForm::OnAppControlCompleted();
 }

diff --git a/src/MfCreateFolderForm.cpp b/src/MfCreateFolderForm.cpp
index 5b2b313..3035d4d 100644 (file)
--- a/src/MfCreateFolderForm.cpp
+++ b/src/MfCreateFolderForm.cpp
@@ -349,25 +349,9 @@ CreateFolderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
 
                                        messageBox.ShowAndWait(modalResult);
 
-                                       switch (modalResult)
-                                       {
-                                       case MSGBOX_RESULT_YES:
-                                       {
-                                               if (__pEditFieldFolderName != null)
-                                               {
-                                                       __pEditFieldFolderName->ShowKeypad();
-                                               }
-                                       }
-                                       break;
-
-                                       case MSGBOX_RESULT_NO:
+                                       if (__pEditFieldFolderName != null)
                                        {
-                                               TransitionScene();
-                                       }
-                                       break;
-
-                                       default:
-                                               break;
+                                               __pEditFieldFolderName->ShowKeypad();
                                        }
                                }
                        }
@@ -465,26 +449,10 @@ CreateFolderForm::OnActionPerformed(const Tizen::Ui::Control& source, int action
 
                                        messageBox.ShowAndWait(modalResult);
 
-                                       switch (modalResult)
-                                       {
-                                       case MSGBOX_RESULT_YES:
+                                       if (__pEditFieldFolderName != null)
                                        {
                                                __pEditFieldFolderName->ShowKeypad();
                                        }
-                                       break;
-
-                                       case MSGBOX_RESULT_NO:
-                                       {
-                                               TransitionScene();
-                                       }
-                                       break;
-
-                                       default:
-                                       {
-                                               //Empty Implementation.
-                                       }
-                                       break;
-                                       }
                                }
                        }
                }

diff --git a/src/MfFileManageWorkerThread.cpp b/src/MfFileManageWorkerThread.cpp
index 6b7ea68..bd9b181 100644 (file)
--- a/src/MfFileManageWorkerThread.cpp
+++ b/src/MfFileManageWorkerThread.cpp
@@ -1968,32 +1968,31 @@ FileManageWorkerThread::Copy(Tizen::Base::String& sourcePath, Tizen::Base::Strin
                if (__threadRunningState != THREAD_RUNNING_STATE_ALIVE)
                {
                        File::Remove(destPath);
-                       return E_SUCCESS;
+                       return E_THREAD_CANCEL;
                }
                if (!IsFailed(GetLastResult()))
                {
-               r = destFile.Write(byteToWrite, count);
-                TryCatch(r == E_SUCCESS,,"copy file failed");
-                       //if(!__isRenamingActive)
-                       //{
-                               percentage = percentage + count;
-                               percentageComplete = (percentage * 100) / (toatalsize);
-
-                               AppLogDebug("precentage result %lld %lld",percentageComplete,percentage);
+                       r = destFile.Write(byteToWrite, count);
+                       TryCatch(r == E_SUCCESS,,"copy file failed");
+
+                       percentage = percentage + count;
+                       percentageComplete = (percentage * 100) / (toatalsize);
+
+                       AppLogDebug("precentage result %lld %lld",percentageComplete,percentage);
+
+                       __fileManagingingResult = FILE_MANAGING_RESULT_CURRENT_STATUS;
+                       pArg = new (std::nothrow) ArrayList();
+                       pArg->Construct();
+                       pFileManagingResult = new (std::nothrow) Integer(__fileManagingingResult);
+                       pFileManagedCounter = new (std::nothrow) Integer(__fileManagedCounter);
+                       pTotalFileCount = new (std::nothrow) Integer(__pListOfFiles->GetCount());
+                       pPercentageCompletion = new (std::nothrow)Integer(percentageComplete);
+                       pArg->Add(pFileManagingResult);
+                       pArg->Add(pFileManagedCounter);
+                       pArg->Add(pTotalFileCount);
+                       pArg->Add(pPercentageCompletion);
+                       Application::GetInstance()->SendUserEvent(ID_COPY_COMPLETE, pArg);
 
-                               __fileManagingingResult = FILE_MANAGING_RESULT_CURRENT_STATUS;
-                               pArg = new (std::nothrow) ArrayList();
-                               pArg->Construct();
-                               pFileManagingResult = new (std::nothrow) Integer(__fileManagingingResult);
-                               pFileManagedCounter = new (std::nothrow) Integer(__fileManagedCounter);
-                               pTotalFileCount = new (std::nothrow) Integer(__pListOfFiles->GetCount());
-                               pPercentageCompletion = new (std::nothrow)Integer(percentageComplete);
-                               pArg->Add(pFileManagingResult);
-                               pArg->Add(pFileManagedCounter);
-                               pArg->Add(pTotalFileCount);
-                               pArg->Add(pPercentageCompletion);
-                               Application::GetInstance()->SendUserEvent(ID_COPY_COMPLETE, pArg);
-                       //}
                        count = sourceFIle.Read(byteToWrite, BUFFER_SIZE_MAX);
                }
        }

diff --git a/src/MfSearchForm.cpp b/src/MfSearchForm.cpp
index 106badc..261fa35 100644 (file)
--- a/src/MfSearchForm.cpp
+++ b/src/MfSearchForm.cpp
@@ -1691,10 +1691,13 @@ SearchForm::StartSearch(void)
        __pSearchBar->SetEnabled(false);
        __pSearchBar->SetMode(__searchBarMode);
 
-       //Show Popup
-       __pFolderLabel->SetText(folderToSearch);
-       __pSearchPopup->SetShowState(true);
-       __pSearchPopup->Show();
+       //Show Popup if Application is in FOREGROUND
+       if ( Application::GetInstance()->GetAppUiState() == APP_UI_STATE_FOREGROUND)
+       {
+               __pFolderLabel->SetText(folderToSearch);
+               __pSearchPopup->SetShowState(true);
+               __pSearchPopup->Show();
+       }
 
        ///Set Application Notification Listener to current form
        ((MyFilesApp*) Application::GetInstance())->SetNotifyListener(this);

diff --git a/src/MfSubBaseFolderEntryForm.cpp b/src/MfSubBaseFolderEntryForm.cpp
index b3b00a3..48bd6ea 100644 (file)
--- a/src/MfSubBaseFolderEntryForm.cpp
+++ b/src/MfSubBaseFolderEntryForm.cpp
@@ -2348,7 +2348,14 @@ SubBaseFolderEntryForm::OnAppControlCompleted(void)
 //     _pFolderEntryPM->GetFolderEntryCount(FolderNavigationPresentationModel::GetCurrentPath(),folderCount, fileCount);
 
 //     SetFooterVisibility(ENABLE_FOOTER_ITEM);
-       SetFooterVisibility();
+
+       if (_pFolderEntryPM!=null)
+       {
+               if (_pFolderEntryPM->GetSourceForm() != CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+               {
+                       SetFooterVisibility();
+               }
+       }
 
        if( !_bBackFromAppControl )
                return;

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index cb9fc5f..a4820d1 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -963,6 +963,14 @@ SubFolderFileListForm::ShowParentDirectoryView(void)
 
                }
 
+               if (_pFilenames->GetCount() == 0)
+               {
+                       _bIsDirectoryEmpty = true;
+               }
+               else
+               {
+                       _bIsDirectoryEmpty = false;
+               }
                SetFooterVisibility();
 
                //Get the files in the parent path of the current view

diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index 0da4f12..2f48325 100644 (file)
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -1125,7 +1125,7 @@ SubFolderSelection::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::SceneId
        __pFileEventManager = new (std::nothrow)FileEventManager();
        __pFileEventManager->Construct(*this);
 
-       r = __pFileEventManager->AddPath(_rootMediaPath, FILE_EVENT_TYPE_ATTRIBUTE | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_CREATE );
+       r = __pFileEventManager->AddPath(_rootMediaPath, FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_CREATE );
        AppLogDebug("Result is %s",GetErrorMessage(r));
 
 #if 0
@@ -1290,7 +1290,7 @@ SubFolderSelection::OnFileEventOccured(const unsigned long events,const Tizen::B
 {
        AppLogDebug("SubFolderSelection::OnFileEventOccured:%S", path.GetPointer());
 
-       if ((events & FILE_EVENT_TYPE_ATTRIBUTE) || (events & FILE_EVENT_TYPE_DELETE) || (events & FILE_EVENT_TYPE_MOVED_TO ) || (events & FILE_EVENT_TYPE_CREATE))
+       if ((events & FILE_EVENT_TYPE_MOVED_FROM) || (events & FILE_EVENT_TYPE_DELETE) || (events & FILE_EVENT_TYPE_MOVED_TO ) || (events & FILE_EVENT_TYPE_CREATE))
        {
                if (_pFolderEntryPM!=null)
                {
@@ -1306,7 +1306,6 @@ SubFolderSelection::OnFileEventOccured(const unsigned long events,const Tizen::B
 
                if (_pFolderEntryPM!=null)
                {
-                       AppLogDebug("inside file event");
                        _pFolderEntryPM->InitThumbnailManager();
                }
        }