NABI_Se issues fixed

Change-Id: I070597cd72852f8ead9a8c70541f6005a6f670e3

diff --git a/src/MfContentListItem.cpp b/src/MfContentListItem.cpp
index 2462da2..22fa0f5 100644 (file)
--- a/src/MfContentListItem.cpp
+++ b/src/MfContentListItem.cpp
@@ -790,8 +790,8 @@ ContentListItem::CreateFormatRectangleForAppControl(int itemHeight, int textHeig
        int w_AudioPlay = W_RENAME_ICON;\r
        int h_AudioPlay = W_RENAME_ICON;\r
 \r
-       int w_Title = width - (W_LISTVIEW_ITEM_BITMAP + (4 * X_LISTVIEW) + (2 * w_AudioPlay));\r
-       int x_Play = width - (w_AudioPlay + w_AudioPlay + (2 * X_LISTVIEW));\r
+       int w_Title = width - (W_LISTVIEW_ITEM_BITMAP + (4 * thumbnailX) + (2 * w_AudioPlay));\r
+       int x_Play = width - (w_AudioPlay + w_AudioPlay + (2 * thumbnailX));\r
        AppControlView currentViewStyle;\r
 \r
        __thumbnailRect.SetBounds(thumbnailX, thumbnailY, thumbnailWidth, thumbnailHeight); //right side width:20\r
@@ -804,19 +804,19 @@ ContentListItem::CreateFormatRectangleForAppControl(int itemHeight, int textHeig
 \r
        if (currentViewStyle == APPCONTROL_VIEW_IMPORT)\r
        {\r
-               w_Title = width - (W_LISTVIEW_ITEM_BITMAP + 3 * X_LISTVIEW) - w_AudioPlay;\r
+               w_Title = width - (W_LISTVIEW_ITEM_BITMAP + 3 * thumbnailX) - w_AudioPlay;\r
        }\r
        else if (currentViewStyle == APPCONTROL_VIEW_EXPORT)\r
        {\r
-               w_Title = width - (W_LISTVIEW_ITEM_BITMAP + 3 * X_LISTVIEW);\r
+               w_Title = width - (W_LISTVIEW_ITEM_BITMAP + 3 * thumbnailX);\r
        }\r
 \r
-       __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - (textHeight + 10)) / 2, w_Title + w_AudioPlay, textHeight);\r
+       __titleRect.SetBounds(thumbnailX + thumbnailWidth + thumbnailX, (itemHeight - (textHeight + 10)) / 2, w_Title + w_AudioPlay, textHeight);\r
 \r
        if (__pPlayBitmap != null)\r
        {\r
                __editPlayRect.SetBounds(x_Play, (itemHeight - w_AudioPlay) / 2, w_AudioPlay, h_AudioPlay);\r
-               __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - (textHeight + 10)) / 2, w_Title, textHeight);\r
+               __titleRect.SetBounds(thumbnailX + thumbnailWidth + thumbnailX, (itemHeight - (textHeight + 10)) / 2, w_Title, textHeight);\r
 \r
        }\r
        else if (__pPauseBitmap != null)\r

