NABI_SE issue fixes, GUI changes
authorchitta.rs <chitta.rs@samsung.com>
Tue, 19 Mar 2013 10:05:12 +0000 (15:35 +0530)
committerchitta.rs <chitta.rs@samsung.com>
Tue, 19 Mar 2013 10:05:12 +0000 (15:35 +0530)
Change-Id: I3d1ce2ff068cd18ac776edcd7bef8e94d0cb7a46

38 files changed:
inc/MfBaseItemProvider.h
inc/MfSearchPresentationModel.h
inc/MfSubBaseSelectionForm.h
inc/MfSubFolderSelection.h
inc/MfTypes.h
res/screen-density-xhigh/00_button_right.png [new file with mode: 0644]
res/screen-density-xhigh/00_button_right_ef.png [new file with mode: 0644]
res/screen-density-xhigh/U01_circle_button.png [new file with mode: 0644]
res/screen-density-xhigh/U01_circle_button_press.png [new file with mode: 0644]
res/screen-size-normal/IDL_CATEGORY_SEARCH.xml
res/screen-size-normal/IDL_CREATE_FOLDER.xml
res/screen-size-normal/IDL_DETAIL_FORM.xml
res/screen-size-normal/IDL_EDIT.xml
res/screen-size-normal/IDL_MAIN_FORM.xml
res/screen-size-normal/IDL_ROOT_DIRECTORY.xml
res/screen-size-normal/IDL_SEARCH.xml
res/screen-size-normal/IDL_SUB_DIRECTORY.xml
res/screen-size-normal/IDL_SUB_FOLDER_FILE_SELECTION.xml
res/screen-size-normal/IDL_SUB_FOLDER_MOVE_COPY.xml
res/screen-size-normal/IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE.xml
res/screen-size-normal/IDL_TOP_MOST_FILE_SELECTION.xml
res/screen-size-normal/IDL_TOP_MOST_MOVE_COPY.xml
src/MfBaseItemProvider.cpp
src/MfContentListItem.cpp
src/MfCreateFolderForm.cpp
src/MfFileManageForm.cpp
src/MfFileManageWorkerThread.cpp
src/MfFolderEntryPresentationModel.cpp
src/MfSearchPresentationModel.cpp
src/MfSplitPanelFileManageForm.cpp
src/MfSplitPanelForm.cpp
src/MfSubBaseFileManageForm.cpp
src/MfSubBaseSelectionForm.cpp
src/MfSubFolderMoveCopy.cpp
src/MfSubFolderSelection.cpp
src/MfThumbnailItemProviderAndListener.cpp
src/MfTopLevelFolderFileListForm.cpp
src/MfTypes.cpp

index 3e3d509..6ff3cf6 100644 (file)
@@ -158,8 +158,8 @@ private:
 \r
        Tizen::Graphics::Bitmap* __pDummyImage;\r
        Tizen::Graphics::Bitmap* __pFolderBitmap;\r
-       Tizen::Graphics::Bitmap* __pRenameBitmap;\r
-       Tizen::Graphics::Bitmap* __pRenamePressed;\r
+       Tizen::Graphics::Bitmap* __pSecondaryBitmap;\r
+       Tizen::Graphics::Bitmap* __pSecondaryBitmapPressed;\r
 \r
        Tizen::Ui::Controls::ListContextItem* __pItemContext;\r
 };\r
index 3d8a084..8bec894 100644 (file)
@@ -25,6 +25,7 @@
 \r
 #include <FApp.h>\r
 #include <FBase.h>\r
+#include <FContent.h>\r
 #include <FIo.h>\r
 \r
 #include "MfFolderEntryEditorPresentationModel.h"\r
@@ -83,13 +84,14 @@ public:
         */\r
        void StopSearch(void);\r
 \r
+       void CreateDirectoryEntryStack(void);\r
+\r
        virtual bool OnStart(void);\r
        virtual void OnStop(void);\r
        virtual Tizen::Base::Object* Run(void);\r
 \r
 private:\r
-       result Search(void);\r
-       result Search(const Tizen::Base::String& path);\r
+       void Search(void);\r
 \r
 private:\r
        bool __searchToStop;\r
@@ -97,6 +99,7 @@ private:
        Tizen::Base::Collection::ArrayList* __pFolderSearchStartedMessage;\r
        Tizen::Base::String __folderToSearch;\r
        Tizen::Base::String __searchKeyword;\r
+       Tizen::Base::Collection::Stack* __pFolderEntryStack;\r
 \r
        FolderEntryPresentationModel* __pFolderEntryPM;\r
 };\r
index 53cba4e..a92c395 100644 (file)
@@ -156,6 +156,16 @@ protected:
        void ClearSelectedItems(Tizen::Ui::Controls::ListView& listView);\r
        void ResetFooter(void);\r
 \r
+       /*\r
+        * A private member function taking and returning no arguments.\r
+        * @fn ShowHomeView\r
+        * @brief Called during OnActionPerformed() on Home HeaderItem, m__pHomeHeaderItem, refreshes the view to the Root Media Directory\r
+        * from anywhere within the form.\r
+        * @param No parameters\r
+        * @return Void return type\r
+        */\r
+       void ShowHomeView(void);\r
+\r
 protected:\r
        static const int IDA_BTN_ATTACH = 202;\r
        static const int IDA_BTN_CANCEL = 203;\r
