NABI_SE issue fixes and Internal GUI issues fixed

Change-Id: I0a8c2794b7d1b14a70d1b2b17c60ca8ae0cc75a1

diff --git a/inc/MfSearchForm.h b/inc/MfSearchForm.h
index 01464ab..1e63b88 100644 (file)
--- a/inc/MfSearchForm.h
+++ b/inc/MfSearchForm.h
@@ -190,10 +190,10 @@ private:
        Tizen::Ui::Controls::Button* __pFileProgressingCancelButton;\r
 \r
 \r
-       Tizen::Ui::Controls::Label* __pDividerLabel;\r
+       Tizen::Ui::Controls::Label* __pFolderLabel;\r
        Tizen::Ui::Controls::Label* __pFileProgressingHeaderLabel;\r
        Tizen::Ui::Controls::Label* __pFileProgressingLabel;\r
-       Tizen::Ui::Controls::Label* __pPopUpSearching;\r
+       Tizen::Ui::Controls::Label* __pLabelSearching;\r
 \r
        Tizen::Ui::Controls::ListContextItem* __pItemContext;\r
        Tizen::Ui::Controls::ListView* __pListView;\r

diff --git a/src/MfBaseItemProvider.cpp b/src/MfBaseItemProvider.cpp
index db2f251..0aa2135 100644 (file)
--- a/src/MfBaseItemProvider.cpp
+++ b/src/MfBaseItemProvider.cpp
@@ -222,7 +222,7 @@ BaseItemProvider::GetItemCount(void)
                }
        }
 
-       if (__sourceInfo == CREATE_ITEM_SOURCE_SHARE_FORM)
+       if (__pFolderEntryPM->GetSourceForm() == CREATE_ITEM_SOURCE_SHARE_FORM)
        {
                __pFolderEntryPM->GetFolderEntryCount(FolderNavigationPresentationModel::GetCurrentPath(), dirCount, fileCount);
                itemCount = fileCount;

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index 63d5684..aeb401b 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -652,11 +652,13 @@ CategorySearch::SetFooterItemsVisibility(int mode)
        if (mode == 0)\r
        {\r
                _pFooter->SetItemEnabled(0, false);\r
+               _pFooter->SetItemEnabled(1, false);\r
                _pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, false);\r
        }\r
        else\r
        {\r
                _pFooter->SetItemEnabled(0, true);\r
+               _pFooter->SetItemEnabled(1, true);\r
                _pFooter->SetButtonEnabled(BUTTON_POSITION_LEFT, true);\r
        }\r
        _pFooter->Invalidate(true);\r

diff --git a/src/MfCustomAppControl.cpp b/src/MfCustomAppControl.cpp
index e295135..eaefef4 100644 (file)
--- a/src/MfCustomAppControl.cpp
+++ b/src/MfCustomAppControl.cpp
@@ -279,9 +279,6 @@ CustomAppControl::LaunchAppControl(String& mediaFullPath)
        }
        else
        {
-               AppLogDebug("pac not null");
-               AppLogDebug("uri is %S",uriType->GetPointer());
-               AppLogDebug("mimeType is %S",mimeType.GetPointer());
                r = pAc->Start(uriType,pMimeInfo,null,__pAppControlEventListener);
                AppLogDebug("start result is %s",GetErrorMessage(r));
        }

diff --git a/src/MfFileManageForm.cpp b/src/MfFileManageForm.cpp
index 099e6c2..9944f89 100644 (file)
--- a/src/MfFileManageForm.cpp
+++ b/src/MfFileManageForm.cpp
@@ -247,7 +247,10 @@ FileManageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
                                pAppResource->GetString(L"IDS_MF_SK3_EDIT", headerText);
                        }
                        _pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_FILE_MANAGE_FORM);
-                       _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_FILE_MANAGE_FORM);
+                       if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
+                       {
+                               _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_FILE_MANAGE_FORM);
+                       }
                        _pThumbnailItemProvider->SetCreateItemSource(thumbnailItemSource);
                }
                else