diff --git a/src/MfFileManageForm.cpp b/src/MfFileManageForm.cpp
index 64785cd..e0130b9 100644 (file)
--- a/src/MfFileManageForm.cpp
+++ b/src/MfFileManageForm.cpp
@@ -725,7 +725,13 @@ FileManageForm::OnSceneTransitionCompleted(const Tizen::Ui::Scenes::SceneId &pre
                        if (__bCheckNullArgs)
                        {
                                if (_pFolderEntryPM != null)
+                               {
                                        _pFolderEntryPM->RefreshFolderEntries();
+                                       if (_pFolderEntryPM->GetSourceForm() == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+                                       {
+                                               _pFolderEntryPM->SortFolderEntries();
+                                       }
+                               }
 
                                if (_pEditListView != null && _pEditListView->IsVisible())
                                {

diff --git a/src/MfFolderEntryPresentationModel.cpp b/src/MfFolderEntryPresentationModel.cpp
index 8b7a352..67423cc 100644 (file)
--- a/src/MfFolderEntryPresentationModel.cpp
+++ b/src/MfFolderEntryPresentationModel.cpp
@@ -1325,15 +1325,11 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
        TryCatch(r == E_SUCCESS, ,"Construction of pDeviceList failed");
 
        GetDeviceList(pDeviceList);
-#if 0
        deviceListCount = pDeviceList->GetCount();
 
        __deviceListCount = deviceListCount;
 
        currentDirectoryPath =  new (std::nothrow) String(*static_cast<String*>(pDeviceList->GetAt(0)));
-#else
-       currentDirectoryPath =  new (std::nothrow) String(L"/opt/usr/media");
-#endif
        TryCatch(__pFolderEntryStack != null, , "Stack is null");
        r = __pFolderEntryStack->Push(currentDirectoryPath);
        TryCatch(r == E_SUCCESS, ,"push failed");
@@ -1365,7 +1361,7 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
                                pCurrentFolderEntry->SetCheckDirectory(false);
                                pCurrentFolderEntry->SetCreationTime(currentDirEntry.GetDateTime());
 
-                               if(currentDirEntry.IsDirectory() && directoryName != "." && directoryName != "..")
+                               if(currentDirEntry.IsDirectory() && directoryName != "." && directoryName != ".." && directoryName.IsEmpty() == false)
                                {
                                        if (__sourceForm == CREATE_ITEM_SOURCE_SEARCH_FORM)
                                        {

diff --git a/src/MfSearchForm.cpp b/src/MfSearchForm.cpp
index a3f8eeb..84775f6 100644 (file)
--- a/src/MfSearchForm.cpp
+++ b/src/MfSearchForm.cpp
@@ -1794,55 +1794,10 @@ void
 SearchForm::OnFileEventOccured(const unsigned long events,const Tizen::Base::String &  path, const unsigned int        eventId)
 {
        AppLogDebug("SearchForm::OnFileEventOccured");
-       bool cacheKeyStatus = false;
-       HashMap* pCacheList = null;
-       DirectoryEntry* pCurrentEntry = null;
-
-       String cachePath;
-
-       ArrayList*              pCurrentList = null;
-
        if ((events & FILE_EVENT_TYPE_CREATE) || (events & FILE_EVENT_TYPE_DELETE) || (events & FILE_EVENT_TYPE_MOVED_FROM) || (events & FILE_EVENT_TYPE_MOVED_TO ))
        {
                __backFromAppControl = true;
 
-               /*//changes added for Nabi issue # N_SE-38472
-               if ( (events & FILE_EVENT_TYPE_DELETE) || (events & FILE_EVENT_TYPE_MOVED_FROM))
-               {
-                       pCacheList = CacheManager::GetInstance()->GetCacheHashMap();
-                       if (pCacheList != null)
-                       {
-                               if (__isSearchCompleted == false)
-                               {
-                                       if (__isSearchStarted == true)
-                                               pCurrentList = __pSearchedContentList;
-                                       else
-                                               pCurrentList = __pContentListFromLastView;
-                               }
-                               else
-                                       pCurrentList = __pSearchedContentList;
-
-                               if( pCurrentList )
-                               {
-                                       pCurrentEntry = static_cast<DirectoryEntry*>(pCurrentList->GetAt(__selectedItemIndex));
-                                       if (pCurrentEntry != null)
-                                       {
-                                               cachePath = pCurrentEntry->GetFullFilePath();
-                                       }
-                                       cacheKeyStatus = pCacheList->ContainsKey(cachePath);
-                                       if (cacheKeyStatus)
-                                       {
-                                               CacheManager::GetInstance()->RemoveCacheEntry(cachePath);
-                                       }
-                               }
-                       }
-               }
-               if (((MyFilesApp*) Application::GetInstance())->IsAppControlLaunched() == false)
-               {
-                       if (__searchText.IsEmpty() == false)
-                               StartSearch();
-               }*/
-
                SceneManager::GetInstance()->GoBackward(BackwardSceneTransition());
        }
 

diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index 8cbffa4..385a8f7 100644 (file)
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -1649,8 +1649,6 @@ SubBaseFileManageForm::CreateShareContextMenu(void)
        AppResource* pAppResource = null;
        Bitmap* pBitmapEmailContextItem = null;
        Bitmap* pBitmapMessageContextItem = null;
-//     Bitmap* pBitmapBluetoothContextItem = null;
-//     Bitmap* pBitmapWiFiDirectContextItem = null;
 
        _pFooter = GetFooter();
        if (_pFooter != null)
@@ -1669,10 +1667,8 @@ SubBaseFileManageForm::CreateShareContextMenu(void)
                pAppResource->GetString(L"IDS_COM_OPT1_WI_FI_DIRECT", wifiDirect);
                pBitmapEmailContextItem = pAppResource->GetBitmapN(IDB_POPUP_EMAIL_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);
                pBitmapMessageContextItem = pAppResource->GetBitmapN(IDB_POPUP_MESSAGE_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);
-
-               //pBitmapBluetoothContextItem = pAppResource->GetBitmapN(IDB_POPUP_BLUETOOTH_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);
-               //pBitmapWiFiDirectContextItem = pAppResource->GetBitmapN(IDB_POPUP_WIFIDIRECT_ICON, BITMAP_PIXEL_FORMAT_ARGB8888);
        }
+
        AppLogDebug("enter1");
        _pShareContextMenu = new (std::nothrow) ContextMenu();
        _pShareContextMenu->Construct(startPosition, CONTEXT_MENU_STYLE_LIST, CONTEXT_MENU_ANCHOR_DIRECTION_UPWARD);
@@ -1685,7 +1681,7 @@ SubBaseFileManageForm::CreateShareContextMenu(void)
 
        _pShareContextMenu->SetItemTextColor(CONTEXT_MENU_ITEM_STATUS_NORMAL, Color::GetColor(COLOR_ID_BLACK));
        _pShareContextMenu->SetItemTextColor(CONTEXT_MENU_ITEM_STATUS_PRESSED, Color::GetColor(COLOR_ID_WHITE));
-
+       _pShareContextMenu->SetFocusable(true);
        _pShareContextMenu->SetShowState(false);
 
        _pShareContextMenu->AddActionEventListener(*this);

diff --git a/src/MfSubBaseFolderEntryForm.cpp b/src/MfSubBaseFolderEntryForm.cpp
index 117cb6b..f9a14e6 100644 (file)
--- a/src/MfSubBaseFolderEntryForm.cpp
+++ b/src/MfSubBaseFolderEntryForm.cpp
@@ -1683,6 +1683,8 @@ SubBaseFolderEntryForm::SubBaseOnActionPerformed(const Tizen::Ui::Control& sourc
 
        case IDA_ICONLISTVIEW_DELETE:
        {
+               _bIsDeleteFromContextSwipe = true;
+
                if (_pIconListViewContextMenu != null)
                {
                        delete _pIconListViewContextMenu;
@@ -2275,6 +2277,7 @@ SubBaseFolderEntryForm::CreateIconListViewContextMenu(void)
 
        //Set the ContextMenu's ActionEventListener
        _pIconListViewContextMenu->AddActionEventListener(*this);
+       _pIconListViewContextMenu->SetFocusable(true);
        _pIconListViewContextMenu->SetShowState(true);
 
        return r;
@@ -2362,6 +2365,8 @@ SubBaseFolderEntryForm::OnAppControlCompleted(void)
                }
        }
 
+       GetHeader()->Invalidate(true);
+
        if( !_bBackFromAppControl )
                return;
 

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index 23c3e0c..717b405 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -1378,7 +1378,7 @@ SubFolderFileListForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::Scen
                                        _pIconListView->UpdateList();
                                        _pIconListView->ScrollToItem(0);
                                }
-                               _pFolderEntryPM->InitThumbnailManager();
+                               //_pFolderEntryPM->InitThumbnailManager();
                        }
                        else
                        {