index fe733e1..81f8a08 100644 (file)
@@ -161,17 +161,6 @@ private:
        void SetParentDisplayPath(void);\r
 \r
        /*\r
-        * A private member function taking no argument and returning no arguments.\r
-        * @fn ShowHomeView\r
-        * @brief Called during OnActionPerformed() on Home HeaderItem, refreshes the view to the Root Media Directory\r
-        * from anywhere within the form.\r
-        * @param No parameters\r
-        * @return Void return type\r
-        *\r
-        */\r
-       void ShowHomeView(void);\r
-\r
-       /*\r
         * A private member function taking and returning no arguments.\r
         * @fn ShowParentDirectoryView\r
         * @brief Called during OnActionPerformed() on Up HeaderItem, refreshes the view to the\r
index 9c4fbc5..d767257 100644 (file)
@@ -166,6 +166,11 @@ extern const wchar_t* IDB_POPUP_CREATE_FOLDER_ICON;
 extern const wchar_t* IDB_POPUP_COPY_ICON;
 extern const wchar_t* IDB_POPUP_MOVE_ICON;
 
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_PRESSED;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG;
+extern const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED;
+
 //Offsets and Dimensions of controls
 extern const int X_DEFAULT;
 extern const int Y_DEFAULT;
diff --git a/res/screen-density-xhigh/00_button_right.png b/res/screen-density-xhigh/00_button_right.png
new file mode 100644 (file)
index 0000000..fc5dbcf
Binary files /dev/null and b/res/screen-density-xhigh/00_button_right.png differ
diff --git a/res/screen-density-xhigh/00_button_right_ef.png b/res/screen-density-xhigh/00_button_right_ef.png
new file mode 100644 (file)
index 0000000..d880257
Binary files /dev/null and b/res/screen-density-xhigh/00_button_right_ef.png differ
diff --git a/res/screen-density-xhigh/U01_circle_button.png b/res/screen-density-xhigh/U01_circle_button.png
new file mode 100644 (file)
index 0000000..39ba6fd
Binary files /dev/null and b/res/screen-density-xhigh/U01_circle_button.png differ
diff --git a/res/screen-density-xhigh/U01_circle_button_press.png b/res/screen-density-xhigh/U01_circle_button_press.png
new file mode 100644 (file)
index 0000000..cb12641
Binary files /dev/null and b/res/screen-density-xhigh/U01_circle_button_press.png differ
index 9f54bf1..d8e7ee2 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CATEGORY_SEARCH">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
index e33bd4d..8cea963 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CREATE_FOLDER">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index b268382..6eab0d2 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_DETAIL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index 937164a..4e8d41b 100644 (file)
@@ -3,10 +3,10 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303111438" Dversion="20120315">
+<Scene Bversion="3.0.0.201302121659" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_EDIT">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index 7ced1e1..e9b5933 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MAIN_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Panel id="IDC_CATEGORY_ICON_PANEL" parent="IDL_MAIN_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="680" x="20" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="192" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="680" x="300" y="0"/>
     </Panel>
     <Button id="IDC_BUTTON_IMAGES" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="16" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="294" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="16" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_VIDEOS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="146" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="434" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="146" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_SOUNDS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="276" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="574" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="276" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_DOCUMENTS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="406" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="714" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="406" y="8"/>
     </Button>
     <Button id="IDC_BUTTON_OTHERS" parent="IDC_CATEGORY_ICON_PANEL">
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
         <layout height="92" mode="Portrait" width="128" x="536" y="8"/>
-        <layout height="132" mode="Landscape" width="132" x="854" y="30"/>
+        <layout height="92" mode="Landscape" width="128" x="536" y="8"/>
     </Button>
     <Label id="IDC_LABEL_BACKGROUND" parent="IDC_CATEGORY_ICON_PANEL">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
         <layout height="122" mode="Portrait" width="680" x="0" y="0"/>
-        <layout height="192" mode="Landscape" width="1280" x="0" y="0"/>
+        <layout height="122" mode="Landscape" width="680" x="0" y="0"/>
     </Label>
     <ListView id="IDC_LISTVIEW_TEMP_FORM" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList="::IDS_COM_BODY_NO_FILES"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="170"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="240" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="244"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="313" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="170"/>
     </ListView>
     <IconListView id="IDC_ICONLISTVIEW_TOP_MOST_FORM" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_RIGHT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="164" itemBitmapWidth="164" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_SHADOW" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="10" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="26" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_OUTSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="10" magneticScrollSize="0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" textOfEmptyList="::IDS_COM_BODY_NO_FILES" touchAnimationEnabled="true"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="840" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="170"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="240" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1278" x="1" y="244"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="313" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_NORMAL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="170"/>
     </IconListView>
     <Label id="IDC_LABEL_DISPLAY_PATH" parent="IDL_MAIN_FORM">
         <property backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" text="::IDS_MF_BODY_DIRECTORY" textColor="#FFFFFF" textSize="32" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="122"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="192"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="122"/>
     </Label>
 </Scene>
index 9d735f7..bc82a45 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ROOT_DIRECTORY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index 9a4351e..db90dd0 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SEARCH">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index 522ef30..e7d40d7 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_DIRECTORY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" 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" 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="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_TITLE|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
index c722a96..58ca005 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_FOLDER_FILE_SELECTION">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" 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" 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>
index dfbda9e..9dfb220 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_SUB_FOLDER_MOVE_COPY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" 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" 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>
index 5cf1f87..c3a3226 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_LEVEL_DIRECTORY_COPY_MOVE">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index 8a501f0..64f7539 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_MOST_FILE_SELECTION">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index bba1888..bbbd137 100644 (file)
@@ -6,7 +6,7 @@
 <Scene Bversion="2.0.0.201303041025" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_TOP_MOST_MOVE_COPY">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
index b48ee1b..02c6ab4 100644 (file)
@@ -41,8 +41,8 @@ BaseItemProvider::BaseItemProvider(void)
 , __pFileNames(null)
 , __pDummyImage(null)
 , __pFolderBitmap(null)
-, __pRenameBitmap(null)
-, __pRenamePressed(null)
+, __pSecondaryBitmap(null)
+, __pSecondaryBitmapPressed(null)
 , __pItemContext(null)
 {
        //empty implementation
@@ -172,14 +172,14 @@ CATCH:
 
 BaseItemProvider::~BaseItemProvider(void)
 {
-       if (__pRenameBitmap != null)
+       if (__pSecondaryBitmap != null)
        {
-               delete __pRenameBitmap;
+               delete __pSecondaryBitmap;
        }
 
-       if (__pRenamePressed != null)
+       if (__pSecondaryBitmapPressed != null)
        {
-               delete __pRenamePressed;
+               delete __pSecondaryBitmapPressed;
        }
 
        if (__pFolderBitmap != null)
@@ -433,7 +433,7 @@ BaseItemProvider::CreateNormalListViewItem(int listItemIndex, int listItemWidth)
 
                pCustomItem->SetTitle(filename, searchedString);
 //             pCustomItem->SetDate(creationDate);
-               pCustomItem->SetRenameBitmap(__pRenameBitmap, __pRenamePressed);
+               pCustomItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
                pCustomItem->MakeFileManageFormListItem();
        }
        else if(__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
@@ -441,7 +441,7 @@ BaseItemProvider::CreateNormalListViewItem(int listItemIndex, int listItemWidth)
                pCustomItem->SetTitle(filename, searchedText);
                GetParentFolderPath(&fullFilePath);
                pCustomItem->SetFilepath(fullFilePath);
-               pCustomItem->SetRenameBitmap(__pRenameBitmap, __pRenamePressed);
+               pCustomItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
                pCustomItem->MakeSearchFormListItem();
                if (__pItemContext != null)
                {
@@ -592,6 +592,9 @@ BaseItemProvider::CreateDetailedListViewItem(int listItemIndex, int listItemWidt
                {
                        pContentListItem->SetDescColor(Color::GetColor(COLOR_ID_GREY));
                }
+
+               contentType = ContentManagerUtil::CheckContentType(imageIconPath);
+
                if (pFileDetails->GetBitmap() == null && pFileDetails->IstDummy())
                {
                        if (pCacheList != null && (contentType == CONTENT_TYPE_IMAGE || contentType == CONTENT_TYPE_VIDEO))
@@ -634,6 +637,11 @@ BaseItemProvider::CreateDetailedListViewItem(int listItemIndex, int listItemWidt
        pContentListItem->SetDescription(descriptionText);
        pContentListItem->SetDate(creationDate);
 
+       if (__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+       {
+               pContentListItem->SetRenameBitmap(__pSecondaryBitmap, __pSecondaryBitmapPressed);
+       }
+
        pContentListItem->MakeDetailedListItem();
 
        if (__sourceInfo != CREATE_ITEM_SOURCE_SUB_FOLDER_MOVE_COPY && __sourceInfo != CREATE_ITEM_SOURCE_TOP_MOST_MOVE_COPY
@@ -658,15 +666,26 @@ BaseItemProvider::SetSourceForm(CreateItemSource sourceInfo)
 {
        __sourceInfo = sourceInfo;
 
-       if (__sourceInfo == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+       if (__sourceInfo == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || __sourceInfo == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM)
+       {
+               if (__pSecondaryBitmap == null)
+               {
+                       __pSecondaryBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+               }
+               if (__pSecondaryBitmapPressed == null)
+               {
+                       __pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_RENAME_PRESSED_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+               }
+       }
+       else if (__sourceInfo == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
        {
-               if (__pRenameBitmap == null)
+               if (__pSecondaryBitmap == null)
                {
-                       __pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+                       __pSecondaryBitmap = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG, IDB_CATEGORY_GO_TO_LOCATION, W_RENAME_ICON, W_RENAME_ICON);
                }
-               if (__pRenamePressed == null)
+               if (__pSecondaryBitmapPressed == null)
                {
-                       __pRenamePressed = MfUtility::MergeBitmapN(IDB_RENAME_PRESSED_CIRCLE, IDB_RENAME, W_RENAME_ICON, W_RENAME_ICON);
+                       __pSecondaryBitmapPressed = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED, IDB_CATEGORY_GO_TO_LOCATION_PRESSED, W_RENAME_ICON, W_RENAME_ICON);
                }
        }
 }
index 63a80f9..4389c3e 100644 (file)
@@ -524,13 +524,21 @@ ContentListItem::CreateFormatRectangleForDetailedList(int itemHeight, int textHe
        int h_CreationDate = H_LISTVIEW_ITEM_DESCRIPTION;\r
 \r
        //Rename\r
-       int x_Rename = x_CreationDate + w_CreationDate;\r
-       int y_Rename = X_LISTVIEW;\r
-       int w_Rename = H_LISTVIEW_ITEM_DESCRIPTION;\r
-       int h_Rename = H_LISTVIEW_ITEM_DESCRIPTION;\r
+       int x_Rename = width - (W_RENAME_ICON + (2 * X_LISTVIEW));\r
+       int y_Rename = (itemHeight - W_RENAME_ICON) / 2;\r
+       int w_Rename = W_RENAME_ICON;\r
+       int h_Rename = W_RENAME_ICON;\r
 \r
        __thumbnailRect.SetBounds(thumbnailX, thumbnailY, thumbnailWidth, thumbnailHeight); //right side width:20\r
-       __titleRect.SetBounds(x_Title, y_Title, w_Title, h_Title);\r
+\r
+       if (__pRenameBitmap != null)\r
+       {\r
+               __titleRect.SetBounds(x_Title, y_Title, w_Title - W_RENAME_ICON - X_LISTVIEW, h_Title);\r
+       }\r
+       else\r
+       {\r
+               __titleRect.SetBounds(x_Title, y_Title, w_Title, h_Title);\r
+       }\r
        __detailedListDescriptionRect.SetBounds(x_Description, y_Description, w_Description, h_Description);\r
        __detailedListDateRect.SetBounds(x_CreationDate, y_CreationDate, w_CreationDate, h_CreationDate);\r
        __editRenameRect.SetBounds(x_Rename, y_Rename, w_Rename, h_Rename);\r
index 7c10716..0cd72f1 100644 (file)
@@ -680,113 +680,6 @@ CreateFolderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 void\r
 CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)\r
 {\r
-       /*AppLogDebug("Entry");\r
-       wchar_t currentInput;\r
-       wchar_t characterToCompare;\r
-       String currentText;\r
-       String specialCharacters(L"/\\?\":<>|;");\r
-       int specialCharCount = 0;\r
-       int modalResult = 0;\r
-       int inputLength = 0;\r
-\r
-       MessageBox messageBox;\r
-       ButtonItemStatus currentStatus = BUTTON_ITEM_STATUS_NORMAL;\r
-\r
-       result r = E_SUCCESS;\r
-\r
-       if (__pEditFieldFolderName != null)\r
-       {\r
-               currentText = __pEditFieldFolderName->GetText();\r
-\r
-               if (currentText.IsEmpty())\r
-               {\r
-                       if (__pHeader != null)\r
-                       {\r
-                               __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,false);\r
-                               __pHeader->Invalidate(true);\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       if (__pHeader != null)\r
-                       {\r
-                               currentStatus = __pHeader->GetButtonStatus(BUTTON_POSITION_LEFT);\r
-\r
-                               if (currentStatus == BUTTON_ITEM_STATUS_DISABLED)\r
-                               {\r
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,true);\r
-                                       __pHeader->Invalidate(true);\r
-                               }\r
-\r
-                       }\r
-               }\r
-               inputLength = currentText.GetLength();\r
-               if (__fileExtension.GetLength() >0)\r
-               {\r
-                       inputLength = inputLength + __fileExtension.GetLength() +1;\r
-               }\r
-\r
-               //if (inputLength == 1)\r
-               {\r
-                       if (currentText.StartsWith(".", 0))\r
-                       {\r
-                               String invalidCharacterString;\r
-                               AppResource::GetInstance()->GetString(L"IDS_INVALID_CHARACTER_MESSAGE", invalidCharacterString);\r
-                               messageBox.Construct(L"", invalidCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);\r
-                               messageBox.ShowAndWait(modalResult);\r
-                               if (__pHeader != null)\r
-                               {\r
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT,false);\r
-                                       __pHeader->Invalidate(true);\r
-                               }\r
-                               __pEditFieldFolderName->SetText("");\r
-                               __pEditFieldFolderName->ShowKeypad();\r
-                       }\r
-               }\r
-\r
-               int tempLength = 0;\r
-\r
-               if (__fileExtension.GetLength() == 0 )//folder case\r
-               {\r
-                       AppLogDebug("ID_FOLDER_NAME_LENGTH_MAX - %d", inputLength);\r
-                       tempLength = ID_FOLDER_NAME_LENGTH_MAX;\r
-               }\r
-               else//file case\r
-               {\r
-                       AppLogDebug("ID_FILE_NAME_LENGTH_MAX - %d", inputLength);\r
-                       tempLength = ID_FILE_NAME_LENGTH_MAX;\r
-               }\r
-\r
-               if (inputLength == tempLength)\r
-               {\r
-                       String maxCharacterString;\r
-                       AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);\r
-                       messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);\r
-                       messageBox.ShowAndWait(modalResult);\r
-\r
-                       __pEditFieldFolderName->ShowKeypad();\r
-                       return;\r
-               }\r
-\r
-               r = currentText.GetCharAt(__pEditFieldFolderName->GetCursorPosition() - 1,currentInput);\r
-\r
-               for (specialCharCount = 0; specialCharCount < specialCharacters.GetLength(); specialCharCount++)\r
-               {\r
-                       characterToCompare = specialCharacters[specialCharCount];\r
-                       if (currentInput == characterToCompare)\r
-                       {\r
-                               String invalidCharacterString;\r
-                               AppResource::GetInstance()->GetString(L"IDS_INVALID_CHARACTER_MESSAGE", invalidCharacterString);\r
-                               messageBox.Construct(L"", invalidCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);\r
-                               messageBox.ShowAndWait(modalResult);\r
-                               currentText.Remove(__pEditFieldFolderName->GetCursorPosition()-1,1);\r
-                               __pEditFieldFolderName->SetText(currentText);\r
-                               __pEditFieldFolderName->SetFocus();\r
-                       }\r
-               }\r
-       }\r
-       return;*/\r
-\r
        String currentInput;\r
        //wchar_t characterToCompare;\r
        String currentText;\r