@@ -259,7 +262,10 @@ FileManageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
                                pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", headerText);
                        }
                        _pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_SHARE_FORM);
-                       _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SHARE_FORM);
+                       if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
+                       {
+                               _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SHARE_FORM);
+                       }
                        _pThumbnailItemProvider->SetCreateItemSource(thumbnailItemSource);
 
                }

diff --git a/src/MfFolderEntryPresentationModel.cpp b/src/MfFolderEntryPresentationModel.cpp
index 212b075..46336d1 100644 (file)
--- a/src/MfFolderEntryPresentationModel.cpp
+++ b/src/MfFolderEntryPresentationModel.cpp
@@ -1042,15 +1042,11 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma
        DirectoryEntry* pDirEntry = null;
        String* cachePath = null;
        String cacheImagePath;
-       AppLogDebug("Enter");
-       Bitmap* pFetchedCacheImage = null;
        ContentType contentType = CONTENT_TYPE_UNKNOWN;
 
        HashMap* pCacheList = null;
 
        __ThumbnailRequestInProgress = false;
-
-       AppLogDebug("Current ReqId : %d %d", __requestId, index);
        if ( __forceStop )
        {
                StopThumbnailManager();
@@ -1059,6 +1055,7 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma
 
        TryCatch(__pFolderEntries != null && __pFolderEntries->GetCount() != 0, , "Invalid Arguments");
        TryCatch(__requestId != INVALID_INDEX, , "Item index reached to maximum value!");
+
        pDirEntry = static_cast< DirectoryEntry* >(__pFolderEntries->GetAt(index));
        TryCatch(pDirEntry != null, , "Invalid directory entry pointer!");
 
@@ -1070,19 +1067,6 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma
                        pDirEntry->SetLoadBitmap(false);
                        pDirEntry->SetBitmap(pThumb);
                }
-               else
-               {
-                       //This is just a temporary fix, actualy fix should be in Source form.
-                       AppLogDebug("Request Id mismatch");
-                       /*pDirEntry = static_cast< DirectoryEntry* >(__pFolderEntries->GetAt(__requestId));
-                       TryCatch(pDirEntry != null, , "Invalid directory entry pointer!");
-                       if ( pDirEntry )
-                       {
-                               pDirEntry->SetDummy(false);
-                               pDirEntry->SetLoadBitmap(false);
-                               pDirEntry->SetBitmap(pThumb);
-                       }*/
-               }
 
                pCacheList = CacheManager::GetInstance()->GetCacheHashMap();
                TryCatch(pCacheList != null, , "Cache Hashmap  is null");
@@ -1094,25 +1078,14 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma
 
                if (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO)
                {
-                       if ((pCacheList->GetValue(cacheImagePath)) != null)
-                       {
-                               pFetchedCacheImage = static_cast< Bitmap* >(pCacheList->GetValue(cacheImagePath));
-                       }
-
-                       if (pFetchedCacheImage == null)
+                       if ((pCacheList->GetValue(cacheImagePath)) == null)
                        {
+                               cachePath = new (std::nothrow) String(pDirEntry->GetFullFilePath());
                                if (cachePath != null && pThumb != null)
-                               {
-                                       cachePath = new (std::nothrow) String(pDirEntry->GetFullFilePath());
                                        __pCacheManager->AddCacheEntry(*cachePath,pThumb);
-                               }
                        }
                }
        }
-       else
-       {
-               AppLogDebug("Invalid Index of No Thumbnail");
-       }
 
        FolderEntryCount = __pFolderEntries->GetCount();
 

diff --git a/src/MfSearchForm.cpp b/src/MfSearchForm.cpp
index 3779f97..accbda9 100644 (file)
--- a/src/MfSearchForm.cpp
+++ b/src/MfSearchForm.cpp
@@ -43,9 +43,9 @@ SearchForm::SearchForm(void)
        __pListView = null;
        __pSearchBar = null;
        __pSearchPopup = null;
