Nabi Issue # N_SE-26005, N_SE-30002

Change-Id: I69f59f34ad794a1da1ce89947ec787bb8a9a9f23

diff --git a/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml b/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
index 58ca005..468b291 100644 (file)
--- a/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
+++ b/res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
@@ -3,10 +3,11 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303041025" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_FOLDER_FILE_SELECTION">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="::IDS_COM_BODY_MY_FILES" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
@@ -15,13 +16,13 @@
         <itemSet/>
     </Footer>
     <ListView id="IDC_SUB_FOLDER_SELECTION_LISTVIEW" parent="IDL_SUB_FOLDER_FILE_SELECTION">
-        <property backgroundColor="#FFFFFF" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" colorOfEmptyListText="#9A9A9A" fastScroll="false" itemDivider="true" itemDividerColor="#BFBFBF" sweepEnabled="false" textOfEmptyList="::IDS_COM_BODY_NO_FILES"/>
-        <layout height="960" mode="Portrait" width="720" x="0" y="48"/>
-        <layout height="124" mode="Landscape" width="730" x="368" y="32"/>
+        <property backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" colorOfEmptyListText="#9A9A9A" fastScroll="false" itemDivider="true" itemDividerColor="#BFBFBF" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList="::IDS_COM_BODY_NO_FILES"/>
+        <layout height="960.0" mode="Portrait" width="720.0" x="0.0" y="48.0"/>
+        <layout height="124.0" mode="Landscape" width="730.0" x="368.0" y="32.0"/>
     </ListView>
     <Label id="IDC_SUB_FOLDER_SELECTION_LABEL_DISPLAY_PATH" parent="IDL_SUB_FOLDER_FILE_SELECTION">
-        <property backgroundBitmapPath="" backgroundColor="#DFE7EB" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="" textColor="#A4A4A4" textSize="26" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="48" mode="Portrait" width="720" x="0" y="0"/>
-        <layout height="52" mode="Landscape" width="401" x="878" y="32"/>
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#FFFFFF" textSize="26.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout height="48.0" mode="Portrait" width="720.0" x="0.0" y="0.0"/>
+        <layout height="52.0" mode="Landscape" width="401.0" x="878.0" y="32.0"/>
     </Label>
 </Scene>

diff --git a/src/MfContentListItem.cpp b/src/MfContentListItem.cpp
index 4389c3e..23b04a3 100644 (file)
--- a/src/MfContentListItem.cpp
+++ b/src/MfContentListItem.cpp
@@ -312,7 +312,7 @@ ContentListItem::CreateFormatRectangleForFileManageForm(int itemHeight, int text
        int w_Rename = W_RENAME_ICON;\r
        int h_Rename = W_RENAME_ICON;\r
 \r
-       int w_Title = width - (W_LISTVIEW_ITEM_BITMAP + (4 * X_LISTVIEW) + w_Rename + W_RENAME_ICON);\r
+       int w_Title = width - (W_LISTVIEW_ITEM_BITMAP + (4 * X_LISTVIEW) + (2 * W_RENAME_ICON));\r
        int x_Rename = width - (w_Rename + W_RENAME_ICON + (2 * X_LISTVIEW));\r
 \r
 \r
@@ -328,7 +328,7 @@ ContentListItem::CreateFormatRectangleForFileManageForm(int itemHeight, int text
                SetElementTextVerticalAlignment(CONTENT_LIST_ITEM_TYPE_TITLE, ALIGNMENT_MIDDLE);\r
                __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - textHeight) / 2, w_Title, H_LISTVIEW_ITEM_TITLE);\r
        }\r
-       __editRenameRect.SetBounds(x_Rename, thumbnailY, w_Rename, h_Rename);\r
+       __editRenameRect.SetBounds(x_Rename, (itemHeight - W_RENAME_ICON) / 2, w_Rename, h_Rename);\r
        __editDateRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, H_LISTVIEW_ITEM_TITLE + Y_LISTVIEW, w_Title, H_LISTVIEW_ITEM_DESCRIPTION);\r
 }\r
 void\r
@@ -818,7 +818,7 @@ 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) + w_AudioPlay + w_AudioPlay);\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
        AppControlView currentViewStyle;\r
 \r
@@ -839,15 +839,18 @@ ContentListItem::CreateFormatRectangleForAppControl(int itemHeight, int textHeig
                w_Title = width - (W_LISTVIEW_ITEM_BITMAP + 3 * X_LISTVIEW);\r
        }\r
 \r