@@ -864,19 +757,8 @@ CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)
                        tempLength = ID_FILE_NAME_LENGTH_MAX;\r
                }\r
 \r
-               if (inputLength == tempLength)\r
-               {\r
-                       String maxCharacterString;\r
-                       AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);\r
-                       messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);\r
-                       messageBox.ShowAndWait(modalResult);\r
-            __pEditFieldFolderName->SetText(L"");\r
-                       __pEditFieldFolderName->ShowKeypad();\r
-                       return;\r
-               }\r
-\r
                textToCheck =  __pEditFieldFolderName->GetText().GetLength() - __textLength;\r
-               AppLogDebug("textcheck textlength %d %d",textToCheck,__textLength);\r
+               AppLogDebug("textcheck textlength %d %d %d",textToCheck,__textLength,__pEditFieldFolderName->GetCursorPosition());\r
                r = currentText.SubString(__pEditFieldFolderName->GetCursorPosition() - textToCheck,currentInput);\r
                for(int i = 0 ; i < currentInput.GetLength() ; i++)\r
                {\r
@@ -893,6 +775,22 @@ CreateFolderForm::OnTextValueChanged(const Tizen::Ui::Control& source)
                        }\r
 \r
                }\r
+\r
+               inputLength = currentText.GetLength();\r
+               AppLogDebug("input length and temp legth is %d %d",inputLength,tempLength);\r
+               if (inputLength == tempLength)\r
+               {\r
+                       String maxCharacterString;\r
+                       AppResource::GetInstance()->GetString(L"IDS_MAX_CHARACTER_LIMIT_MESSAGE", maxCharacterString);\r
+                       messageBox.Construct(L"", maxCharacterString, MSGBOX_STYLE_NONE, ID_MESSAGE_BOX_TIMEOUT_ONE_SECOND);\r
+                       messageBox.ShowAndWait(modalResult);\r
+                       r = __pEditFieldFolderName->GetText().SubString(0,tempLength,currentInput);\r
+                       __pEditFieldFolderName->SetText(currentInput);\r
+                       __pEditFieldFolderName->ShowKeypad();\r
+                       return;\r
+               }\r
+\r
+\r
                __textLength = __pEditFieldFolderName->GetText().GetLength();\r
        }\r
        return;\r
index 94384d2..bcd552b 100644 (file)
@@ -223,7 +223,7 @@ FileManageForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScen
        SceneManager::GetInstance()->AddSceneManagerEventListener(*this);
        _viewType = listViewDisplayType;
 