-       __pPopUpSearching = null;
+       __pLabelSearching = null;
        __pCancelSearch = null;
-       __pDividerLabel = null;
+       __pFolderLabel = null;
 
        __pThumbnailManager = null;
        __pSearchModel = null;
@@ -201,11 +201,11 @@ SearchForm::OnInitializing(void)
        r = __pSearchPopup->Construct(L"IDL_SEARCH_POPUP");
        TryCatch(r == E_SUCCESS, , "failed to construct __pPopUpPanel");
 
-       __pPopUpSearching = static_cast<Label*> (__pSearchPopup->GetControl(L"IDC_LABEL_SEARCHING"));
-       TryCatch(__pPopUpSearching != null, , "Failed to get __pPopUpSearching");
+       __pLabelSearching = static_cast<Label*> (__pSearchPopup->GetControl(L"IDC_LABEL_SEARCHING"));
+       TryCatch(__pLabelSearching != null, , "Failed to get __pLabelSearching");
 
-       __pDividerLabel = static_cast<Label*> (__pSearchPopup->GetControl(L"IDC_LABEL_FOLDER"));
-       TryCatch(__pDividerLabel != null, r = GetLastResult(), "Failed to get __pPopUpSearching");
+       __pFolderLabel = static_cast<Label*> (__pSearchPopup->GetControl(L"IDC_LABEL_FOLDER"));
+       TryCatch(__pFolderLabel != null, r = GetLastResult(), "Failed to get __pFolderLabel");
 
        __pCancelSearch = static_cast<Button*> (__pSearchPopup->GetControl(L"IDC_BUTTON_CANCEL"));
        TryCatch(__pCancelSearch != null, , "Failed to get __pCancelSearch");
@@ -374,7 +374,7 @@ SearchForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                if (__currentSearchDirectoryPath.GetLength() > 0 && __currentSearchDirectoryPath != topLevelPath)
                {
                        AppLogDebug("SearchForm::OnSceneActivatedN:%S:%S", __currentSearchDirectoryPath.GetPointer(), topLevelPath.GetPointer());
-                       __pDividerLabel->SetText(__currentSearchDirectoryPath);
+                       __pFolderLabel->SetText(__currentSearchDirectoryPath);
                }
 
                pArgs->RemoveAll(false);
@@ -502,7 +502,7 @@ SearchForm::OnListViewItemStateChanged(ListView& listView, int index, int elemen
                }
 
                __pListView->UpdateList();
-               __pDividerLabel->SetText(L"");
+               __pFolderLabel->SetText(L"");
                __pSearchPopup->SetShowState(true);
                __pSearchPopup->Show();
                __pSearchBar->SetEnabled(false);
@@ -1125,8 +1125,8 @@ SearchForm::OnNotificationReceived(Tizen::Base::Collection::ArrayList* pArgs)
                                pFolderSearchResult->Replace(defSdCardPath, displaySdCard);
                        }
 
-                       __pDividerLabel->SetText(*pFolderSearchResult);
-                       __pDividerLabel->Invalidate(true);
+                       __pFolderLabel->SetText(*pFolderSearchResult);
+                       __pFolderLabel->Invalidate(true);
                }
        }
        break;
@@ -1758,7 +1758,7 @@ SearchForm::StartSearch(void)
        __pSearchBar->SetEnabled(false);
 
        //Show Popup
-       __pDividerLabel->SetText(folderToSearch);
+       __pFolderLabel->SetText(folderToSearch);
        __pSearchPopup->SetShowState(true);
        __pSearchPopup->Show();
 

diff --git a/src/MfSearchPresentationModel.cpp b/src/MfSearchPresentationModel.cpp
index 6e191c9..a7028a4 100644 (file)
--- a/src/MfSearchPresentationModel.cpp
+++ b/src/MfSearchPresentationModel.cpp
@@ -168,7 +168,7 @@ SearchPresentationModel::Search(void)
                        __pFolderSearchStartedMessage->Add(new (std::nothrow) String(*pCurrentDirectoryPath));
                }
                Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);