-       __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - textHeight) / 2, w_Title, H_LISTVIEW_ITEM_TITLE);\r
+       __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - textHeight) / 2, w_Title + w_AudioPlay, H_LISTVIEW_ITEM_TITLE);\r
 \r
        if (__pPlayBitmap != null)\r
        {\r
-               __editPlayRect.SetBounds(x_Play, thumbnailY, w_AudioPlay, h_AudioPlay);\r
+               __editPlayRect.SetBounds(x_Play, (itemHeight - w_AudioPlay) / 2, w_AudioPlay, h_AudioPlay);\r
+               __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - textHeight) / 2, w_Title, H_LISTVIEW_ITEM_TITLE);\r
+\r
        }\r
        else if (__pPauseBitmap != null)\r
        {\r
-               __editPauseRect.SetBounds(x_Play, thumbnailY, w_AudioPlay, h_AudioPlay);\r
+               __editPauseRect.SetBounds(x_Play, (itemHeight - w_AudioPlay) / 2, w_AudioPlay, h_AudioPlay);\r
+               __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, (itemHeight - textHeight) / 2, w_Title, H_LISTVIEW_ITEM_TITLE);\r
        }\r
 }\r
 void\r
@@ -875,7 +878,7 @@ ContentListItem::MakeSearchFormListItem(void)
 \r
        __thumbnailRect.SetBounds(thumbnailX, thumbnailY, thumbnailWidth, thumbnailHeight); //right side width:20\r
        __titleRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, Y_LISTVIEW, w_Title, H_LISTVIEW_ITEM_TITLE);\r
-       __editRenameRect.SetBounds(x_Rename, thumbnailY, w_Rename, h_Rename);\r
+       __editRenameRect.SetBounds(x_Rename, (__itemHeight - W_RENAME_ICON) / 2, w_Rename, h_Rename);\r
        __editDateRect.SetBounds(thumbnailX + thumbnailWidth + normalGap, H_LISTVIEW_ITEM_TITLE + Y_LISTVIEW, w_Title, H_LISTVIEW_ITEM_DESCRIPTION);\r
 \r
        RefreshSearchFormListItem();\r

diff --git a/src/MfFolderEntryPresentationModel.cpp b/src/MfFolderEntryPresentationModel.cpp
index 61bd9d2..c95983f 100644 (file)
--- a/src/MfFolderEntryPresentationModel.cpp
+++ b/src/MfFolderEntryPresentationModel.cpp
@@ -1068,14 +1068,14 @@ FolderEntryPresentationModel::OnThumbnailResponseReceived(Tizen::Graphics::Bitma
                {
                        //This is just a temporary fix, actualy fix should be in Source form.
                        AppLogDebug("Request Id mismatch");
-                       pDirEntry = static_cast< DirectoryEntry* >(__pFolderEntries->GetAt(__requestId));
+                       /*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();

diff --git a/src/MfSubFolderMoveCopy.cpp b/src/MfSubFolderMoveCopy.cpp
index 6c908e0..dc8d4ed 100644 (file)
--- a/src/MfSubFolderMoveCopy.cpp
+++ b/src/MfSubFolderMoveCopy.cpp
@@ -1186,6 +1186,40 @@ SubFolderMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                {
                        Integer* pCurrentStatus = (Integer*) pArgs->GetAt(1);
                        Integer* pTotalFileCount = (Integer*) pArgs->GetAt(2);
+                       HashMap* pCacheList = null;
+                       const HashMap* pSelectedItemsList = null;
+                       int deleteItemcount = 0;
+                       int filesCount = 0;
+                       DirectoryEntry* pCurrentEntry = null;
+                       bool cacheKeyStatus = false;
+                       String cachePath;
+
+                       AppLogDebug("items deleted %d",pCurrentStatus->ToInt());
+                       deleteItemcount = pCurrentStatus->ToInt();
+                       pCacheList = CacheManager::GetInstance()->GetCacheHashMap();
+                       pSelectedItemsList = FolderEntryEditorPresentationModel::GetInstance()->GetCheckedList();
+
+                       if (pCacheList != null && pSelectedItemsList != null)
+                       {
+                               for (filesCount=0;filesCount<deleteItemcount;filesCount++)
+                               {
+                                       Integer currentKeyIndex = filesCount;
+                                       pCurrentEntry = const_cast< DirectoryEntry* >(static_cast< const DirectoryEntry* >(pSelectedItemsList->GetValue(currentKeyIndex)));
+
+                                       if (pCurrentEntry != null)
+                                       {
+                                               cachePath = pCurrentEntry->GetFullFilePath();
+                                       }
+
+                                       cacheKeyStatus = pCacheList->ContainsKey(cachePath);
+
+                                       if (cacheKeyStatus)
+                                       {
+                                               CacheManager::GetInstance()->RemoveCacheEntry(cachePath);
+                                       }
+                               }
+                       }
+
                        percentage = (Integer *)pArgs->GetAt(3);
                        value = percentage->ToInt();
                        AppLogDebug("precentage vlaue is %d",value);