-       if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM)
+       if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM && (previousSceneId != IDSCN_SUB_DIRECTORY_MOVE_COPY_FORM && previousSceneId != IDSCN_SUB_DIRECTORY_MOVE_COPY_FORM1) )
        {
                pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
                _editOrShare = pEditOrShare->ToInt();
index 5d77516..a8bed04 100644 (file)
@@ -2028,7 +2028,7 @@ FileManageWorkerThread::Copy(Tizen::Base::String& sourcePath, Tizen::Base::Strin
                if (!IsFailed(GetLastResult()))
                {
                        destFile.Write(byteToWrite, count);
-
+            TryCatch(r == E_SUCCESS,,"copy file failed");
                        if(!__isRenamingActive)
                        {
                                percentage = percentage + count;
@@ -2059,9 +2059,10 @@ FileManageWorkerThread::Copy(Tizen::Base::String& sourcePath, Tizen::Base::Strin
        //percentage = size;
        return E_SUCCESS;
 CATCH:
+    File::Remove(destPath);
        if (byteToWrite != null)
                free(byteToWrite);
-       return E_FAILURE;
+       return r;
 }
 
 long long int
index ebe9826..61bd9d2 100644 (file)
@@ -1282,11 +1282,12 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
        ArrayList* pDeviceList = null;
        DirEnumerator* pCurrentDirectoryEnum = null;
        String* currentDirectoryPath = null;
+       String fileExtension;
        int fileExtensionLength = 0;
        int deviceListCount = 1;
        ContentType contentType = CONTENT_TYPE_UNKNOWN;
        result r = E_SUCCESS;
-
+       result fileExtensionResult = E_SUCCESS;
 
        if (__pFolderEntries != null)
        {
@@ -1336,6 +1337,7 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
                                        DirectoryEntry* pCurrentFolderEntry = new (std::nothrow) DirectoryEntry();
                                        String fullPath = *currentDirectoryPath+directoryName;
                                        pCurrentFolderEntry->SetFileExtension(File::GetFileExtension(fullPath));
+                                       fileExtensionResult = GetLastResult();
                                        fileExtensionLength = pCurrentFolderEntry->GetFileExtension().GetLength();
                                        if(fileExtensionLength != 0)
                                        {
@@ -1345,6 +1347,9 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
                                        pCurrentFolderEntry->SetFileName(directoryName);
                                        pCurrentFolderEntry->SetCheckDirectory(false);
                                        contentType = ContentManagerUtil::CheckContentType(fullPath);
+                                       r = GetLastResult();
+                                       fileExtension = pCurrentFolderEntry->GetFileExtension();
+
                                        if (__entryType == FILE_TYPE_ALL)
                                        {
                                                __pFolderEntries->Add(pCurrentFolderEntry);
@@ -1387,14 +1392,13 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
                                        }
                                        else if (__entryType == FILE_TYPE_DOCUMENT_TYPE)
                                        {
-                                               if ( fullPath.EndsWith(L"pptx") || fullPath.EndsWith(L"PPTX")
-                                                               ||      fullPath.EndsWith(L"pdf") || fullPath.EndsWith(L"PDF")
-                                                               ||fullPath.EndsWith(L"doc") || fullPath.EndsWith(L"DOC")
-                                                               || fullPath.EndsWith(L"docx") || fullPath.EndsWith(L"DOCX")
-                                                               ||      fullPath.EndsWith(L"xls") || fullPath.EndsWith(L"XLS")
-                                                               ||fullPath.EndsWith(L"xlsx") || fullPath.EndsWith(L"XLSX")
-                                                               || fullPath.EndsWith(L"ppt") || fullPath.EndsWith(L"PPT")
-                                               )
+                                               if ( fileExtension.EndsWith(L"pptx") || fileExtension.EndsWith(L"PPTX")
+                                                               ||      fileExtension.EndsWith(L"pdf") || fileExtension.EndsWith(L"PDF")
+                                                               ||fileExtension.EndsWith(L"doc") || fileExtension.EndsWith(L"DOC")
+                                                               || fileExtension.EndsWith(L"docx") || fileExtension.EndsWith(L"DOCX")
+                                                               ||      fileExtension.EndsWith(L"xls") || fileExtension.EndsWith(L"XLS")
+                                                               ||fileExtension.EndsWith(L"xlsx") || fileExtension.EndsWith(L"XLSX")
+                                                               || fileExtension.EndsWith(L"ppt") || fileExtension.EndsWith(L"PPT"))
                                                {
                                                        __pFolderEntries->Add(pCurrentFolderEntry);
                                                }
@@ -1406,16 +1410,16 @@ FolderEntryPresentationModel::CreateTraversalTree(void)
                                        }
                                        else if (__entryType == FILE_TYPE_OTHER_TYPE)
                                        {
-                                               if (contentType == CONTENT_TYPE_OTHER)
+                                               if (contentType == CONTENT_TYPE_OTHER || r != E_SUCCESS)
                                                {
-                                                       if ( fullPath.EndsWith(L"pptx") || fullPath.EndsWith(L"PPTX")
-                                                                       ||      fullPath.EndsWith(L"pdf") || fullPath.EndsWith(L"PDF")
-                                                                       ||fullPath.EndsWith(L"doc") || fullPath.EndsWith(L"DOC")
-                                                                       || fullPath.EndsWith(L"docx") || fullPath.EndsWith(L"DOCX")
-                                                                       ||      fullPath.EndsWith(L"xls") || fullPath.EndsWith(L"XLS")
-                                                                       ||fullPath.EndsWith(L"xlsx") || fullPath.EndsWith(L"XLSX")
-                                                                       || fullPath.EndsWith(L"ppt") || fullPath.EndsWith(L"PPT")
-                                                       )
+                                                       if ((fileExtension.EndsWith(L"pptx") || fileExtension.EndsWith(L"PPTX")
+                                                               || fileExtension.EndsWith(L"pdf") || fileExtension.EndsWith(L"PDF")
+                                                               || fileExtension.EndsWith(L"doc") || fileExtension.EndsWith(L"DOC")
+                                                               || fileExtension.EndsWith(L"docx") || fileExtension.EndsWith(L"DOCX")
+                                                               || fileExtension.EndsWith(L"xls") || fileExtension.EndsWith(L"XLS")
+                                                               || fileExtension.EndsWith(L"xlsx") || fileExtension.EndsWith(L"XLSX")
+                                                               || fileExtension.EndsWith(L"ppt") || fileExtension.EndsWith(L"PPT")
+                                                       ))
                                                        {
                                                                delete pCurrentFolderEntry;
                                                                pCurrentFolderEntry = null;
index 65d2657..5d35011 100644 (file)
@@ -25,6 +25,8 @@ using namespace Tizen::App;
 using namespace Tizen::Base;\r
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Base::Runtime;\r
+using namespace Tizen::Content;\r
+using namespace Tizen::Io;\r
 \r
 SearchPresentationModel::SearchPresentationModel(void)\r
 {\r
@@ -59,127 +61,126 @@ SearchPresentationModel::SetStringToSearch(const String& searchString)
        __searchKeyword = searchString;\r
 }\r
 \r
-result\r
-SearchPresentationModel::Search(const String& folderToSearch)\r
-{\r
-       AppLogDebug("Enter:SearchPresentationModel::Search::SearchPath:%S", folderToSearch.GetPointer());\r
 \r
-       ArrayList* pDirectoryEntryList = null;\r
-       FolderEntryPresentationModel* pFolderEntryPM = null;\r
-       result r = E_SUCCESS;\r
+Tizen::Base::Object*\r
+SearchPresentationModel::Run(void)\r
+{\r
+       AppLogDebug("Enter:SearchPresentationModel::Run");\r
+       __searchToStop = false;\r
 \r
-       pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();\r
-       TryCatch(pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to listmanager");\r
-       pFolderEntryPM->Construct();\r
+       if (__folderToSearch.IsEmpty() == false)\r
+       {\r
+               Search();\r
+       }\r
+       return null;\r
 \r
-       pFolderEntryPM->SetFolderEntryPath(folderToSearch);\r
-       pDirectoryEntryList = pFolderEntryPM->GetFolderEntryList();\r
-       TryCatch(pDirectoryEntryList != null, , "SearchPresentationModel::Search::pDirectoryEntryList is null");\r
+}\r
+bool\r
+SearchPresentationModel::OnStart(void)\r
+{\r
+       AppLogDebug("Enter:SearchPresentationModel::OnStart");\r
+       return true;\r
+}\r
 \r
-       for (int directoryEntryCount = 0; directoryEntryCount < pDirectoryEntryList->GetCount(); directoryEntryCount++)\r
+void\r
+SearchPresentationModel::OnStop(void)\r
+{\r
+       AppLogDebug("Enter:SearchPresentationModel::OnStop");\r
+       result r = E_FAILURE;\r
+       Tizen::Base::Collection::ArrayList* pSearchCompleteMessage = null;\r
+       if (!IsFailed(GetLastResult()))\r
        {\r
-               if (__searchToStop == true)\r
-               {\r
-                       r = E_FAILURE;\r
-                       break;\r
-               }\r
-               DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));\r
-               TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");\r
+               pSearchCompleteMessage = new (std::nothrow) ArrayList();\r
+               TryCatch(pSearchCompleteMessage != null, , "SearchPresentationModel::Run::Failed to allocate Memory to pSearchCompleteMessage");\r
 \r
-               String filename;\r
-               if (pdirStructure->IsDirectory() == true)\r
-                       filename = pdirStructure->GetFileName();\r
-               else\r
-                       filename = pdirStructure->GetFileName() + "." + pdirStructure->GetFileExtension();\r
+               r = pSearchCompleteMessage->Construct();\r
+               TryCatch(r == E_SUCCESS, , "SearchPresentationModel::Run::Failed to Construct pFinalListToBeSent");\r
 \r
-               if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)\r
-               {\r
-                       int index = -1;\r
-                       filename.ToLowerCase();\r
-                       __searchKeyword.ToLowerCase();\r
-                       filename.IndexOf(__searchKeyword, 0, index);\r
-                       if (index >= 0)\r
-                       {\r
-                               //__pSubFolderSearchedResult->Add(*new (std::nothrow) DirectoryEntry(*pdirStructure));\r
+               pSearchCompleteMessage->Add(new (std::nothrow) Integer(ID_SEARCH_COMPLETED));\r
 \r
+               Application::GetInstance()->SendUserEvent(ID_SEARCH_COMPLETED, pSearchCompleteMessage);\r
 \r
-                               ArrayList* pListToBeSent = new (std::nothrow) ArrayList();\r
-                               if (pListToBeSent != null)\r
-                               {\r
-                                       pListToBeSent->Construct();\r
-                                       pListToBeSent->Add(new (std::nothrow) Integer(ID_SEARCH_RESULT_FOUND));\r
-                                       pListToBeSent->Add(new (std::nothrow) DirectoryEntry(*pdirStructure));\r
-                               }\r
-                               AppLogDebug("Exit:SearchPresentationModel::Search::Result:%S", filename.GetPointer());\r
-                               Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);\r
-                       }\r
-               }\r
-               if (pdirStructure->IsDirectory() == true)\r
-               {\r
-                       ///Free __pListToBeSent and construct again\r
-                       /*if (__pFolderSearchStartedMessage != null)\r
-                       {\r
-                           delete __pFolderSearchStartedMessage;\r
-                           __pFolderSearchStartedMessage = null;\r
-                       }*/\r
-                       __pFolderSearchStartedMessage = new (std::nothrow) ArrayList();\r
-                       if (__pFolderSearchStartedMessage != null)\r
-                       {\r
-                               __pFolderSearchStartedMessage->Construct();\r
-                               __pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));\r
-                               __pFolderSearchStartedMessage->Add(new (std::nothrow) String(pdirStructure->GetFullFilePath()));\r
-                       }\r
-                       Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);\r
-                       Search(pdirStructure->GetFullFilePath());\r
-               }\r
        }\r
-       AppLogDebug("Exit:SearchPresentationModel::Search::SearchPath:%S", folderToSearch.GetPointer());\r
-       return r;\r
+       AppLogDebug("Exit:SearchPresentationModel::OnStop");\r
+       return;\r
 \r
 CATCH:\r
-       if (pFolderEntryPM != null)\r
+       if (pSearchCompleteMessage)\r
        {\r
-               delete pFolderEntryPM;\r
+               delete pSearchCompleteMessage;\r
        }\r
-       return r;\r
+       AppLogDebug("SearchPresentationModel::OnStop--");\r
+       return;\r
+\r
 }\r
 \r
-result\r
+void\r
+SearchPresentationModel::StopSearch(void)\r
+{\r
+       AppLogDebug("Enter:SearchPresentationModel::StopSearch");\r
+       __searchToStop = true;\r
+}\r
+\r
+void\r
 SearchPresentationModel::Search(void)\r
 {\r
-       AppLogDebug("Enter:SearchPresentationModel::Search");\r
-       result r = E_SUCCESS;\r
+       String* pCurrentDirectoryPath = null;\r
+       ArrayList* pDirectoryEntryList = null;\r
+       int directoryEntryCount = 0;\r
+       result r = E_FAILURE;\r
+\r
+       AppLogDebug("SearchPresentationModel::Search");\r
+\r
+       __pFolderEntryStack = new (std::nothrow) Stack();\r
+       TryCatch(__pFolderEntryStack != null, , "Stack is null");\r
+\r
+       pCurrentDirectoryPath =  new (std::nothrow) String(__folderToSearch);\r
+       TryCatch(pCurrentDirectoryPath != null, , "pCurrentDirectoryPath is null");\r
+\r
+       r = __pFolderEntryStack->Push(new String(*pCurrentDirectoryPath));\r
+       TryCatch(r == E_SUCCESS, ,"push failed");\r
 \r
        __pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();\r
-       TryCatch(__pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to __pContentManager");\r
+       TryCatch(__pFolderEntryPM != null, , "SearchPresentationModel::Search::Failed to allocate Memory to __pFolderEntryPM");\r
        __pFolderEntryPM->Construct();\r
 \r
-       if (__folderToSearch.IsEmpty() == false)\r
+       do\r
        {\r
-               if ((__folderToSearch == BasePresentationModel::GetMediaPath()) || (__folderToSearch == BasePresentationModel::GetSdCardPath()))\r
+               AppLogDebug("SearchPresentationModel::Search:%S", pCurrentDirectoryPath->GetPointer());\r
+\r
+               if (__searchToStop == true)\r
                {\r
-                       ArrayList* pDirectoryEntryList = null;\r
-                       __pFolderEntryPM->SetFolderEntryPath(__folderToSearch);\r
+                       break;\r
+               }\r
+               __pFolderSearchStartedMessage = new (std::nothrow) ArrayList();\r
+               if (__pFolderSearchStartedMessage != null)\r
+               {\r
+                       __pFolderSearchStartedMessage->Construct();\r
+                       __pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));\r
+                       __pFolderSearchStartedMessage->Add(new (std::nothrow) String(*pCurrentDirectoryPath));\r
+               }\r
+               Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);\r
 \r
-                       pDirectoryEntryList = __pFolderEntryPM->GetFolderEntryList();\r
-                       TryCatch(pDirectoryEntryList != null, , "SearchPresentationModel::Search::pDirectoryEntryList is null");\r
+               __pFolderEntryPM->SetFolderEntryPath(*pCurrentDirectoryPath);\r
+               pDirectoryEntryList = __pFolderEntryPM->GetFolderEntryList();\r
 \r
-                       for (int directoryEntryCount = 0; directoryEntryCount < pDirectoryEntryList->GetCount(); directoryEntryCount++)\r
+               while(directoryEntryCount < pDirectoryEntryList->GetCount())\r
+               {\r
+                       if (__searchToStop == true)\r
                        {\r
-                               if (__searchToStop == true)\r
-                               {\r
-                                       r = E_FAILURE;\r
-                                       break;\r
-                               }\r
+                               break;\r
+                       }\r
+                       DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));\r
+                       TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");\r
 \r
-                               DirectoryEntry* pdirStructure = static_cast< DirectoryEntry* >(pDirectoryEntryList->GetAt(directoryEntryCount));\r
-                               TryCatch(pdirStructure != null, , "SearchPresentationModel::Search::pdirStructure is null");\r
+                       if(pdirStructure->IsDirectory() == true)\r
+                       {\r
+                               String directoryFullPath = pdirStructure->GetFullFilePath();\r
+                               r = __pFolderEntryStack->Push(new (std::nothrow) String(directoryFullPath));\r
+                               TryCatch(r == E_SUCCESS, ,"push failed");\r
 \r
                                String filename;\r
-                               if (pdirStructure->IsDirectory() == true)\r
-                                       filename = pdirStructure->GetFileName();\r
-                               else\r
-                                       filename = pdirStructure->GetFileName() + "." + pdirStructure->GetFileExtension();\r
+                               filename = pdirStructure->GetFileName();\r
 \r
                                if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)\r
                                {\r
@@ -201,109 +202,46 @@ SearchPresentationModel::Search(void)
                                                Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);\r
                                        }\r
                                }\r
-                               if (pdirStructure->IsDirectory() == true)\r
+                       }\r
+                       else\r
+                       {\r
+                               String filename;\r
+                               filename = pdirStructure->GetFullFilePath();\r
+\r
+                               if (filename.IsEmpty() == false && __searchKeyword.IsEmpty() == false)\r
                                {\r
-                                       /*if (__pFolderSearchStartedMessage != null)\r
-                                       {\r
-                                           delete __pFolderSearchStartedMessage;\r
-                                           __pFolderSearchStartedMessage = null;\r
-                                       }*/\r
-                                       __pFolderSearchStartedMessage = new (std::nothrow) ArrayList();\r
-                                       if (__pFolderSearchStartedMessage != null)\r
+                                       int index = -1;\r
+                                       filename.ToLowerCase();\r
+                                       __searchKeyword.ToLowerCase();\r
+                                       filename.IndexOf(__searchKeyword, 0, index);\r
+                                       if (index >= 0)\r
                                        {\r
-                                               __pFolderSearchStartedMessage->Construct();\r
-                                               __pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));\r
-                                               __pFolderSearchStartedMessage->Add(new (std::nothrow) String(pdirStructure->GetFullFilePath()));\r
+                                               //__pSearchedResult->Add(*new (std::nothrow) DirectoryEntry(*pdirStructure));\r
+                                               ArrayList* pListToBeSent = new (std::nothrow) ArrayList();\r
+                                               if (pListToBeSent != null)\r
+                                               {\r
+                                                       pListToBeSent->Construct();\r
+                                                       pListToBeSent->Add(new (std::nothrow) Integer(ID_SEARCH_RESULT_FOUND));\r
+                                                       pListToBeSent->Add(new (std::nothrow) DirectoryEntry(*pdirStructure));\r
+                                               }\r
+                                               AppLogDebug("Exit:SearchPresentationModel::Search::Result:%S", filename.GetPointer());\r
+                                               Application::GetInstance()->SendUserEvent(ID_SEARCH_RESULT_FOUND, pListToBeSent);\r
                                        }\r