-
+               Thread::Sleep(100);
                __pFolderEntryPM->SetFolderEntryPath(*pCurrentDirectoryPath);
                pDirectoryEntryList = __pFolderEntryPM->GetFolderEntryList();
 

diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index 18ba8c4..3c462a4 100644 (file)
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -384,9 +384,11 @@ SubBaseFileManageForm::SubBaseOnActionPerformed(const Tizen::Ui::Control& source
 
                        _pStrItemSelectedCount->Clear();
                        _pStrItemSelectedCount->Append(selected);
+                       _pStrItemSelectedCount->Append(L"\x200E");
                        _pStrItemSelectedCount->Append(L" (");
                        _pStrItemSelectedCount->Append(selectedItemsCount);
                        _pStrItemSelectedCount->Append(L")");
+                       _pStrItemSelectedCount->Append(L"\x200E");
 
                        if (_pLabelNumberOfItems != null)
                        {
@@ -647,12 +649,12 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
                {
                        _pLabelNumberOfItems->SetShowState(true);
                        _pStrItemSelectedCount->Clear();
-                       _pStrItemSelectedCount->Append(L"\x200E");
                        _pStrItemSelectedCount->Append(selected);
                        _pStrItemSelectedCount->Append(L"\x200E");
                        _pStrItemSelectedCount->Append(L" (");
                        _pStrItemSelectedCount->Append(selectedItemsCount);
                        _pStrItemSelectedCount->Append(L")");
+                       _pStrItemSelectedCount->Append(L"\x200E");
 
                        _pLabelNumberOfItems->SetText(*_pStrItemSelectedCount);
 
@@ -1175,9 +1177,11 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 
                        _pStrItemSelectedCount->Clear();
                        _pStrItemSelectedCount->Append(selected);
+                       _pStrItemSelectedCount->Append(L"\x200E");
                        _pStrItemSelectedCount->Append(L" (");
                        _pStrItemSelectedCount->Append(selectedItemsCount);
                        _pStrItemSelectedCount->Append(L")");
+                       _pStrItemSelectedCount->Append(L"\x200E");
 
                        AppLogDebug("Text on Label = %ls", _pStrItemSelectedCount->GetPointer());
 

diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index 153f395..d84d6e7 100644 (file)
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -537,12 +537,12 @@ SubFolderSelection::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& li
                        if (selectedItemsCount > 0)\r
                        {\r
                                _itemSelectedCount.Clear();\r
-                               _itemSelectedCount.Append(L"\x200E");\r
                                _itemSelectedCount.Append(selectedCount);\r
                                _itemSelectedCount.Append(L"\x200E");\r
                                _itemSelectedCount.Append(L"(");\r
                                _itemSelectedCount.Append(selectedItemsCount);\r
                                _itemSelectedCount.Append(L")");\r
+                               _itemSelectedCount.Append(L"\x200E");\r
                                _pLabelNumberOfItems->SetText(_itemSelectedCount);\r
                        }\r
                        else\r

diff --git a/src/MfThumbnailItemProviderAndListener.cpp b/src/MfThumbnailItemProviderAndListener.cpp
index f048ecb..aea3ab3 100644 (file)
--- a/src/MfThumbnailItemProviderAndListener.cpp
+++ b/src/MfThumbnailItemProviderAndListener.cpp
@@ -443,7 +443,7 @@ ThumbnailItemProviderAndListener::GetItemCount(void)
                }
        }
 
-       if (__sourceForm == THUMBNAIL_PROVIDER_SOURCEID_SHARE_FORM)
+       if (__pFolderEntryPM->GetSourceForm() == CREATE_ITEM_SOURCE_SHARE_FORM)
        {
                __pFolderEntryPM->GetFolderEntryCount(FolderNavigationPresentationModel::GetCurrentPath(), dirCount, fileCount);
                __listItemCount = fileCount;