-                                       Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);\r
-                                       r = Search(pdirStructure->GetFullFilePath());\r
                                }\r
                        }\r
+                       directoryEntryCount++;\r
                }\r
-               else\r
-               {\r
-                       /*if (__pFolderSearchStartedMessage != null)\r
-                       {\r
-                           delete __pFolderSearchStartedMessage;\r
-                           __pFolderSearchStartedMessage = null;\r
-                       }*/\r
-                       __pFolderSearchStartedMessage = new (std::nothrow) ArrayList();\r
-                       if (__pFolderSearchStartedMessage != null)\r
-                       {\r
-                               __pFolderSearchStartedMessage->Construct();\r
-                               __pFolderSearchStartedMessage->Add(new (std::nothrow) Integer(ID_FOLDER_SEARCH_STARTED));\r
-                               __pFolderSearchStartedMessage->Add(new (std::nothrow) String(__folderToSearch));\r
-                       }\r
-                       Application::GetInstance()->SendUserEvent(ID_FOLDER_SEARCH_STARTED, __pFolderSearchStartedMessage);\r
-                       r = Search(__folderToSearch);\r
-\r
-               }\r
+               directoryEntryCount = 0;\r
+               pCurrentDirectoryPath = static_cast<String *>(__pFolderEntryStack->Pop());\r
+               TryCatch(pCurrentDirectoryPath !=null, , "Pop Failed");\r
        }\r
-       SetLastResult(r);\r
-       AppLogDebug("Exit:SearchPresentationModel::Search");\r
-       return r;\r
-\r
-CATCH:\r
-       return r;\r
-\r
-}\r
-\r
-Tizen::Base::Object*\r
-SearchPresentationModel::Run(void)\r
-{\r
-       AppLogDebug("Enter:SearchPresentationModel::Run");\r
-       result r = E_FAILURE;\r
-       __searchToStop = false;\r
-\r
-       if (__folderToSearch.IsEmpty() == false)\r
-       {\r
-               r = Search();\r
-       }\r
-       return null;\r
+       while (__pFolderEntryStack->GetCount() > 0);\r
 \r
-}\r
-bool\r
-SearchPresentationModel::OnStart(void)\r
-{\r
-       AppLogDebug("Enter:SearchPresentationModel::OnStart");\r
-       return true;\r
-}\r
-\r
-void\r
-SearchPresentationModel::OnStop(void)\r
-{\r
-       AppLogDebug("Enter:SearchPresentationModel::OnStop");\r
-       result r = E_FAILURE;\r
-       Tizen::Base::Collection::ArrayList* pSearchCompleteMessage = null;\r
-       if (!IsFailed(GetLastResult()))\r
-       {\r
-               pSearchCompleteMessage = new (std::nothrow) ArrayList();\r
-               TryCatch(pSearchCompleteMessage != null, , "SearchPresentationModel::Run::Failed to allocate Memory to pSearchCompleteMessage");\r
-\r
-               r = pSearchCompleteMessage->Construct();\r
-               TryCatch(r == E_SUCCESS, , "SearchPresentationModel::Run::Failed to Construct pFinalListToBeSent");\r
-\r
-               pSearchCompleteMessage->Add(new (std::nothrow) Integer(ID_SEARCH_COMPLETED));\r
-\r
-               Application::GetInstance()->SendUserEvent(ID_SEARCH_COMPLETED, pSearchCompleteMessage);\r
-\r
-       }\r
-       AppLogDebug("Exit:SearchPresentationModel::OnStop");\r
        return;\r
-\r
 CATCH:\r
-       if (pSearchCompleteMessage)\r
+\r
+       if (__pFolderEntryStack != null)\r
        {\r
-               delete pSearchCompleteMessage;\r
+               __pFolderEntryStack->RemoveAll(true);\r
        }\r
-       AppLogDebug("SearchPresentationModel::OnStop--");\r
-       return;\r
-\r
-}\r
-\r
-void\r
-SearchPresentationModel::StopSearch(void)\r
-{\r
-       AppLogDebug("Enter:SearchPresentationModel::StopSearch");\r
-       __searchToStop = true;\r
 }\r
index 3e0c9eb..55cafa5 100644 (file)
@@ -96,22 +96,11 @@ SplitPanelFileManageForm::OnInitializing(void)
 
        //initialize presentation models
        _currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
-       if (_pFolderEntryPM == null)
-       {
-               AppLogDebug("Creating new PM");
-               _pFolderEntryPM = new (std::nothrow) FolderEntryPresentationModel();
-               AppAssert(_pFolderEntryPM != null);
-               r = _pFolderEntryPM->Construct();
-               AppAssert(r==E_SUCCESS);
-               _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-       }
-       //_pFolderEntryPM->SetFolderEntryPath(_currentDirectoryPath);
-       _pFilenames = _pFolderEntryPM->GetFolderEntryList();
+
        //initialize itemproviders
        _pBaseItemProvider = new (std::nothrow) BaseItemProvider();
        _pBaseItemProvider->Construct();
        _pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-       _pBaseItemProvider->SetFolderEntryProvider(this);
 
        //initialize pm, item provider and listner for directory tree
        __pDirectoryTreePM = new (std::nothrow) FolderEntryPresentationModel();
@@ -149,12 +138,19 @@ SplitPanelFileManageForm::OnInitializing(void)
        CreateFileProgressingPopup();
        CreateDeleteConfirmationPopUp();
 
+       __pSplitPanel = new (std::nothrow) SplitPanel();
+       __pSplitPanel->Construct(clientBounds, SPLIT_PANEL_DIVIDER_STYLE_MOVABLE, SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL );
+       __pSplitPanel->AddSplitPanelEventListener(*this);
+       __pSplitPanel->SetDividerPosition(GetClientAreaBounds().width / 3);
+
+       int dividerPosition = 0;
+       dividerPosition = __pSplitPanel->GetDividerPosition();
        //create panel
        __pFirstPanePanel = new (std::nothrow) Panel();
-       __pFirstPanePanel->Construct(Rectangle(0,0,GetClientAreaBounds().width, GetClientAreaBounds().height), GROUP_STYLE_NONE);
+       __pFirstPanePanel->Construct(Rectangle(0,0,dividerPosition, GetClientAreaBounds().height), GROUP_STYLE_NONE);
 
        __pSecondPanePanel = new (std::nothrow) Panel();
-       __pSecondPanePanel->Construct(Rectangle(0,0,GetClientAreaBounds().width, GetClientAreaBounds().height), GROUP_STYLE_NONE);
+       __pSecondPanePanel->Construct(Rectangle(dividerPosition + 13,0,GetClientAreaBounds().width - dividerPosition - 13, GetClientAreaBounds().height), GROUP_STYLE_NONE);
 
        __pDirTreeListView = new (std::nothrow) ListView();
        __pDirTreeListView->Construct(Rectangle(__pFirstPanePanel->GetBounds()), true, false);
@@ -209,10 +205,6 @@ SplitPanelFileManageForm::OnInitializing(void)
                _pEditListView->SetShowState(false);
        }
 
-       __pSplitPanel = new (std::nothrow) SplitPanel();
-       __pSplitPanel->Construct(clientBounds, SPLIT_PANEL_DIVIDER_STYLE_MOVABLE, SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL );
-       __pSplitPanel->AddSplitPanelEventListener(*this);
-       __pSplitPanel->SetDividerPosition(GetClientAreaBounds().width / 3);
        __pSplitPanel->SetPane(__pFirstPanePanel, SPLIT_PANEL_PANE_ORDER_FIRST);
        __pSplitPanel->SetPane(__pSecondPanePanel, SPLIT_PANEL_PANE_ORDER_SECOND);
 
@@ -226,8 +218,8 @@ SplitPanelFileManageForm::OnTerminating(void)
 {
        AppLogDebug("ENTER");
 
-       delete _pFolderEntryPM;
-       _pFolderEntryPM = null;
+/*     delete _pFolderEntryPM;
+       _pFolderEntryPM = null;*/
        RemoveFooter();
 
        return E_SUCCESS;
@@ -276,7 +268,6 @@ SplitPanelFileManageForm::OnDividerPositionChanged(SplitPanel& source, int posit
        int dividerPosition;
 
        dividerPosition = source.GetDividerPosition();
-       AppLogDebug("Divider Position = %d", dividerPosition);
 
        if (__pFirstPanePanel != null)
        {
@@ -295,6 +286,10 @@ SplitPanelFileManageForm::OnDividerPositionChanged(SplitPanel& source, int posit
        {
                _pEditIconListView->SetBounds(Rectangle(0, 0, __pSecondPanePanel->GetWidth(), __pSecondPanePanel->GetHeight()));
        }
+       if (__pDirTreeListView != null)
+       {
+               __pDirTreeListView->SetBounds(Rectangle(0, 0, __pFirstPanePanel->GetWidth(), __pFirstPanePanel->GetHeight()));
+       }
        __pFirstPanePanel->Invalidate(true);
        __pSecondPanePanel->Invalidate(true);
 
@@ -444,6 +439,8 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
        int listViewDisplayType = VIEW_TYPE_AS_NORMAL_LIST;
        String viewStyleKeyName(L"ListDisplayType");
 
+       DirectoryEntry* pRootDirectory = new DirectoryEntry();
+
        pAppResource = UiApp::App::GetInstance()->GetAppResource();
 
        ((MyFilesApp*) Application::GetInstance())->SetCurrentView(this);
@@ -456,6 +453,14 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
        {
                _pMoreContextMenu->SetShowState(false);
        }
+
+       pcurrentFolderEntryPM = static_cast<FolderEntryPresentationModel *>(pArgs->GetAt(1));
+       TryCatch(pcurrentFolderEntryPM != null, , "FolderEntryPM is null");
+
+       _pFolderEntryPM = pcurrentFolderEntryPM;
+       _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
+       _pBaseItemProvider->SetFolderEntryProvider(this);
+
        if (previousSceneId == IDSCN_SPLIT_PANEL_FORM)
        {
                _currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
@@ -481,72 +486,36 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
                        _pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_SHARE_FORM);
                }
 
-       _pEditListView->SetItemProvider(*_pBaseItemProvider);
-       pHeader = GetHeader();
-
-       if (pHeader != null)
-       {
-               pHeader->SetTitleText(headerText);
-               pHeader->Invalidate(true);
-       }
-       ToggleFooter();
-
+               _pEditListView->SetItemProvider(*_pBaseItemProvider);
+               pHeader = GetHeader();
        }
-       else if (previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
+       else if (pArgs != null && previousSceneId != IDSCN_CREATE_FOLDER_FORM)
        {
-               if (pArgs != null)
-               {
-                       pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
-                       _editOrShare = pEditOrShare->ToInt();
+               pEditOrShare = static_cast<Integer *>(pArgs->GetAt(0));
+               _editOrShare = pEditOrShare->ToInt();
 
-                       if (_editOrShare == FILE_MANAGE_EDIT)
-                       {
-                               if (pAppResource != null)
-                               {
-                                       pAppResource->GetString(L"IDS_MF_SK3_EDIT", headerText);
-                               }
-                       }
-                       else
+               if (_editOrShare == FILE_MANAGE_EDIT)
+               {
+                       if (pAppResource != null)
                        {
-                               if (pAppResource != null)
-                               {
-                                       pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", headerText);
-                               }
+                               pAppResource->GetString(L"IDS_MF_SK3_EDIT", headerText);
                        }
-                       pcurrentFolderEntryPM = static_cast<FolderEntryPresentationModel *>(pArgs->GetAt(1));
                }
-               if (pcurrentFolderEntryPM != null)
+               else
                {
-                       if (_pFolderEntryPM != null)
+                       if (pAppResource != null)
                        {
-                               delete _pFolderEntryPM;
-                               _pFolderEntryPM = null;
+                               pAppResource->GetString(L"IDS_COM_BUTTON_SHARE", headerText);
                        }
-                       _pFolderEntryPM = pcurrentFolderEntryPM;
-                       _pFolderEntryPM->SetSourceForm(CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM);
-                       _pBaseItemProvider->SetFolderEntryProvider(this);
-               }
-
-               _pBaseItemProvider->SetSourceForm(CREATE_ITEM_SOURCE_FILE_MANAGE_FORM);
-               _pEditListView->SetItemProvider(*_pBaseItemProvider);
-
-               pHeader = GetHeader();
-               if (pHeader != null)
-               {
-                       pHeader->SetTitleText(headerText);
-                       pHeader->Invalidate(true);
                }
-               ToggleFooter();
        }
-       else
+       _pFilenames = _pFolderEntryPM->GetFolderEntryList();
+       if (pHeader != null)
        {
-               _currentDirectoryPath = FolderNavigationPresentationModel::GetCurrentPath();
-               if (_pFolderEntryPM != null)
-               {
-                       _pFolderEntryPM->SetFolderEntryPath(_currentDirectoryPath);
-                       _pFilenames = _pFolderEntryPM->GetFolderEntryList();
-               }
+               pHeader->SetTitleText(headerText);
+               pHeader->Invalidate(true);
        }
+       ToggleFooter();
        //update footer
        if (_pFilenames->GetCount() == 0)
        {
@@ -557,7 +526,7 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
                SetFooterVisibility(1);
        }
        //update directorytree
-       DirectoryEntry* pRootDirectory = new DirectoryEntry();
+
        switch (FolderNavigationPresentationModel::GetStorageType())
        {
        case MEMORY_TYPE_PHONE:
@@ -598,6 +567,11 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
                __pDirTreeListView->UpdateList();
        }
 
+       if (_pEditListView != null)
+       {
+               _pEditListView->UpdateList();
+       }
+
        _pFolderEntryPM->InitThumbnailManager();
        __pFirstPanePanel->Invalidate(true);
        __pSecondPanePanel->Invalidate(true);
@@ -606,13 +580,10 @@ SplitPanelFileManageForm::OnSceneActivatedN(const SceneId& previousSceneId, cons
        {
                _pFileManager->SetFileManagingListener(this);
        }
-/*     if (pArgs != null)
-       {
-               pArgs->RemoveAll(false);
-               delete pArgs;
-       }*/
        AppLogDebug("EXIT");
        return;
+       CATCH:
+       return;
 }
 
 void SplitPanelFileManageForm::ConstructDirTreeList(String rootMediaPath)
@@ -681,7 +652,7 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
                                _pFileManager->ClearCheckedList();
                        }
                }
-               if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
+               /*if (previousSceneId != IDSCN_CATEGORY_SEARCH_FORM)
                {
                if (_pFolderEntryPM != null)
                {
@@ -694,8 +665,8 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
                else if (previousSceneId == IDSCN_CATEGORY_SEARCH_FORM)
                {
                        _pFilenames = _pFolderEntryPM->GetFolderEntryList();
-               }
-
+               }*/
+               _pFilenames = _pFolderEntryPM->GetFolderEntryList();
                if (_pLabelNumberOfItems != null)
                {
                        _pLabelNumberOfItems->SetShowState(false);
@@ -710,8 +681,8 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
                }
                else
                {
-               if (_pFolderEntryPM != null)
-               {
+                       if (_pFolderEntryPM != null)
+                       {
                        _pFolderEntryPM->GetFolderEntryCount(_currentDirectoryPath, _folderCount, _fileCount);
                        }
                }
@@ -834,14 +805,12 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
                if (_pEditIconListView != null && _pEditIconListView->IsVisible())
                {
                        _pEditIconListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height  - H_DISPLAY_PATH_LABEL));
-
                        _pEditIconListView->Invalidate(true);
                }
 
                if (_pEditListView != null && _pEditListView->IsVisible())
                {
                        _pEditListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height  - H_DISPLAY_PATH_LABEL));
-
                        _pEditListView->Invalidate(true);
                }
        }
@@ -850,14 +819,12 @@ SplitPanelFileManageForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::S
                if (_pEditIconListView != null && _pEditIconListView->IsVisible())
                {
                        _pEditIconListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height));
-
                        _pEditIconListView->Invalidate(true);
                }
 
                if (_pEditListView != null && _pEditListView->IsVisible())
                {
                        _pEditListView->SetBounds(Rectangle(X_DEFAULT, Y_DEFAULT, GetClientAreaBounds().width, GetClientAreaBounds().height));
-
                        _pEditListView->Invalidate(true);
                }
        }
index 810013c..261ee45 100644 (file)
@@ -369,6 +369,10 @@ SplitPanelForm::OnDividerPositionChanged(SplitPanel& source, int position)
        {
                _pIconListView->SetBounds(Rectangle(0, 0, __pSecondPanePanel->GetWidth(), __pSecondPanePanel->GetHeight()));
        }
+       if (__pDirTreeListView != null)
+       {
+               __pDirTreeListView->SetBounds(Rectangle(0, 0, __pFirstPanePanel->GetWidth(), __pFirstPanePanel->GetHeight()));
+       }
        __pFirstPanePanel->Invalidate(true);
        __pSecondPanePanel->Invalidate(true);
 
index 6bb3f59..a2105fd 100644 (file)
@@ -519,7 +519,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
 {
        AppLogDebug("Entry");
 
-       int itemcount = 0;
        int selectedItemsCount = 0;
        int fileCount = 0;
        int folderCount = 0;
@@ -536,7 +535,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
                pAppResource->GetString(L"IDS_COM_BODY_SELECTED", selected);
        }
 
-
        _renameItemIndex = index;
 
        if (elementId == CONTENT_LIST_ITEM_TYPE_RENAME || elementId == DETAILED_LIST_ELEMENTS_RENAME)
@@ -559,6 +557,15 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
                _renameItemIndex = INVALID_LIST_INDEX;
        }
 
+       pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
+       TryCatch(pCheckedEntry != null,, "Failed to retieve Directory Entry from ArrayList");
+
+       if (_editOrShare == FILE_MANAGE_SHARE && pCheckedEntry->IsDirectory())
+       {
+               listView.SetItemChecked(index, false);
+               return;
+       }
+
        if (_pLabelNumberOfItems != null)
        {
                _pLabelNumberOfItems->SetShowState(true);
@@ -573,7 +580,6 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
        }
        else
        {
-               pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
                if (_editOrShare == FILE_MANAGE_SHARE)
                {
                        if (! pCheckedEntry->IsDirectory())
@@ -688,6 +694,8 @@ SubBaseFileManageForm::SubBaseOnListViewItemStateChanged(ListView& listView, int
        AppLogDebug("Exit %s", GetErrorMessage(GetLastResult()));
        return;
 
+       CATCH:
+       return;
 }
 
 
@@ -1043,6 +1051,15 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 
        itemIndex = index;
 
+       pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
+       TryCatch(pCheckedEntry != null, , "Failed to retrieve the directory entry for this index.");
+
+       if (_editOrShare == FILE_MANAGE_SHARE && pCheckedEntry->IsDirectory())
+       {
+               iconListView.SetItemChecked(index, false);
+               return;
+       }
+
        //Set ShowState of the Label Displaying Selected Count as true
        if (_pLabelNumberOfItems != null)
        {
@@ -1057,8 +1074,6 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
        }
        else
        {
-               pCheckedEntry = static_cast< DirectoryEntry* >(_pFilenames->GetAt(index));
-
                if (_editOrShare == FILE_MANAGE_SHARE)
                {
                        if (!pCheckedEntry->IsDirectory())
@@ -1121,6 +1136,10 @@ SubBaseFileManageForm::SubBaseOnIconListViewItemStateChanged(Tizen::Ui::Controls
 
        AppLogDebug("Exit %s", GetErrorMessage(r));
        return;
+
+CATCH:
+       return;
+
 }
 
 
index 109c6b3..e9ffd24 100644 (file)
@@ -709,14 +709,43 @@ SubBaseSelection::OnPlayerAudioFocusChanged (void)
 void\r
 SubBaseSelection::OnFormBackRequested(Form& source)\r
 {\r
-       MyFilesApp* pApp = (MyFilesApp*) Application::GetInstance();\r
-       ((MyFilesApp*) Application::GetInstance())->SetAppControlSelected();\r
-       ((MyFilesApp*) Application::GetInstance())->AddAppControlResult(APP_CTRL_RESULT_CANCELED);\r
-       if (pApp != null)\r
+       String currentPath;\r
+       String parentPath;\r
+       result r = E_SUCCESS;\r
+       SceneManager* pSceneManager = null;\r
+       pSceneManager = SceneManager::GetInstance();\r
+       currentPath = FolderNavigationPresentationModel::GetCurrentPath();\r
+       if (currentPath == BasePresentationModel::GetMediaPath() || currentPath == BasePresentationModel::GetSdCardPath())\r
        {\r
-               pApp->Terminate();\r
+               FolderNavigationPresentationModel::SetCurrentFilePath(currentPath);\r
+               ShowHomeView();\r
        }\r
-       return;\r
-}\r
+       else\r
+       {\r
+               parentPath = FolderNavigationPresentationModel::GetParentPath();\r
 \r
+               FolderNavigationPresentationModel::SetCurrentFilePath(parentPath);\r
+               r = pSceneManager->GoForward(ForwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), null);\r
+       }\r
+}\r
 \r
+void\r
+SubBaseSelection::ShowHomeView(void)\r
+{\r
+       SceneManager* pSceneManager = null;\r
+       String topMostFileSelection(L"ScnTempForm");\r
+       pSceneManager = SceneManager::GetInstance();\r
+       if (pSceneManager != null)\r
+       {\r
+               IList* pArgs = new (std::nothrow) ArrayList();\r
+               pArgs->Add(new (std::nothrow) Integer(APPCONTROL_STATE_SELECTED));\r
+               if (pSceneManager->IsSceneAlive(topMostFileSelection))\r
+               {\r
+                       pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_DESTROY_OPTION_DESTROY), pArgs);\r
+               }\r
+               else\r
+               {\r
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgs);\r
+               }\r
+       }\r
+}\r
index c9f0b2d..6c908e0 100644 (file)
@@ -1303,7 +1303,7 @@ SubFolderMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                String storageFull;
                AppResource* pAppResource = null;
                pAppResource = Application::GetInstance()->GetAppResource();
-               pAppResource->GetString("IIDS_STORAGE_FULL", storageFull);
+               pAppResource->GetString("IDS_STORAGE_FULL", storageFull);
 
                HideFileProgressingPopup();
                MessageBox messageBox;
index 81ab362..60f8de0 100644 (file)
@@ -702,40 +702,6 @@ CATCH:
 }\r
 \r
 void\r
-SubFolderSelection::ShowHomeView(void)\r
-{\r
-       SceneManager* pSceneManager = null;\r
-       String topMostFileSelection(L"ScnTempForm");\r
-\r
-/*     String homeRootPath;\r
-       homeRootPath.Append(_rootMediaPath);\r
-\r
-       while ((homeRootPath != BasePresentationModel::GetMediaPath()) && (homeRootPath != BasePresentationModel::GetSdCardPath()))\r
-       {\r
-               FolderNavigationPresentationModel::SetCurrentFilePath(homeRootPath);\r
-               homeRootPath.Clear();\r
-               homeRootPath = FolderNavigationPresentationModel::GetParentPath();\r
-       }\r
-\r
-       FolderNavigationPresentationModel::SetCurrentFilePath(homeRootPath);*/\r
-\r
-       pSceneManager = SceneManager::GetInstance();\r
-       if (pSceneManager != null)\r
-       {\r
-               IList* pArgs = new (std::nothrow) ArrayList();\r
-               pArgs->Add(new (std::nothrow) Integer(APPCONTROL_STATE_SELECTED));\r
-               if (pSceneManager->IsSceneAlive(topMostFileSelection))\r
-               {\r
-                       pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_DESTROY_OPTION_DESTROY), pArgs);\r
-               }\r
-               else\r
-               {\r
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TEMP_FORM, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgs);\r
-               }\r
-       }\r
-}\r
-\r
-void\r
 SubFolderSelection::SetParentDisplayPath(void)\r
 {\r
        String dislayPath;\r
index d52cf8a..c80e913 100644 (file)
@@ -273,6 +273,8 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
        fileName = pDirStr->GetFileName();
        pAppRegistry->Get(__extensionKeyName, fileExtension);
 
+       cacheImagePath = pDirStr->GetFullFilePath();
+
        if (fileExtension == __showExtension && !pDirStr->IsDirectory())
        {
                if (!pDirStr->GetFileExtension().IsEmpty())
@@ -358,7 +360,8 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
        pItem = new (std::nothrow) IconListViewItem();
        r = pItem->Construct(*pListBitmap, &fileName);
 
-       if (__pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm() == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM)
+       source = __pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm();
+       if (source == CREATE_ITEM_SOURCE_FILE_MANAGE_FORM || source == CREATE_ITEM_SOURCE_SPLIT_PANEL_FILE_MANAGE_FORM)
        {
                Bitmap* __pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
                if (__pRenameBitmap != null)
@@ -369,13 +372,13 @@ ThumbnailItemProviderAndListener::CreateItem(int index)
 
        }
 
-       if (__pProviderPM->GetFolderEntryPresentationModel()->GetSourceForm() == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
+       if (source == CREATE_ITEM_SOURCE_CATEGORY_SEARCH_FORM)
        {
-               Bitmap* __pRenameBitmap = MfUtility::MergeBitmapN(IDB_RENAME_OUTER_CIRCLE, IDB_RENAME, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
-               if (__pRenameBitmap != null)
+               Bitmap* pGotoLocation = MfUtility::MergeBitmapN(IDB_CATEGORY_GO_TO_LOCATION_BG, IDB_CATEGORY_GO_TO_LOCATION, ICON_LISTVIEW_RENAME_BOTTON_WIDTH, ICON_LISTVIEW_RENAME_BOTTON_HEIGHT);
+               if (pGotoLocation != null)
                {
-                       pItem->SetOverlayBitmap(OVERLAYITEM_RENAME,__pRenameBitmap, ALIGNMENT_LEFT, ALIGNMENT_BOTTOM);
-                       delete __pRenameBitmap;
+                       pItem->SetOverlayBitmap(OVERLAYITEM_RENAME,pGotoLocation, ALIGNMENT_LEFT, ALIGNMENT_BOTTOM);
+                       delete pGotoLocation;
                }
        }
        if (pDirStr->IsDirectory() || bLoadBitmap)
index dcd4885..7510aac 100644 (file)
@@ -647,7 +647,18 @@ TopLevelFolderFileListForm::OnFormBackRequested(Form& source)
        }
        else
        {
-               UiApp::GetInstance()->Terminate();
+               MyFilesApp* pApp = (MyFilesApp*) Application::GetInstance();
+
+               if (__appControlRequest)
+               {
+                       ((MyFilesApp*) Application::GetInstance())->SetAppControlSelected();
+                       ((MyFilesApp*) Application::GetInstance())->AddAppControlResult(APP_CTRL_RESULT_CANCELED);
+               }
+
+               if (pApp != null)
+               {
+                       pApp->Terminate();
+               }
                return;
        }
 }
index acc8eb6..65e8615 100644 (file)
@@ -127,18 +127,6 @@ const wchar_t* IDB_HTML = L"U01_icon_html.png";
 const wchar_t* IDB_UNKNOWN = L"U01_icon_unkown.png";\r
 \r
 //Category Icon\r
-/*const wchar_t* IDB_CATEGORY_ICON_BG = L"U01_category_bg.png";\r
-const wchar_t* IDB_CATEGORY_ICON_BG_PRESS = L"U01_category_bg_press.png";\r
-const wchar_t* IDB_CATEGORY_IMAGE_ICON = L"U01_category_icon_image.png";\r
-const wchar_t* IDB_CATEGORY_IMAGE_ICON_PRESS = L"U01_category_icon_image_press.png";\r
-const wchar_t* IDB_CATEGORY_VIDEO_ICON = L"U01_category_icon_video.png";\r
-const wchar_t* IDB_CATEGORY_VIDEO_ICON_PRESS = L"U01_category_icon_video_press.png";\r
-const wchar_t* IDB_CATEGORY_SOUND_ICON = L"U01_category_icon_sound.png";\r
-const wchar_t* IDB_CATEGORY_SOUND_ICON_PRESS = L"U01_category_icon_sound_press.png";\r
-const wchar_t* IDB_CATEGORY_DOCUMENT_ICON = L"U01_category_icon_document.png";\r
-const wchar_t* IDB_CATEGORY_DOCUMENT_ICON_PRESS = L"U01_category_icon_document_press.png";\r
-const wchar_t* IDB_CATEGORY_OTHERS_ICON = L"U01_category_icon_others.png";\r
-const wchar_t* IDB_CATEGORY_OTHERS_ICON_PRESS = L"U01_category_icon_others_press.png";*/\r
 const wchar_t* IDB_POPUP_SORTBY_ICON = L"U01_popup_icon_sort_by.png";\r
 const wchar_t* IDB_POPUP_SEARCH_ICON = L"U01_popup_icon_Search.png";\r
 const wchar_t* IDB_POPUP_CREATE_FOLDER_ICON = L"U01_popup_icon_Create_folder.png";\r
@@ -157,6 +145,13 @@ const wchar_t* IDB_CATEGORY_DOCUMENT_ICON = L"U01_category_icon_document.png";
 const wchar_t* IDB_CATEGORY_DOCUMENT_ICON_PRESS = L"U01_category_icon_document_press.png";\r
 const wchar_t* IDB_CATEGORY_OTHERS_ICON = L"U01_category_icon_others.png";\r
 const wchar_t* IDB_CATEGORY_OTHERS_ICON_PRESS = L"U01_category_icon_others_press.png";\r
+\r
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION = L"00_button_right_ef.png";\r
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_PRESSED = L"00_button_right.png";\r
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG = L"U01_circle_button.png";\r
+const wchar_t* IDB_CATEGORY_GO_TO_LOCATION_BG_PRESSED = L"U01_circle_button_press.png";\r
+\r
+//\r
 //Share Context MEnu\r
 const wchar_t* IDB_POPUP_MESSAGE_ICON =  L"U01_popup_icon_Message.png";\r
 const wchar_t* IDB_POPUP_EMAIL_ICON = L"U01_popup_icon_email.png";\r
@@ -197,7 +192,7 @@ const int INVALID_LIST_INDEX = -1;
 const int ENABLE_FOOTER_ITEM = 1;\r
 const int DISABLE_FOOTER_ITEM = 0;\r
 \r
-const int W_RENAME_ICON = 64;\r
+const int W_RENAME_ICON = 72;\r
 const int H_LISTVIEW_ITEM_TITLE = 60;\r
 const int H_LISTVIEW_ITEM_DESCRIPTION = 48;\r
 \r