merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:21 +0000 (01:04 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:21 +0000 (01:04 +0900)
59 files changed:
NOTICE [moved from NOTICE.Flora with 65% similarity]
data/CMakeLists.txt
data/edc_common.h
data/icon/myfile_icon_category_bg.png [deleted file]
data/icon/myfile_icon_category_bg_press.png [deleted file]
data/icon/myfile_icon_category_document.png [deleted file]
data/icon/myfile_icon_category_document_press.png [deleted file]
data/icon/myfile_icon_category_image.png [deleted file]
data/icon/myfile_icon_category_image_press.png [deleted file]
data/icon/myfile_icon_category_others.png [deleted file]
data/icon/myfile_icon_category_others_press.png [deleted file]
data/icon/myfile_icon_category_sounds.png [deleted file]
data/icon/myfile_icon_category_sounds_press.png [deleted file]
data/icon/myfile_icon_category_video.png [deleted file]
data/icon/myfile_icon_category_video_press.png [deleted file]
data/icon/myfile_icon_control_pause.png [deleted file]
data/icon/myfile_icon_shortcut_default_corner.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_document.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_document_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_image.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_image_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_others.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_others_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_sound.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_sound_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_video.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_video_press.png [new file with mode: 0644]
data/image/myfile_icon_shortcut_default_corner.png [new file with mode: 0644]
data/myfile.edc
data/po/CMakeLists.txt
packaging/org.tizen.myfile.spec [changed mode: 0755->0644]
src/common/file-system/mf-file-attr.c
src/common/mf-callback.c
src/common/mf-fm-svc-wrapper.c
src/common/mf-launch.c
src/common/mf-media-content.c
src/common/mf-otg.c
src/common/mf-share.c
src/common/mf-util.c
src/include/mf-callback.h
src/include/mf-dlog.h
src/include/mf-fm-svc-wrapper.h
src/include/mf-fs-util.h
src/include/mf-gengrid.h
src/include/mf-main.h
src/include/mf-resource.h
src/include/mf-tray-item.h
src/include/mf-util.h
src/include/mf-widget.h
src/mf-main.c
src/widget/mf-context-popup.c
src/widget/mf-gengrid.c
src/widget/mf-genlist.c
src/widget/mf-navi-bar.c
src/widget/mf-popup.c
src/widget/mf-search-bar.c
src/widget/mf-split-view.c
src/widget/mf-tray-item.c
src/widget/mf-widget.c

similarity index 65%
rename from NOTICE.Flora
rename to NOTICE
index 3997999..f37f329 100644 (file)
+++ b/NOTICE
@@ -1,4 +1,4 @@
 Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE file for Flora License terms and conditions.
+Please, see the LICENSE.Flora file for Flora License terms and conditions.
 
index 34259b8..f582af6 100644 (file)
@@ -1,6 +1,6 @@
 
 ADD_CUSTOM_TARGET(myfile.edj
-               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/icon
+               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/image
                ${CMAKE_SOURCE_DIR}/data/myfile.edc ${CMAKE_BINARY_DIR}/data/myfile.edj
                DEPENDS ${CMAKE_SOURCE_DIR}/data/myfile.edc
 )
index d4b5c9f..74bd586 100644 (file)
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#define SHORTCUT_W 720
+#define SHORTCUT_H 96
+#define SHORTCUT_ADD 130
+#define SHORTCUT_IMG_ORI 64
+#define SHORTCUT_IMG_ORI_Y 12 
+#define SHORTCUT_BLINE 164
+#define SHORTCUT_WLINE 165
+#define SHORTCUT_Y 23
 
 
 #define BASIC_W                                480
diff --git a/data/icon/myfile_icon_category_bg.png b/data/icon/myfile_icon_category_bg.png
deleted file mode 100644 (file)
index d1e21e7..0000000
Binary files a/data/icon/myfile_icon_category_bg.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_bg_press.png b/data/icon/myfile_icon_category_bg_press.png
deleted file mode 100644 (file)
index 1ce946c..0000000
Binary files a/data/icon/myfile_icon_category_bg_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_document.png b/data/icon/myfile_icon_category_document.png
deleted file mode 100644 (file)
index c5cd54c..0000000
Binary files a/data/icon/myfile_icon_category_document.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_document_press.png b/data/icon/myfile_icon_category_document_press.png
deleted file mode 100644 (file)
index 3014451..0000000
Binary files a/data/icon/myfile_icon_category_document_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_image.png b/data/icon/myfile_icon_category_image.png
deleted file mode 100644 (file)
index 056d868..0000000
Binary files a/data/icon/myfile_icon_category_image.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_image_press.png b/data/icon/myfile_icon_category_image_press.png
deleted file mode 100644 (file)
index 72fe9e7..0000000
Binary files a/data/icon/myfile_icon_category_image_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_others.png b/data/icon/myfile_icon_category_others.png
deleted file mode 100644 (file)
index 0e56d92..0000000
Binary files a/data/icon/myfile_icon_category_others.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_others_press.png b/data/icon/myfile_icon_category_others_press.png
deleted file mode 100644 (file)
index c91e5b7..0000000
Binary files a/data/icon/myfile_icon_category_others_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_sounds.png b/data/icon/myfile_icon_category_sounds.png
deleted file mode 100644 (file)
index cff2df8..0000000
Binary files a/data/icon/myfile_icon_category_sounds.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_sounds_press.png b/data/icon/myfile_icon_category_sounds_press.png
deleted file mode 100644 (file)
index 48d6197..0000000
Binary files a/data/icon/myfile_icon_category_sounds_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_video.png b/data/icon/myfile_icon_category_video.png
deleted file mode 100644 (file)
index fba0dac..0000000
Binary files a/data/icon/myfile_icon_category_video.png and /dev/null differ
diff --git a/data/icon/myfile_icon_category_video_press.png b/data/icon/myfile_icon_category_video_press.png
deleted file mode 100644 (file)
index 3c9605b..0000000
Binary files a/data/icon/myfile_icon_category_video_press.png and /dev/null differ
diff --git a/data/icon/myfile_icon_control_pause.png b/data/icon/myfile_icon_control_pause.png
deleted file mode 100644 (file)
index 56943c0..0000000
Binary files a/data/icon/myfile_icon_control_pause.png and /dev/null differ
diff --git a/data/icon/myfile_icon_shortcut_default_corner.png b/data/icon/myfile_icon_shortcut_default_corner.png
new file mode 100644 (file)
index 0000000..9e1a8e3
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_default_corner.png differ
diff --git a/data/icon/myfile_icon_shortcut_document.png b/data/icon/myfile_icon_shortcut_document.png
new file mode 100644 (file)
index 0000000..fe02aa0
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_document.png differ
diff --git a/data/icon/myfile_icon_shortcut_document_press.png b/data/icon/myfile_icon_shortcut_document_press.png
new file mode 100644 (file)
index 0000000..5125c91
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_document_press.png differ
diff --git a/data/icon/myfile_icon_shortcut_image.png b/data/icon/myfile_icon_shortcut_image.png
new file mode 100644 (file)
index 0000000..f827415
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_image.png differ
diff --git a/data/icon/myfile_icon_shortcut_image_press.png b/data/icon/myfile_icon_shortcut_image_press.png
new file mode 100644 (file)
index 0000000..1417787
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_image_press.png differ
diff --git a/data/icon/myfile_icon_shortcut_others.png b/data/icon/myfile_icon_shortcut_others.png
new file mode 100644 (file)
index 0000000..2fb934a
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_others.png differ
diff --git a/data/icon/myfile_icon_shortcut_others_press.png b/data/icon/myfile_icon_shortcut_others_press.png
new file mode 100644 (file)
index 0000000..a4c7c19
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_others_press.png differ
diff --git a/data/icon/myfile_icon_shortcut_sound.png b/data/icon/myfile_icon_shortcut_sound.png
new file mode 100644 (file)
index 0000000..019a2fb
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_sound.png differ
diff --git a/data/icon/myfile_icon_shortcut_sound_press.png b/data/icon/myfile_icon_shortcut_sound_press.png
new file mode 100644 (file)
index 0000000..2125ea9
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_sound_press.png differ
diff --git a/data/icon/myfile_icon_shortcut_video.png b/data/icon/myfile_icon_shortcut_video.png
new file mode 100644 (file)
index 0000000..b135ba8
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_video.png differ
diff --git a/data/icon/myfile_icon_shortcut_video_press.png b/data/icon/myfile_icon_shortcut_video_press.png
new file mode 100644 (file)
index 0000000..27a22c5
Binary files /dev/null and b/data/icon/myfile_icon_shortcut_video_press.png differ
diff --git a/data/image/myfile_icon_shortcut_default_corner.png b/data/image/myfile_icon_shortcut_default_corner.png
new file mode 100644 (file)
index 0000000..9e1a8e3
Binary files /dev/null and b/data/image/myfile_icon_shortcut_default_corner.png differ
index 7122d5b..ac5adfa 100644 (file)
@@ -30,6 +30,7 @@
 #define BEAT_POPUP_PART_DISCLIP \
                        part { name: "disclip"; \
                                type: RECT; \
+                               scale: 1;\
                                description { state: "default" 0.0; \
                                   rel1.to: "bg"; \
                                   rel2.to: "bg"; \
@@ -44,6 +45,7 @@
             type: RECT; \
             clip_to: "disclip"; \
             mouse_events: 0; \
+       scale: 1;\
             description { state: "default" 0.0; \
                color: 246 245 237 255; \
             } \
          }
 
 
+
+images {
+
+       image, "myfile_icon_shortcut_default_corner.png" COMP;
+
+}
+
 collections {
 
        /** fore genlist normal_item feature icon**/
@@ -195,6 +204,423 @@ collections {
                }
        }
 
+
+
+       /************** 5 myfiles shortcut images ****************/
+       group {
+               name, "myfile_shortcut_5_images";
+
+               parts {
+                       part
+                       {
+                               name:"bg";
+                               type:IMAGE;
+                               scale: 1;
+                               description
+                               {
+                                       state: "default" 0.0;
+                                       min:680 96;
+                                       max:680 96;
+                                       fixed:1 1;
+                                       rel1 { relative: 0.0 0.0; }
+                                       rel2 { relative: 1.0 1.0; }
+                                       image {
+                                               normal, "myfile_icon_shortcut_default_corner.png";
+                                               border, 47 47 0 0;
+                                       }
+                               }
+                       }
+                       
+                       part {
+                                       name, "mf_shortcut_image";
+                                       type, SWALLOW;
+                                       scale: 1;
+                                       mouse_events, 1;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, SHORTCUT_IMG_ORI/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, SHORTCUT_IMG_ORI/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                    
+                                               }                                       
+                                       }
+                                       description 
+                                       {
+                                               state, "clicked" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, SHORTCUT_IMG_ORI/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, SHORTCUT_IMG_ORI/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                    
+                                               }
+                                       }       
+                       }
+
+                       part {
+                                       name, "mf_shortcut_video";
+                                       type, SWALLOW;
+                                       scale: 1;
+                                       mouse_events, 1;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }
+                                       description 
+                                       {
+                                               state, "clicked" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }       
+                       }
+
+                       part {
+                                       name, "mf_shortcut_sound";
+                                       type, SWALLOW;
+                                       scale: 1;
+                                       mouse_events, 1;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }
+                                       description 
+                                       {
+                                               state, "clicked" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0.5 0.5;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }       
+                       }
+
+                       part {
+                                       name, "mf_shortcut_document";
+                                       type, SWALLOW;
+                                       scale: 1;
+                                       mouse_events, 1;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }
+                                       description 
+                                       {
+                                               state, "clicked" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0.5 0.5;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }       
+                       }
+
+                       part {
+                                       name, "mf_shortcut_others";
+                                       type, SWALLOW;
+                                       scale: 1;
+                                       mouse_events, 1;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+4*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+4*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }
+                                       description 
+                                       {
+                                               state, "clicked" 0.0;
+                                               min, 72 72;
+                                               max, 72 72;
+                                               fixed:1 1;
+                                               align, 0.5 0.5;
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_IMG_ORI+4*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_IMG_ORI+4*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_IMG_ORI_Y/SHORTCUT_H;                                                   
+                                               }
+
+                                       }       
+                       }
+
+
+                       part {
+                                       name, "mf_shortcut_1st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               color, 185 184 174 255;                                         
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, SHORTCUT_BLINE/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, SHORTCUT_BLINE/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                      
+                                               }
+                                       }
+                        }
+                        part {
+                                       name, "mf_shortcut_3st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               color, 185 184 174 255;                                         
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_BLINE+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_BLINE+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                       
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_5st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               color, 185 184 174 255;                                         
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_BLINE+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_BLINE+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_7st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               color, 185 184 174 255;                                         
+                                               align, 0 0;
+                                               rel1 {
+                                                       relative, (SHORTCUT_BLINE+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_BLINE+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_2st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               color, 255 255 255 255;
+                                               
+                                               rel1 {
+                                                       relative, SHORTCUT_WLINE/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, SHORTCUT_WLINE/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                      
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_4st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               color, 255 255 255 255;
+                                               
+                                               rel1 {
+                                                       relative, (SHORTCUT_WLINE+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_WLINE+SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                       
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_6st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               color, 255 255 255 255;
+                                               
+                                               rel1 {
+                                                       relative, (SHORTCUT_WLINE+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_WLINE+2*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }
+                       }
+                       part {
+                                       name, "mf_shortcut_8st_vLine";
+                                       type, RECT;
+                                       scale: 1;
+                                       mouse_events, 0;
+                                       description 
+                                       {
+                                               state, "default" 0.0;
+                                               min, 1 50;
+                                               max, 1 50;
+                                               fixed:1 1;
+                                               align, 0 0;
+                                               color, 255 255 255 255;
+                                               
+                                               rel1 {
+                                                       relative, (SHORTCUT_WLINE+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;
+                                               }
+
+                                               rel2 {
+                                                       relative, (SHORTCUT_WLINE+3*SHORTCUT_ADD)/SHORTCUT_W SHORTCUT_Y/SHORTCUT_H;                                                     
+                                               }
+                                       }
+                       }                       
+               }
+
+               programs {
+             program {
+                               name, "button_click";
+                               signal, "mouse,clicked,1";
+                               source, "*";
+                               action, STATE_SET "clicked" 0.0;
+                               target, "mf_shortcut_document";
+             }
+          }
+}
+
+       
+
        /************** progressbar popup****************/
        group { name: "popup_center_progressview";
           parts{
@@ -406,6 +832,7 @@ collections {
                                //clip_to: "disclip";
                                repeat_events: 0;
                                mouse_events: 0;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
                                        color: PATH_INFO_BG_COLOR;
@@ -414,25 +841,6 @@ collections {
                        MF_PART_PADDING_TOP(0)
                        MF_PART_PADDING_BOTTOM( 0 )
                        MF_PART_PADDING_LEFT( 10 )
-                       #if 0
-                       part
-                       {
-                               name: "bottom_line";
-                               type: RECT;
-                               mouse_events: 0;
-                               description { state: "default" 0.0;
-                                       min: 0 1;
-                                       fixed: 0 1;
-                                       visible: 1;
-                                       color: BOTTOM_LINE_COLOR;
-                                       rel1
-                                       {
-                                               relative: 0.0 1.0;
-                                               offset: 0 -1;
-                                       }
-                               }
-                       }
-                       #endif
                      part { name: "info";
                            type: TEXT;
                            scale: 1;
@@ -459,17 +867,6 @@ collections {
                               }
                            }
                         }
-                       #if 0
-                       part
-                       {
-                               name: "disclip";
-                               type: RECT;
-                               description
-                               {
-                                       state: "default" 0.0;
-                               }
-                       }
-                       #endif
                 }
        }
        group
@@ -491,6 +888,7 @@ collections {
                             }
                             part { name: "home";
                                        type: SWALLOW;
+                                       scale: 1;
                                        description { state: "default" 0.0;
                                         rel1.relative: 0.022 0.157;
                                         rel2.relative: 0.489 0.843;
@@ -498,6 +896,7 @@ collections {
                             }
                             part { name: "upper";
                                        type: SWALLOW;
+                                       scale: 1;
                                        description { state: "default" 0.0;
                                         rel1.relative: 0.511 0.157;
                                         rel2.relative: 0.978 0.843;
@@ -527,6 +926,7 @@ collections {
                                name: "bg";
                                type: RECT;
                                clip_to: "disclip";
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
                                        color: 200 200 200 127;
@@ -540,6 +940,7 @@ collections {
                                name: "bottom_line";
                                type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description { state: "default" 0.0;
                                        min: 0 1;
                                        fixed: 0 1;
@@ -584,6 +985,7 @@ collections {
                        {
                                name: "disclip";
                                type: RECT;
+                               scale: 1;
                                description
                                {
                                        state: "default" 0.0;
@@ -628,6 +1030,7 @@ collections {
                        {
                             name: "upper";
                             type: SWALLOW;
+                            scale: 1;
                             description {
                                     state: "default" 0.0;
                                     min: 320 75;
@@ -664,6 +1067,7 @@ collections {
                        {
                             name: "genlist_layout";
                             type: SWALLOW;
+                            scale: 1;
                             description {
                                     state: "default" 0.0;
                                     visible:1;
@@ -708,6 +1112,7 @@ collections {
                        {
                             name: "path_info";
                             type: SWALLOW;
+                            scale: 1;
                             description {
                                     state: "default" 0.0;
                                     min: 320 52;
@@ -728,6 +1133,7 @@ collections {
                        {
                             name: "select_all";
                             type: SWALLOW;
+                            scale: 1;
                             description {
                                     state: "default" 0.0;
                                     min: 320 52;
@@ -748,6 +1154,7 @@ collections {
                        {
                             name: "bottom";
                             type: SWALLOW;
+                            scale: 1;
                             description {
                                     state: "default" 0.0;
                                     min: 320 428;
@@ -1130,6 +1537,7 @@ collections {
                        part {
                                name: "content";
                                type: RECT;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0;}
@@ -1144,6 +1552,7 @@ collections {
                part { name: "background";
                        type: RECT;
                        mouse_events: 0;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
                                rel1 { relative: 0.0 0.0; }
@@ -1154,6 +1563,7 @@ collections {
              part {
                 name: "content";
                 type: SWALLOW;
+                scale: 1;
                 repeat_events: 1;
                 description { state: "default" 0.0;
                    align: 0.5 0.0;
@@ -1165,6 +1575,7 @@ collections {
              part {
                      name: "sel_contents";
                      type: SWALLOW;
+                     scale: 1;
                      description { state: "default" 0.0;
                              fixed: 0 1;
                              align: 0.5 1.0;
@@ -1185,8 +1596,8 @@ collections {
                        mouse_events: 1;
                        description {
                                state: "default" 0.0;
-                               min: MAIN_W 180;
-                               max: MAIN_W 180;
+                               min: MAIN_W 96;
+                               max: MAIN_W 96;
                                fixed: 1 1;
                                rel1 {
                                        relative: 0.0 1.0;
@@ -1226,8 +1637,8 @@ collections {
                        mouse_events: 1;
                        description{
                                state: "default" 0.0;
-                               min: 132 132;
-                               max: 132 132;
+                               min: 72 72;
+                               max: 72 72;
                                fixed:1 1;
                                rel1 { relative: 0.0 0.0; }
                                rel2 { relative: 1.0 1.0; }
@@ -1237,21 +1648,6 @@ collections {
                }
 
                part{
-                       name: "swallow.bg";
-                       type: SWALLOW;
-                       scale: 1;
-                       mouse_events: 1;
-                       description{
-                               state: "default" 0.0;
-                               rel1{
-                                       to: "background";
-                               }
-                               rel2{
-                                       to: "background";
-                               }
-                       }
-               }
-               part{
                        name: "swallow.icon";
                        type: SWALLOW;
                        scale: 1;
@@ -1259,48 +1655,20 @@ collections {
                        description{
                                state: "default" 0.0;
                                //min: 96 96;
+                               min: 72 72;
+                               max: 72 72;
                                fixed: 1 1;
                                rel1 {
                                        relative: 0.0 0.0;
-                                       to: "swallow.bg";
+                                       to: "background";
                                }
                                rel2 {
                                        relative: 1.0 1.0;
-                                       to: "swallow.bg";
+                                       to: "background";
                                }
                                align: 0.5 0.5;
                        }
                }
-               #if 0
-               part {
-                       name: "text.name";
-                       type: TEXT;
-                       effect: SOFT_SHADOW;
-                       scale: 1;
-                       mouse_events: 1;
-                       description{
-                               state: "default" 0.0;
-                               min: 1 30;
-                               fixed: 0 1;
-                               rel1 {
-                                       relative: 0.0 0.0;
-                                       to_y: "elm.padding.bottom";
-                               }
-                               rel2 {
-                                       relative: 1.0 0.0;
-                                       to_y: "elm.padding.bottom";
-                               }
-                               align: 0.5 1.0;
-                               color: 255 255 255 255;
-                               text {
-                                       text_class:"app_tray_item";
-                                       font:"Helvetica Neue";
-                                       size:26;
-                                       align:0.5 0.0;
-                               }
-                       }
-               }
-               #endif
        }
 }
                group
@@ -1311,6 +1679,7 @@ collections {
                        {
                                name: "path";
                                type: SWALLOW;
+                               scale: 1;
                                description
                                {
                                        state:    "default" 0.0;
@@ -1330,5 +1699,127 @@ collections {
                        }
                         }
                }
+       group { name: "search_view_layout";
+          parts {
+               part { name: "background";
+                       type: RECT;
+                       mouse_events: 0;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 { relative: 0.0 0.0; }
+                               rel2 { relative: 1.0 1.0; }
+                               color: 248 246 239 255;
+                       }
+               }
+               part {
+                           name: "search_bar";
+                           type: SWALLOW;
+                           scale: 1;
+                           description {
+                              state: "default" 0.0;
+                              min: 0 SEARCHBAR_H_INC;
+                              fixed: 0 1;
+                              align: 0.0 0.0;
+                              rel1 { relative: 0.0 0.0;}
+                              rel2 { relative: 1.0 0.0;}
+                           }
+               }
+             part {
+                name: "content";
+                type: SWALLOW;
+                scale: 1;
+                repeat_events: 1;
+                description { state: "default" 0.0;
+                   align: 0.5 0.0;
+                   rel1 { relative: 0.0 1.0; to_y:"search_bar";}
+                   rel2 { relative: 1.0 1.0;}
+                }
+             }
+
+             part {
+                     name: "sel_contents";
+                     type: SWALLOW;
+                     scale: 1;
+                     description { state: "default" 0.0;
+                             fixed: 0 1;
+                             align: 0.5 1.0;
+                             rel1 {
+                                     relative: 0.0 1.0;
+                                     to:"content";
+                             }
+                     }
+                     description { state: "hide" 0.0;
+                             inherit: "default" 0.0;
+                             visible: 0;
+                     }
+             }
+          }
+          programs {
+             program {
+                name: "show";
+                signal: "show,selection,info";
+                source: "elm";
+                action: STATE_SET "default" 0.0;
+                target: "sel_contents";
+             }
+             program {
+                name: "hide";
+                signal: "hide,selection,info";
+                source: "elm";
+                action: STATE_SET "hide" 0.0;
+                target: "sel_contents";
+             }
+          }
+       }
 
+
+group { name: "popup_center_text";
+   parts{
+         part { name: "elm.title";
+                type: TEXT;
+                scale : 1;
+                description { state: "default" 0.0;
+                       max: 240 60;
+                       text {
+                          font: FONT_NANE;
+                          text_class:"tizen";
+                          size: 42;
+                          min: 0 0;
+                          align: 0.5 0.5;
+                         }
+                       color: 0 0 0 255;
+                       align: 0.5 0.0;
+                       rel1 {
+                          relative: 0.0 0.25;
+                       }
+                       rel2 {
+                          relative: 1.0 0.0;
+                       }
+                }
+         }
+         part{ name:"elm.swallow.content";
+                type: TEXT;
+                scale : 1;
+                description { state: "default" 0.0;
+                       min: 0 118;
+                       fixed: 1 0;
+                       text {
+                          font: FONT_NANE;
+                          text_class:"tizen";
+                          size: 42;
+                          min: 0 0;
+                          align: 0.5 0.5;
+                         }
+                       color: 0 0 0 255;
+                       align: 0.5 0.0;
+                       rel1 {
+                          relative: 0.0 1.0; to_y: "elm.title";
+                       }
+                       rel2 {
+                          relative: 1.0 1.0;
+                       }
+                }
+         }
+   }
 }
index f391331..e9cc98d 100644 (file)
@@ -1,7 +1,8 @@
 # for i18n
 
 SET(POFILES bg.po cs.po el_GR.po en_US.po et.po fr_CA.po gl.po hu.po it_IT.po kk.po
-lv.po nb.po ro.po sl.po tr_TR.po uz.po zh_SG.po az.po de_DE.po en.po es_US.po fi.po ga.po hr.po is.po ka.po lt.po pl.po pt_PT.po sk.po sv.po zh_HK.po ar.po ca.po da.po en_PH.po es_ES.po eu.po fr_FR.po hi.po hy.po ja_JP.po ko_KR.po mk.po nl_NL.po pt_BR.po ru_RU.po sr.po uk.po zh_CN.po zh_TW.po)
+lv.po nb.po ro.po sl.po tr_TR.po uz.po zh_SG.po az.po de_DE.po en.po es_US.po
+es_MX.po fi.po ga.po hr.po is.po ka.po lt.po pl.po pt_PT.po sk.po sv.po zh_HK.po ar.po ca.po da.po en_PH.po es_ES.po eu.po fr_FR.po hi.po hy.po ja_JP.po ko_KR.po mk.po nl_NL.po pt_BR.po ru_RU.po sr.po uk.po zh_CN.po zh_TW.po)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
old mode 100755 (executable)
new mode 100644 (file)
index 3b17301..1339109
@@ -1,10 +1,10 @@
 #sbs-git:slp/pkgs/m/myfiles myfiles 0.1.6 2caccae458123f3effccfcf34469f363593d375e
 Name:       org.tizen.myfile
 Summary:    Myfile Application v1.0
-Version:    0.1.19
-Release:    2
+Version:    0.2.06
+Release:    1
 Group:      TO_BE/FILLED_IN
-License:    TO_BE/FILLED_IN
+License:    Flora
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(elementary)
@@ -65,10 +65,10 @@ rm -rf %{buildroot}
 %post
 chown -R 5000:5000 /opt/usr/apps/org.tizen.myfile/data
 
-/usr/bin/vconftool set -t int db/private/org.tizen.myfile/list_by 7 -i -g 5000
-/usr/bin/vconftool set -t int db/private/org.tizen.myfile/view_style 0 -i -g 5000
-/usr/bin/vconftool set -t int db/private/org.tizen.myfile/extension_state 1 -i -g 5000
-/usr/bin/vconftool set -t string db/private/org.tizen.myfile/recent_file "" -s -g 5000
+/usr/bin/vconftool set -t int db/private/org.tizen.myfile/list_by 7 -i -g 5000 -f
+/usr/bin/vconftool set -t int db/private/org.tizen.myfile/view_style 0 -i -g 5000 -f
+/usr/bin/vconftool set -t int db/private/org.tizen.myfile/extension_state 1 -i -g 5000 -f
+/usr/bin/vconftool set -t string db/private/org.tizen.myfile/recent_file "" -s -g 5000 -f
 
 %files
 %manifest org.tizen.myfile.manifest
index e1b3e33..9ab47fe 100644 (file)
@@ -979,6 +979,19 @@ int mf_file_attr_get_file_icon(const char *file_path, int *error_code, int view_
        return thumbnail_type;
 }
 
+fsFileType mf_file_attr_get_file_type(const char *mime)
+{
+       int index;
+       fsFileType ftype = FILE_TYPE_NONE;
+       for (index = 0; mime_type[index].mime; index++) {
+               if (strncmp(mime, mime_type[index].mime, strlen(mime)) == 0) {
+                       ftype = mime_type[index].ftype;
+               }
+       }
+       return ftype;
+
+}
+
 fsFileType mf_file_attr_get_file_type_by_mime(const char *file_path)
 {
        int index;
index e38e294..0724a98 100644 (file)
@@ -126,25 +126,6 @@ static Eina_Bool __mf_callback_do_rotation_cb (void *data)
                if (ap->mf_Status.view_type != mf_view_root_category && ap->mf_Status.view_type != mf_view_root) {
                        mf_split_view_refresh(ap);
                }
-       } else {
-               if (!(ap->mf_Status.more == MORE_EDIT ||
-                   ap->mf_Status.more == MORE_CREATE_FOLDER ||
-                   ap->mf_Status.more == MORE_THUMBNAIL_RENAME ||
-                   (ap->mf_Status.more == MORE_RENAME && ap->mf_Status.preMore == MORE_EDIT) ||
-                   ap->mf_Status.more == MORE_SEARCH || (ap->mf_Status.more == MORE_RENAME && ap->mf_Status.preMore == MORE_SEARCH))) {
-                       if (ap->mf_Status.more == MORE_DEFAULT) {
-                               mf_navi_bar_create_default_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
-                                  || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
-                               mf_navi_bar_create_path_select_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       }
-               }
-               if (ap->mf_Status.more == MORE_EDIT) {
-                       mf_navi_bar_title_set(ap);
-               }
-
        }
 
        if (ap->mf_Status.more == MORE_RENAME || ap->mf_Status.more == MORE_SEARCH || ap->mf_Status.more == MORE_CREATE_FOLDER || (ap->mf_Status.more == MORE_RENAME && ap->mf_Status.preMore == MORE_SEARCH)) {
@@ -165,9 +146,6 @@ static Eina_Bool __mf_callback_do_rotation_cb (void *data)
                        }
                }
        }
-
-       mf_genlist_gl_edit_item_selected(ap);/*note: for plm issue:P121002-2027*/
-       mf_navi_bar_title_set(ap);
        MF_TRACE_END;
 
        return ECORE_CALLBACK_CANCEL;
@@ -234,6 +212,10 @@ void mf_callback_app_rotate_cb(app_device_orientation_e  mode, void *data)
        } else {
                ap->mf_Status.rotation_type = MF_ROTATE_PORTRAIT;
        }
+       if (ap->mf_Status.flagNoContent) {
+               elm_object_signal_emit(ap->mf_MainWindow.pConformant, "elm,state,virtualkeypad,disable", "");
+               elm_object_signal_emit(ap->mf_MainWindow.pConformant, "elm,state,clipboard,disable", "");
+       }
        elm_win_rotation_with_resize_set(ap->mf_MainWindow.pWindow, ap->mf_Status.rotation_angle);
        __mf_callback_do_rotation_cb(ap);
 
@@ -301,81 +283,75 @@ void mf_callback_storage_cb(void *data, const char *label)
 
        current_storage = mf_fm_svc_wrapper_get_location(ap->mf_Status.path->str);
 
-       if (g_strcmp0(pNavi_s_inuse->pNaviLabel, label) == 0) {
-               MF_TRACE_END;
-               return;
-       } else {
-               if (ap->mf_Status.more == MORE_SEARCH) {
-                       ap->mf_Status.more = MORE_DEFAULT;
-               }
-               pNavi_s_inuse->naviFlagInUse = FALSE;
-               pNaviBarStruct = mf_navi_bar_get_navi_from_navilist(ap->mf_MainWindow.plistNaviBar, label);
+       if (ap->mf_Status.more == MORE_SEARCH) {
+               ap->mf_Status.more = MORE_DEFAULT;
+       }
+       pNavi_s_inuse->naviFlagInUse = FALSE;
+       pNaviBarStruct = mf_navi_bar_get_navi_from_navilist(ap->mf_MainWindow.plistNaviBar, label);
 
 
-               if (pNaviBarStruct == NULL) {
-                       /*2.0   get root path by storage label */
-                       rootpath = mf_fm_svc_wrapper_get_root_path_by_tab_label(label);
-                       CHAR_CHECK_NULL_GOTO(rootpath, ERROR_EXIT);
+       if (pNaviBarStruct == NULL) {
+               /*2.0   get root path by storage label */
+               rootpath = mf_fm_svc_wrapper_get_root_path_by_tab_label(label);
+               CHAR_CHECK_NULL_GOTO(rootpath, ERROR_EXIT);
 
-                       /*2.1   create the navi for the tab */
-                       pNavi_s_toshow = malloc(sizeof(myfileNaviBar));
-                       CHAR_CHECK_NULL_GOTO(pNavi_s_toshow, ERROR_EXIT);
-                       memset(pNavi_s_toshow, 0, sizeof(myfileNaviBar));
+               /*2.1   create the navi for the tab */
+               pNavi_s_toshow = malloc(sizeof(myfileNaviBar));
+               CHAR_CHECK_NULL_GOTO(pNavi_s_toshow, ERROR_EXIT);
+               memset(pNavi_s_toshow, 0, sizeof(myfileNaviBar));
 
-                       pNavi_s_toshow->naviFlagInUse = TRUE;
-                       /*2.2   set path as root path of the storage */
-                       pNavi_s_toshow->pCurrentPath = g_strdup(rootpath);
-                       pNavi_s_toshow->pNaviLabel = strdup(label);
-                       free(rootpath);
-                       /*2.3   insert phone navi into the navi_list */
-                       ap->mf_MainWindow.plistNaviBar = eina_list_append(ap->mf_MainWindow.plistNaviBar, pNavi_s_toshow);
+               pNavi_s_toshow->naviFlagInUse = TRUE;
+               /*2.2   set path as root path of the storage */
+               pNavi_s_toshow->pCurrentPath = g_strdup(rootpath);
+               pNavi_s_toshow->pNaviLabel = strdup(label);
+               free(rootpath);
+               /*2.3   insert phone navi into the navi_list */
+               ap->mf_MainWindow.plistNaviBar = eina_list_append(ap->mf_MainWindow.plistNaviBar, pNavi_s_toshow);
 
-                       g_string_free(ap->mf_Status.path, TRUE);
-                       ap->mf_Status.path = NULL;
-                       ap->mf_Status.path = g_string_new(pNavi_s_toshow->pCurrentPath);
-                       if (ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
-                           || ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE) {
-                               SAFE_FREE_GSTRING(pNavi_s_toshow->pre_operation.path);
-                                       pNavi_s_toshow->pre_operation.path = g_string_new(pNavi_s_toshow->pCurrentPath);
-                                       pNavi_s_toshow->naviFlagEditJoin = TRUE;
-                       }
-                       if (ap->mf_Status.more == MORE_DEFAULT) {
-                               mf_navi_bar_create_default_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
-                                  || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
-                               mf_navi_bar_create_path_select_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       }
+               g_string_free(ap->mf_Status.path, TRUE);
+               ap->mf_Status.path = NULL;
+               ap->mf_Status.path = g_string_new(pNavi_s_toshow->pCurrentPath);
+               if (ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
+                   || ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE) {
+                       SAFE_FREE_GSTRING(pNavi_s_toshow->pre_operation.path);
+                               pNavi_s_toshow->pre_operation.path = g_string_new(pNavi_s_toshow->pCurrentPath);
+               }
+               if (ap->mf_Status.more == MORE_DEFAULT) {
+                       mf_navi_bar_create_default_view(ap);
+                       mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
+               } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
+                          || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
+                       mf_navi_bar_create_path_select_view(ap);
+                       mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
+               }
 
-                       ap->mf_Status.more = current_more;
-                       goto SUCCESS_EXIT;
-               } else {
-                       /*2.1   get the navi of the tab */
-                       pNaviBar = ap->mf_MainWindow.pNaviBar;
-                       pNavi_s_toshow = mf_navi_bar_get_struct_by_label(ap, label);
-                       pNavi_s_toshow->naviFlagInUse = TRUE;
+               ap->mf_Status.more = current_more;
+               goto SUCCESS_EXIT;
+       } else {
+               /*2.1   get the navi of the tab */
+               pNaviBar = ap->mf_MainWindow.pNaviBar;
+               pNavi_s_toshow = mf_navi_bar_get_struct_by_label(ap, label);
+               pNavi_s_toshow->naviFlagInUse = TRUE;
 
-                       /*2.2   set related status value. */
-                       g_string_free(ap->mf_Status.path, TRUE);
-                       ap->mf_Status.path = NULL;
+               /*2.2   set related status value. */
+               g_string_free(ap->mf_Status.path, TRUE);
+               ap->mf_Status.path = NULL;
 
-                       ap->mf_Status.path = g_string_new(pNavi_s_toshow->pCurrentPath);
-                       /*2.3   update the content to catch update */
-                       /*Todo: How to ensure insert only once */
-                       if (ap->mf_Status.more == MORE_DEFAULT) {
-                               mf_navi_bar_create_default_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
-                                  || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
-                               mf_navi_bar_create_path_select_view(ap);
-                               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                       }
-                       goto SUCCESS_EXIT;
+               ap->mf_Status.path = g_string_new(pNavi_s_toshow->pCurrentPath);
+               /*2.3   update the content to catch update */
+               /*Todo: How to ensure insert only once */
+               if (ap->mf_Status.more == MORE_DEFAULT) {
+                       mf_navi_bar_create_default_view(ap);
+                       mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
+               } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
+                          || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
+                       mf_navi_bar_create_path_select_view(ap);
+                       mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
                }
-
+               goto SUCCESS_EXIT;
        }
 
+
 ERROR_EXIT:
        SAFE_FREE_CHAR(pNavi_s_toshow);
        SAFE_FREE_CHAR(rootpath);
@@ -449,14 +425,7 @@ void mf_callback_tab_cb(void *data, const char * path)
                        return;
                }
 
-#if 0
-               if (ap->mf_MainWindow.pNaviItem) {
-                       mf_navi_bottom_item_del(&ap->mf_MainWindow.pNaviItem);
-               }
-#endif
 
-               if (ap->mf_Status.more == MORE_EDIT)
-                       ap->mf_Status.more = MORE_DEFAULT;
 #ifdef MYFILE_SPLIT_VIEW
                if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
                        mf_callback_storage_cb(ap, label);
@@ -506,7 +475,6 @@ void mf_callback_tab_cb(void *data, const char * path)
                                pNavi_s_toshow->pre_operation.path = g_string_new(pNavi_s_toshow->pCurrentPath);
                                mf_navi_bar_create_path_select_view(ap);
                                mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                               pNavi_s_toshow->naviFlagEditJoin = TRUE;
                        } else {
                                mf_navi_bar_create_default_view(ap);
                                mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
@@ -530,7 +498,6 @@ void mf_callback_tab_cb(void *data, const char * path)
                        if ((ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
                             || ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE)) {
                                mf_navi_bar_create_path_select_view(ap);
-                               pNavi_s_toshow->naviFlagEditJoin = TRUE;
                        } else {
                                mf_navi_bar_create_default_view(ap);
                        }
@@ -780,11 +747,6 @@ void mf_callback_click_cb(struct appdata *data, mfAction key, GString * path)
        }
        if (ap->mf_Status.view_type == mf_view_root) {
                ap->mf_Status.view_type = mf_view_normal;
-#ifdef MYFILE_SPLIT_VIEW
-               if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
-                       mf_navi_bar_reset_panes_main(ap);
-               }
-#endif
                mf_callback_tab_cb(ap, path->str);
                return;
        }
@@ -808,11 +770,6 @@ void mf_callback_click_cb(struct appdata *data, mfAction key, GString * path)
                                        }
                                        elm_object_focus_set(ap->mf_MainWindow.pSearchEntry, EINA_FALSE);
                                        ap->mf_Status.more = MORE_DEFAULT;
-#ifdef MYFILE_SPLIT_VIEW
-                                       if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
-                                               mf_navi_bar_reset_panes_main(ap);
-                                       }
-#endif
 
                                }
                                new_path = g_string_new(path->str);
@@ -884,7 +841,7 @@ static int __mf_callback_imk_cancel_cb(void *data)
 }
 
 /******************************
-** Prototype    : __mf_callback_illegal_char_popup_cb
+** Prototype    : mf_callback_illegal_char_popup_cb
 ** Description  :
 ** Input        : void *data
 **                Evas_Object *obj
@@ -900,7 +857,7 @@ static int __mf_callback_imk_cancel_cb(void *data)
 **    Modification : Created function
 **
 ******************************/
-static void __mf_callback_illegal_char_popup_cb(void *data, Evas_Object * obj, void *event_info)
+void mf_callback_illegal_char_popup_cb(void *data, Evas_Object * obj, void *event_info)
 {
        struct appdata *ap = (struct appdata *)data;
        assert(ap);
@@ -987,7 +944,7 @@ static int __mf_callback_ime_mkdir_cb(void *data, char *fileName)
                        message = GET_STR(MF_POPUP_MSG_NAME_INVALID);   /*TODO */
                        ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                               left_label, right_label, NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
+                                                                              mf_callback_illegal_char_popup_cb, ap);
 
                        g_string_free(fullpathdir, TRUE);
                        fullpathdir = NULL;
@@ -1002,7 +959,7 @@ static int __mf_callback_ime_mkdir_cb(void *data, char *fileName)
                        message = GET_STR(MF_MSG_ILLEGAL_CHAR);
                        ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                               left_label, right_label, NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
+                                                                              mf_callback_illegal_char_popup_cb, ap);
                        mf_debug("Name contains illegal character!!!");
                        g_string_free(fullpathdir, TRUE);
                        fullpathdir = NULL;
@@ -1044,7 +1001,7 @@ static int __mf_callback_ime_mkdir_cb(void *data, char *fileName)
                        message = GET_STR(MF_MSG_PATH_REACH_MAX_LEN);
                        ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                               left_label, right_label, NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
+                                                                              mf_callback_illegal_char_popup_cb, ap);
                        mf_debug("Full path length should be  less than 4096 Retry!!!");
                        g_string_free(fullpathdir, TRUE);
                        fullpathdir = NULL;
@@ -1057,7 +1014,7 @@ static int __mf_callback_ime_mkdir_cb(void *data, char *fileName)
                        message = GET_STR(MF_MSG_DUP_NAME);
                        ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                               left_label, right_label, NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
+                                                                              mf_callback_illegal_char_popup_cb, ap);
 
                        mf_debug("Duplicated Name, Retry?");
                        g_string_free(fullpathdir, TRUE);
@@ -1092,7 +1049,7 @@ static int __mf_callback_ime_mkdir_cb(void *data, char *fileName)
                message = GET_STR(MF_MSG_EMPTY_FOLDER_NAME);
 
                ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
-                                                                      left_label, right_label, NULL, __mf_callback_illegal_char_popup_cb, ap);
+                                                                      left_label, right_label, NULL, mf_callback_illegal_char_popup_cb, ap);
                ret = MYFILE_ERR_DIR_CREATE_FAIL;
        }
        return ret;
@@ -1215,6 +1172,7 @@ void mf_callback_cancel_cb(void *data, Evas_Object * obj, void *event_info)
                /* when cancle rename, just destory the rename relative, and then the mode will change to Edit
                   then do what cancle edit do, so here not need "break" */
        case MORE_EDIT:
+       case MORE_SHARE_EDIT:
                /*1     pop edit view */
                if (ap->mf_MainWindow.pLabelLayout) {
                        mf_widget_unset_part_content(ap->mf_MainWindow.pNaviLayout, "sel_contents");
@@ -1247,8 +1205,6 @@ void mf_callback_cancel_cb(void *data, Evas_Object * obj, void *event_info)
                break;
        case MORE_SEARCH:
             SEARCH_CANCEL:
-               if (ap->mf_Status.more == MORE_SEARCH)
-                       ap->mf_MainWindow.pSearchViewSweepItem = NULL;
 #ifdef MYFILE_SPLIT_VIEW
                if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
                        /**** 1. unset naviframe from mainlayout **/
@@ -1296,6 +1252,7 @@ void mf_callback_cancel_cb(void *data, Evas_Object * obj, void *event_info)
 
                mf_widget_refresh_view(ap);
 
+               mf_callback_imf_state_callback_del(ap);
 
                break;
        case MORE_THUMBNAIL_RENAME:
@@ -1312,6 +1269,7 @@ void mf_callback_cancel_cb(void *data, Evas_Object * obj, void *event_info)
                evas_object_del(ap->mf_MainWindow.pEntry);
                ap->mf_MainWindow.pEntry = NULL;
                mf_widget_imf_hide_callback_del(ap->mf_MainWindow.pConformant);
+               mf_callback_imf_state_callback_del(ap);
 
                mf_widget_refresh_view(ap);
                ap->mf_Status.preMore = MORE_DEFAULT;
@@ -1505,7 +1463,7 @@ void mf_callback_rename_save_cb(void *ad, Evas_Object *obj, void *event_info)
                        message = GET_STR(MF_MSG_GET_NAME_FAILED);
                        ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                               GET_SYS_STR(MF_BUTTON_LABEL_YES), GET_SYS_STR(MF_BUTTON_LABEL_NO), NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
+                                                                              mf_callback_illegal_char_popup_cb, ap);
                        return;
                }
        } else {
@@ -1635,7 +1593,7 @@ INVAILD_NAME_EXIT:
        {
                ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
                                                                       GET_SYS_STR(MF_BUTTON_LABEL_YES), GET_SYS_STR(MF_BUTTON_LABEL_NO), NULL,
-                                                                      __mf_callback_illegal_char_popup_cb, ap);
+                                                                      mf_callback_illegal_char_popup_cb, ap);
                return;
        } else {
                mf_callback_destory_rename(ap);
@@ -1693,60 +1651,66 @@ void mf_callback_save_cb(void *data, Evas_Object *obj, void *event_info)
 
        if (ap->mf_Status.more == MORE_RENAME || ap->mf_Status.more == MORE_THUMBNAIL_RENAME) {
                mf_callback_rename_save_cb(ap, NULL, NULL);
-       } else if (ap->mf_Status.more == MORE_CREATE_FOLDER) {
-               const char *entry_data = NULL;
-               char *name = NULL;
-
-               /*hide IMF*/
-               if (ap->mf_MainWindow.pEntry != NULL) {
-                       Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(ap->mf_MainWindow.pEntry);
-                       if (imf_context != NULL)
-                               ecore_imf_context_hide(imf_context);
+               if (ap->mf_Status.more == MORE_THUMBNAIL_RENAME) {
+                       mf_callback_imf_state_callback_del(ap);
                }
+       } else if (ap->mf_Status.more == MORE_CREATE_FOLDER) {
+               {
+                       const char *entry_data = NULL;
+                       char *name = NULL;
+
+                       /*hide IMF*/
+                       if (ap->mf_MainWindow.pEntry != NULL) {
+                               Ecore_IMF_Context *imf_context = elm_entry_imf_context_get(ap->mf_MainWindow.pEntry);
+                               if (imf_context != NULL)
+                                       ecore_imf_context_hide(imf_context);
+                       }
 
-               entry_data = elm_entry_entry_get(ap->mf_MainWindow.pEntry);
+                       entry_data = elm_entry_entry_get(ap->mf_MainWindow.pEntry);
 
-               if (entry_data) {
-                       name = elm_entry_markup_to_utf8(entry_data);
-               } else {
-                       message = GET_STR(MF_MSG_GET_NAME_FAILED);
-                       left_label = GET_SYS_STR(MF_BUTTON_LABEL_YES);
-                       right_label = GET_SYS_STR(MF_BUTTON_LABEL_NO);
-                       ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
-                                                                              left_label, right_label, NULL,
-                                                                              __mf_callback_illegal_char_popup_cb, ap);
-                       return;
-               }
+                       if (entry_data) {
+                               name = elm_entry_markup_to_utf8(entry_data);
+                       } else {
+                               message = GET_STR(MF_MSG_GET_NAME_FAILED);
+                               left_label = GET_SYS_STR(MF_BUTTON_LABEL_YES);
+                               right_label = GET_SYS_STR(MF_BUTTON_LABEL_NO);
+                               ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT_TWO_BTN, NULL, message,
+                                                                                      left_label, right_label, NULL,
+                                                                                      mf_callback_illegal_char_popup_cb, ap);
+                               return;
+                       }
 
-               if (name == NULL)
-                       return;
+                       if (name == NULL)
+                               return;
 
-               ret = __mf_callback_ime_mkdir_cb(ap, name);
-               if (ret == 0) {
+                       ret = __mf_callback_ime_mkdir_cb(ap, name);
+                       if (ret == 0) {
 #ifdef MYFILE_SPLIT_VIEW
-                       if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
-                               if (ap->mf_Status.view_type != mf_view_root_category && ap->mf_Status.view_type != mf_view_root) {
-                                       mf_navi_bar_reset_panes_main(ap);
+                               if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
+                                       if (ap->mf_Status.view_type != mf_view_root_category && ap->mf_Status.view_type != mf_view_root) {
+                                               mf_navi_bar_reset_panes_main(ap);
+                                       }
                                }
-                       }
 #endif
-                       ap->mf_Status.more = ap->mf_Status.preMore;
-                       elm_object_focus_set(ap->mf_MainWindow.pEntry, EINA_FALSE);
-                       evas_object_del(ap->mf_MainWindow.pEntry);
-                       ap->mf_MainWindow.pEntry = NULL;
-                       mf_widget_imf_hide_callback_del(ap->mf_MainWindow.pConformant);
+                               ap->mf_Status.more = ap->mf_Status.preMore;
+                               elm_object_focus_set(ap->mf_MainWindow.pEntry, EINA_FALSE);
+                               evas_object_del(ap->mf_MainWindow.pEntry);
+                               ap->mf_MainWindow.pEntry = NULL;
+                               mf_widget_imf_hide_callback_del(ap->mf_MainWindow.pConformant);
 
-                       mf_widget_refresh_view(ap);
+                               mf_widget_refresh_view(ap);
+                       mf_callback_imf_state_callback_del(ap);
 
-                       if (ap->mf_Status.more == MORE_DEFAULT && noContentFlag) {
-                               mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_NOCONTENT_VIEW, false);
-                               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_NOCONTENT_VIEW, false);
+                               if (ap->mf_Status.more == MORE_DEFAULT && noContentFlag) {
+                                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_NOCONTENT_VIEW, false);
+                                       //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_NOCONTENT_VIEW, false);
+                               }
                        }
-               }
 
-               if (name != NULL) {
-                       free(name);
-                       name = NULL;
+                       if (name != NULL) {
+                               free(name);
+                               name = NULL;
+                       }
                }
        }
 }
@@ -1787,21 +1751,23 @@ void mf_callback_launch_send_cb(void *data, Evas_Object *obj, void *event_info)
        struct appdata *ap = (struct appdata *)data;
        assert(ap);
 
-       if (ap->mf_FileRecordList.selected_files && mf_util_get_eina_list_len(ap->mf_FileRecordList.selected_files) > 0) {
-               switch (ap->mf_Status.more) {
-               case MORE_SENDVIABLUETOOTH:
-               case MORE_SENDVIAEMAIL:
-               case MORE_SENDVIAMESSAGE:
-                       mf_share_launch_multi_file(data);
-                       break;
-               default:
-                       break;
+       {
+               if (ap->mf_FileRecordList.selected_files && mf_util_get_eina_list_len(ap->mf_FileRecordList.selected_files) > 0) {
+                       switch (ap->mf_Status.more) {
+                       case MORE_SENDVIABLUETOOTH:
+                       case MORE_SENDVIAEMAIL:
+                       case MORE_SENDVIAMESSAGE:
+                               mf_share_launch_multi_file(data);
+                               break;
+                       default:
+                               break;
+                       }
+               } else {
+                       const char *message = GET_SYS_STR(MF_LABEL_NOTHING_SELECTED);
+                       ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
                }
-       } else {
-               const char *message = GET_SYS_STR(MF_LABEL_NOTHING_SELECTED);
-               ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
        }
-       ap->mf_Status.more = MORE_EDIT;
+       ap->mf_Status.more = MORE_SHARE_EDIT;
 }
 
 /******************************
@@ -1856,7 +1822,7 @@ void mf_callback_send_response_cb(void *data)
        }
        ap->mf_MainWindow.pContextPopup = NULL;
 
-       ecore_idler_add((Ecore_Task_Cb) __mf_callback_idle_launch_send_cb, ap);
+       __mf_callback_idle_launch_send_cb(ap);
 }
 
 
@@ -2009,7 +1975,11 @@ static void __mf_callback_set_select_all_total_count(void *data)
 
        folder_len = eina_list_count(ap->mf_FileOperation.folder_list);
        file_len = eina_list_count(ap->mf_FileOperation.file_list);
-       ap->mf_MainWindow.pEditView.iTotalCount = (folder_len + file_len);
+       if (ap->mf_Status.more == MORE_EDIT) {
+               ap->mf_MainWindow.pEditView.iTotalCount = (folder_len + file_len);
+       } else if (ap->mf_Status.more == MORE_SHARE_EDIT) {
+               ap->mf_MainWindow.pEditView.iTotalCount = file_len;
+       }
 }
 
 static void __mf_callback_save_edit_view_status(void *data)
@@ -2033,7 +2003,6 @@ static void __mf_callback_save_edit_view_status(void *data)
 
                if (pNavi_s->naviFlagInUse == TRUE) {
                        pNavi_s->naviFlagEditStart = TRUE;
-                       pNavi_s->naviFlagEditJoin = TRUE;
                } else {
                        pNavi_s->naviFlagEditStart = FALSE;
                }
@@ -2052,7 +2021,19 @@ void mf_callback_edit_cb(void *data, Evas_Object * obj, void *event_info)
        myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
        mf_retm_if(pNavi_s == NULL, "get navigation bar in use failed");
 
-       ap->mf_Status.more = MORE_EDIT;
+       Evas_Object *btn = (Evas_Object *)obj;
+       const char *label = elm_object_text_get(btn);
+
+       if (g_strcmp0(label, GET_SYS_STR(MF_LABEL_EDIT)) == 0 ) {
+               ap->mf_Status.more = MORE_EDIT;
+
+       } else if (g_strcmp0(label, GET_SYS_STR(LABEL_SHARE)) == 0 ) {
+               ap->mf_Status.more = MORE_SHARE_EDIT;
+       } else {
+               return;
+       }
+
+
        mf_callback_remove_dir_watch();
 #ifdef MYFILE_SPLIT_VIEW
        __mf_callback_edit_init(ap);
@@ -2159,7 +2140,6 @@ void mf_callback_new_folder_create_cb(void *data, Evas_Object * obj, void *event
        struct appdata *ap = (struct appdata *)data;
        assert(ap);
 
-
        if (ap->mf_Status.flagNaviPush) {
                mf_debug("the transition of the naviframe is not finished");
                return;
@@ -2168,23 +2148,25 @@ void mf_callback_new_folder_create_cb(void *data, Evas_Object * obj, void *event
 
        if (ap->mf_Status.more == MORE_CREATE_FOLDER)
                return;
-       int ret = 0;
-       if (ap->mf_Status.folder_count >= MAX_FOLDER_COUNT) {
-               const char *message = GET_STR(MF_MSG_FOLDER_NUM_MAX);
-               ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
-               return;
-       }
-       ap->mf_Status.preMore = ap->mf_Status.more;
-       ap->mf_Status.more = MORE_CREATE_FOLDER;
+       {
+               int ret = 0;
+               if (ap->mf_Status.folder_count >= MAX_FOLDER_COUNT) {
+                       const char *message = GET_STR(MF_MSG_FOLDER_NUM_MAX);
+                       ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
+                       return;
+               }
+               ap->mf_Status.preMore = ap->mf_Status.more;
+               ap->mf_Status.more = MORE_CREATE_FOLDER;
 
-       ret = mf_util_check_disk_space(ap);
-       if (ret == MYFILE_ERR_NO_FREE_SPACE) {
-               ap->mf_Status.more = MORE_DEFAULT;
-               return;
-       }
+               ret = mf_util_check_disk_space(ap);
+               if (ret == MYFILE_ERR_NO_FREE_SPACE) {
+                       ap->mf_Status.more = MORE_DEFAULT;
+                       return;
+               }
 
-       mf_navi_bar_create_new_folder_view(ap);
-       mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
+               mf_navi_bar_create_new_folder_view(ap);
+               mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
+       }
 
 }
 
@@ -2986,12 +2968,10 @@ void mf_callback_thread_pipe_cb(void *data, void *buffer, unsigned int nbyte)
 
 
                ap->mf_FileOperation.pGenlistItem = NULL;
-               g_free(message);
                ap->mf_FileOperation.iOperationSuccessFlag = FALSE;
                mf_msg_request_handled_send();
                break;
        case MF_MSG_END:
-
                if (ap->mf_FileOperation.source) {
                        g_string_free(ap->mf_FileOperation.source, TRUE);
                        ap->mf_FileOperation.source = NULL;
@@ -3066,7 +3046,7 @@ static void __mf_callback_mmc_connected(void *data)
 
 }
 
-static void __mf_callback_mmc_remove_view_operation(void *data, int optStorage)
+void mf_callback_storage_remove_view_operation(void *data, int optStorage)
 {
        struct appdata *ap = (struct appdata *)data;
        mf_retm_if(ap == NULL, "appdata is NULL");
@@ -3099,11 +3079,17 @@ static void __mf_callback_mmc_remove_view_operation(void *data, int optStorage)
                        ap->mf_MainWindow.sSplitData.mmc_item = NULL;
                }
        }
+       if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
+               if (optStorage == MYFILE_OTG) {
+                       elm_object_item_del(ap->mf_MainWindow.sSplitData.otg_item);
+                       ap->mf_MainWindow.sSplitData.mmc_item = NULL;
+               }
+       }
 #endif
 
 }
 
-static void __mf_callback_mmc_remove_category_view_items(void *data, int optStorage)
+void mf_callback_storage_remove_category_view_items(void *data, int optStorage)
 {
        struct appdata *ap = (struct appdata *)data;
        mf_retm_if(ap == NULL, "appdata is NULL");
@@ -3162,7 +3148,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
                        switch (ap->mf_Status.more) {
                        case MORE_DEFAULT:
                                mf_navi_bar_remove_list_item_by_label(ap, labelStorage);
-                               __mf_callback_mmc_remove_view_operation(ap, optStorage);
+                               mf_callback_storage_remove_view_operation(ap, optStorage);
                                break;
                        case MORE_INTERNAL_COPY_MOVE:
                        case MORE_INTERNAL_COPY:
@@ -3172,7 +3158,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
                                        pNaviToShowStruct = mf_navi_bar_recover_list(ap);
                                        mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
                                } else {
-                                       __mf_callback_mmc_remove_view_operation(ap, optStorage);
+                                       mf_callback_storage_remove_view_operation(ap, optStorage);
                                }
                                break;
                        default:
@@ -3183,7 +3169,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
                        case MORE_DEFAULT:
                                ap->mf_Status.more = MORE_DEFAULT;
                                mf_navi_bar_remove_list_item_by_label(ap, labelStorage);
-                               __mf_callback_mmc_remove_view_operation(ap, optStorage);
+                               mf_callback_storage_remove_view_operation(ap, optStorage);
                                break;
                        case MORE_INTERNAL_COPY_MOVE:
                        case MORE_INTERNAL_COPY:
@@ -3214,9 +3200,10 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
                switch (ap->mf_Status.more) {
                case MORE_DEFAULT:
                case MORE_EDIT:
+               case MORE_SHARE_EDIT:
                case MORE_RENAME:
                        mf_navi_bar_remove_list_item_by_label(ap, labelStorage);
-                       __mf_callback_mmc_remove_category_view_items(ap, optStorage);
+                       mf_callback_storage_remove_category_view_items(ap, optStorage);
                        break;
                default:
                        break;
@@ -3225,6 +3212,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
                switch (ap->mf_Status.more) {
                case MORE_DEFAULT:
                case MORE_EDIT:
+               case MORE_SHARE_EDIT:
                case MORE_IDLE_DELETE:
                case MORE_DELETE:
                case MORE_RENAME:
@@ -3404,6 +3392,7 @@ static void __mf_callback_mmc_removed(void *data, MF_STORAGE storage)
 
                        break;
                case MORE_EDIT:
+               case MORE_SHARE_EDIT:
                        bEditStartFlag = mf_navi_bar_remove_list_item_by_label(ap, labelStorage);
                        if (bEditStartFlag == TRUE) {
                                mf_navi_bar_recover_list(ap);
@@ -3701,6 +3690,7 @@ int mf_callback_set_mmc_state_cb(void *data)
 #ifdef MYFILE_USB_OTG
 static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
 {
+       MF_TRACE_BEGIN;
        struct appdata *ap = (struct appdata *)data;
        mf_retm_if(ap == NULL, "appdata is NULL");
        mf_retm_if(ap->mf_Status.path == NULL || ap->mf_Status.path->str == NULL, "mf_Status.path is NULL");
@@ -3717,8 +3707,14 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
        else
                bAllRemovedFlag = TRUE;
        /*1.2.1 check if otg is editstar navi */
-       pNaviStorageStruct = mf_navi_bar_get_struct_by_label(ap, GET_STR(MF_LABEL_OTG));
+       char *labelStorage = NULL;
+       labelStorage = GET_SYS_STR(MF_LABEL_OTG);
+
+       pNaviStorageStruct = mf_navi_bar_get_struct_by_label(ap, labelStorage);
        pNaviBarStorageView = ap->mf_MainWindow.pNaviBar;
+       mf_debug("before remove is [%d]", ap->mf_Status.iStorageState);
+       if(bAllRemovedFlag == TRUE)
+               ap->mf_Status.iStorageState = (ap->mf_Status.iStorageState ^ MYFILE_OTG);
 
        /*3 factors; */
        /*
@@ -3727,8 +3723,10 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
         **     3.      is source path in storage in inter-storage operation    flagEditStartView
         */
 
+
        if (bAllRemovedFlag == TRUE) {  /*1. otg storage all removed*/
                                        /*we should check if tab bar need to be removed */
+               mf_error(">>>>>>>>>>>>>>>>>>Remove all");
                switch (ap->mf_Status.more) {
                case MORE_DEFAULT:
                        mf_otg_dev_all_removed_update(ap, MF_OTG_OPT_NOR_POPUP_DEL);
@@ -3757,6 +3755,7 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
                        mf_otg_dev_all_removed_update(ap, MF_OTG_OPT_NOR_POPUP_DEL);
                        break;
                case MORE_EDIT:
+               case MORE_SHARE_EDIT:
                        mf_debug();
                        if (pNaviStorageStruct && pNaviStorageStruct->naviFlagInUse == TRUE)
                                mf_otg_dev_all_removed_update(ap, MF_OTG_OPT_TABBAR_ENABLE | MF_OTG_OPT_THEME_RESET | MF_OTG_OPT_NOR_POPUP_DEL);
@@ -3788,7 +3787,7 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
                }
        } else {        /*otg storages part removed*/
                        /*we don't need to check tab bar status*/
-               mf_debug("not all removed");
+               mf_error(">>>>>>>>>>>>>>>>>>not all removed");
                switch (ap->mf_Status.more) {
                case MORE_DEFAULT:
                        mf_otg_dev_removed_update(ap, MF_OTG_OPT_NOR_POPUP_DEL);
@@ -3797,6 +3796,7 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
                        mf_otg_dev_removed_update(ap, MF_OTG_OPT_NOR_POPUP_DEL);
                        break;
                case MORE_EDIT:
+               case MORE_SHARE_EDIT:
                        if (pNaviStorageStruct && pNaviStorageStruct->naviFlagInUse == TRUE)
                                mf_otg_dev_removed_update(ap, MF_OTG_OPT_TABBAR_ENABLE | MF_OTG_OPT_THEME_RESET | MF_OTG_OPT_NOR_POPUP_DEL);
                        else
@@ -3827,9 +3827,8 @@ static void __mf_callback_otg_removal_cb(keynode_t *key, void *data)
                }
        }
 
-       mf_debug("before remove is [%d]", ap->mf_Status.iStorageState);
-       if(bAllRemovedFlag == TRUE)
-               ap->mf_Status.iStorageState = (ap->mf_Status.iStorageState ^ MYFILE_OTG);
+
+       MF_TRACE_END;
        mf_debug("after remove is [%d]", ap->mf_Status.iStorageState);
 }
 
@@ -3967,7 +3966,7 @@ static void __mf_callback_dir_pipe_cb(void *data, void *buffer, unsigned int nby
                                        parent_obj = ap->mf_MainWindow.pNaviGenlist;
                                } else {
                                        if (ap->mf_MainWindow.pNaviGengrid == NULL) {
-                                               ap->mf_MainWindow.pNaviGengrid = mf_gengrid_create_grid(ap->mf_MainWindow.pNaviBar);
+                                               ap->mf_MainWindow.pNaviGengrid = mf_gengrid_create(ap->mf_MainWindow.pNaviBar);
                                                evas_object_del(elm_object_part_content_unset(ap->mf_MainWindow.pNaviLayout, "content"));
                                                elm_object_part_content_set(ap->mf_MainWindow.pNaviLayout, "content", ap->mf_MainWindow.pNaviGengrid);
                                        }
@@ -4427,7 +4426,6 @@ void mf_callback_home_button_cb(void *data, Evas_Object * obj, void *event_info)
                mf_callback_destory_rename(ap);
        }
 
-       ap->mf_Status.view_type = mf_view_root;
 #ifdef MYFILE_SPLIT_VIEW
 
        if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
@@ -4435,23 +4433,27 @@ void mf_callback_home_button_cb(void *data, Evas_Object * obj, void *event_info)
 
        }
 #endif
-       storage = mf_fm_svc_wrapper_get_location(ap->mf_Status.path->str);
-       switch (storage) {
-               case MYFILE_PHONE:
-                       SAFE_FREE_GSTRING(ap->mf_Status.path);
-                       ap->mf_Status.path = g_string_new(PHONE_FOLDER);
-                       break;
-               case MYFILE_MMC:
-                       SAFE_FREE_GSTRING(ap->mf_Status.path);
-                       ap->mf_Status.path = g_string_new(MEMORY_FOLDER);
-                       break;
-               case MYFILE_OTG:
-                       SAFE_FREE_GSTRING(ap->mf_Status.path);
-                       ap->mf_Status.path = g_string_new(OTG_FOLDER);
-                       break;
-               default:
-                       return;
+       {
+               storage = mf_fm_svc_wrapper_get_location(ap->mf_Status.path->str);
+               mf_error("storage is [%d] ap->mf_Status.path->str is [%s]", storage, ap->mf_Status.path->str);
+               switch (storage) {
+                       case MYFILE_PHONE:
+                               SAFE_FREE_GSTRING(ap->mf_Status.path);
+                               ap->mf_Status.path = g_string_new(PHONE_FOLDER);
+                               break;
+                       case MYFILE_MMC:
+                               SAFE_FREE_GSTRING(ap->mf_Status.path);
+                               ap->mf_Status.path = g_string_new(MEMORY_FOLDER);
+                               break;
+                       case MYFILE_OTG:
+                               SAFE_FREE_GSTRING(ap->mf_Status.path);
+                               ap->mf_Status.path = g_string_new(OTG_FOLDER);
+                               break;
+                       default:
+                               return;
+               }
        }
+       ap->mf_Status.view_type = mf_view_root;
 #ifdef MYFILE_USB_OTG
        /* if click items under otg root path, it means some disk take into use*/
        if (storage == MYFILE_OTG) {    /* a usb disk take into use */
@@ -4588,7 +4590,6 @@ void mf_callback_extension_cb(void *data, Evas_Object * obj, void *event_info)
        if (ap->mf_Status.flagNoContent != EINA_TRUE) {
                newContent = mf_navi_bar_content_create(ap);
                mfNaviBarSetContent(ap, playout, newContent);
-
        }
        ap->mf_Status.more = MORE_DEFAULT;
 }
@@ -4708,31 +4709,33 @@ void mf_callback_share_cb(void *data, Evas_Object * obj, void *event_info)
        MF_TRACE_BEGIN;
        mf_retm_if(data == NULL, "data is NULL");
        struct appdata *ap = (struct appdata *)data;
-       int share_mode = 0;
+       int share_mode = SHARE_MODE_NORMAL;
        int file_mode = 0;
 
+       {
+               if (ap->mf_FileRecordList.selected_files) {
+                       mf_util_free_eina_list_with_data(&ap->mf_FileRecordList.selected_files, MYFILE_TYPE_GSTRING);
+               }
+               ap->mf_FileRecordList.selected_files = mf_util_get_all_selected(ap);
+
+               file_mode = mf_share_mode_get(ap->mf_FileRecordList.selected_files);
+
+               if ((file_mode & SHARE_FILE_MODE_OTHERS) || ((file_mode & SHARE_FILE_MODE_IMAGE) && (file_mode & SHARE_FILE_MODE_VIDEO))) {
+                       share_mode = SHARE_MODE_NORMAL;
+               } else if (file_mode & SHARE_FILE_MODE_MULTI_IMAGE) {
+                       share_mode = SHARE_MODE_MULTI_IMAGE;
+               } else if (file_mode & SHARE_FILE_MODE_MULTI_VIDEO) {
+                       share_mode = SHARE_MODE_MULTI_VIDEO;
+               } else if (file_mode & SHARE_FILE_MODE_IMAGE) {
+                       share_mode = SHARE_MODE_IMAGE;
+               } else if (file_mode & SHARE_FILE_MODE_VIDEO) {
+                       share_mode = SHARE_MODE_VIDEO;
+               } else {
+                       share_mode = SHARE_MODE_NORMAL;
+               }
+                       mf_context_popup_create_share(ap, share_mode, obj);
 
-       if (ap->mf_FileRecordList.selected_files) {
-               mf_util_free_eina_list_with_data(&ap->mf_FileRecordList.selected_files, MYFILE_TYPE_GSTRING);
        }
-       ap->mf_FileRecordList.selected_files = mf_util_get_all_selected(ap);
-
-       file_mode = mf_share_mode_get(ap->mf_FileRecordList.selected_files);
-
-       if ((file_mode & SHARE_FILE_MODE_OTHERS) || ((file_mode & SHARE_FILE_MODE_IMAGE) && (file_mode & SHARE_FILE_MODE_VIDEO))) {
-               share_mode = SHARE_MODE_NORMAL;
-       } else if (file_mode & SHARE_FILE_MODE_MULTI_IMAGE) {
-               share_mode = SHARE_MODE_MULTI_IMAGE;
-       } else if (file_mode & SHARE_FILE_MODE_MULTI_VIDEO) {
-               share_mode = SHARE_MODE_MULTI_VIDEO;
-       } else if (file_mode & SHARE_FILE_MODE_IMAGE) {
-               share_mode = SHARE_MODE_IMAGE;
-       } else if (file_mode & SHARE_FILE_MODE_VIDEO) {
-               share_mode = SHARE_MODE_VIDEO;
-       } else {
-               share_mode = SHARE_MODE_NORMAL;
-       }
-       mf_context_popup_create_share(ap, share_mode, obj);
 }
 
 void mf_callback_thumb_created_cb(media_content_error_e error, const char *path, void *user_data)
@@ -4746,6 +4749,7 @@ void mf_callback_thumb_created_cb(media_content_error_e error, const char *path,
                mf_debug("Update item with new thumbnail[%s]", path);
                SAFE_FREE_CHAR(pListData->thumb_path);
                pListData->thumb_path = g_strdup(path);
+               pListData->real_thumb_flag = TRUE;
                if (pListData->ap->mf_Status.flagViewType == MF_VIEW_STYLE_THUMBNAIL) {
                        elm_gengrid_item_update(pListData->item);
                } else {
@@ -4766,7 +4770,7 @@ bool mf_callback_create_thumbnail(void *data, media_thumbnail_completed_cb callb
        ret = media_info_create_thumbnail(pListData->media, callback,
                                          pListData);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               mf_debug("Failed to create thumbnail!");
+               mf_debug("Failed to create thumbnail! ret is [%d]", ret);
                return -1;
        }
        return 0;
@@ -4893,6 +4897,85 @@ void mf_callback_naviframe_title_clicked_cb(void *data, Evas_Object *obj, void *
        elm_label_slide_go(label);
 }
 
+static void __mf_callback_sip_imf_show_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       MF_TRACE_BEGIN;
+       struct appdata *ap = (struct appdata *)data;
+       mf_retm_if(ap == NULL, "ap is NULL");
+
+
+       Evas_Object *nf = ap->mf_MainWindow.pNaviBar;
+
+       if (!nf) return;
+
+       Elm_Object_Item *navi_it = elm_naviframe_top_item_get(nf);
+
+       if (!navi_it) return;
+
+       if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
+               elm_naviframe_item_title_visible_set(navi_it, EINA_TRUE);
+       }
+       elm_object_item_signal_emit(navi_it, "elm,state,toolbar,instant_open", "");
+       MF_TRACE_END;
+}
+
+
+static void __mf_callback_sip_imf_hide_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       MF_TRACE_BEGIN;
+       struct appdata *ap = (struct appdata *)data;
+       mf_retm_if(ap == NULL, "ap is NULL");
+
+
+       Evas_Object *nf = ap->mf_MainWindow.pNaviBar;
 
+       if (!nf) return;
 
+       Elm_Object_Item *navi_it = elm_naviframe_top_item_get(nf);
+
+       if (!navi_it) return;
+
+       if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
+               elm_naviframe_item_title_visible_set(navi_it, EINA_FALSE);
+       }
+       elm_object_item_signal_emit(navi_it, "elm,state,toolbar,instant_close", "");
+       MF_TRACE_END;
+}
+
+
+void mf_callback_imf_state_callback_register(void *data)
+{
+       MF_TRACE_BEGIN;
+       struct appdata *ap = (struct appdata *)data;
+       mf_retm_if(ap == NULL, "ap is NULL");
+
+       Evas_Object *conform = ap->mf_MainWindow.pConformant;
+       evas_object_smart_callback_add(conform, "virtualkeypad,state,off", __mf_callback_sip_imf_hide_cb, ap);
+
+       evas_object_smart_callback_add(conform, "virtualkeypad,state,on", __mf_callback_sip_imf_show_cb, ap);
+
+       evas_object_smart_callback_add(conform, "clipboard,state,off", __mf_callback_sip_imf_hide_cb, ap);
+
+       evas_object_smart_callback_add(conform, "clipboard,state,on", __mf_callback_sip_imf_show_cb, ap);
+
+       MF_TRACE_END;
+}
+
+void mf_callback_imf_state_callback_del(void *data)
+{
+       MF_TRACE_BEGIN;
+       struct appdata *ap = (struct appdata *)data;
+       mf_retm_if(ap == NULL, "ap is NULL");
+       Evas_Object *conform = ap->mf_MainWindow.pConformant;
+       evas_object_smart_callback_del(conform, "virtualkeypad,state,on", __mf_callback_sip_imf_show_cb);
+
+       evas_object_smart_callback_del(conform, "virtualkeypad,state,off", __mf_callback_sip_imf_hide_cb);
+
+       evas_object_smart_callback_del(conform, "clipboard,state,on", __mf_callback_sip_imf_show_cb);
+
+       evas_object_smart_callback_del(conform, "clipboard,state,off", __mf_callback_sip_imf_hide_cb);
+
+       MF_TRACE_END;
+
+}
 
index e46f704..9accf48 100644 (file)
@@ -416,6 +416,7 @@ int mf_fm_svc_wrapper_is_root_path(const char *fullpath)
                mf_debug("OTG_FOLDER");
                return MYFILE_OTG;
 #endif
+
        } else {
                mf_debug("Not root path");
                return MYFILE_NONE;
@@ -1141,34 +1142,42 @@ char *mf_fm_svc_wrapper_translate_path(const char *original_path, MF_TRANS_OPTIO
 }
 
 
-char *mf_fm_svc_get_file_name(GString *path)
+char *mf_fm_svc_get_file_name_without_ext(const char *name)
 {
-       mf_retv_if(path == NULL, NULL);
-
-       GString *filename = NULL;
+       mf_retv_if(name == NULL, NULL);
+       char *name_without_ext = NULL;
        char *guide_text = NULL;
-       char *extension = NULL;
-       filename = mf_fm_svc_wrapper_get_file_name(path);
        char *ext = NULL;
-       char *name_without_ext = NULL;
-       name_without_ext = g_strdup(path->str);
-       mf_file_attr_get_file_ext(path->str, &ext);
+
+       name_without_ext = g_strdup(name);
+       mf_file_attr_get_file_ext(name, &ext);
        mf_debug("ext is %s", ext);
        if (ext && strlen(ext) != 0) {
                name_without_ext[strlen(name_without_ext) - strlen(ext) - 1] = '\0';
-               extension = strdup(ext);
                mf_debug("name_without_ext is [%s]\n", name_without_ext);
                if (strlen(name_without_ext)) {
                        guide_text = elm_entry_utf8_to_markup(ecore_file_file_get(name_without_ext));
                } else {
-                       guide_text = elm_entry_utf8_to_markup(filename->str);
+                       guide_text = elm_entry_utf8_to_markup(name);
                }
        } else {
-               guide_text = elm_entry_utf8_to_markup(filename->str);
+               guide_text = elm_entry_utf8_to_markup(name);
        }
-
        SAFE_FREE_CHAR(ext);
        SAFE_FREE_CHAR(name_without_ext);
        return guide_text;
 }
 
+char *mf_fm_svc_get_file_name(GString *path)
+{
+       mf_retv_if(path == NULL, NULL);
+
+       GString *filename = NULL;
+       char *guide_text = NULL;
+       filename = mf_fm_svc_wrapper_get_file_name(path);
+
+       guide_text = mf_fm_svc_get_file_name_without_ext(filename->str);
+       SAFE_FREE_GSTRING(filename);
+       return guide_text;
+}
+
index 1fc87ad..93e3f49 100644 (file)
@@ -48,7 +48,6 @@ static void __mf_launch_ug_layout_cb(ui_gadget_h ug, enum ug_mode mode, void *pr
        MF_TRACE_BEGIN;
        mf_retm_if(priv == NULL, "priv is NULL");
 
-       struct appdata *ap = (struct appdata *)priv;
        Evas_Object *base = NULL;
 
        base = ug_get_layout(ug);
@@ -219,7 +218,6 @@ void mf_launch_sns_load(void *data, char *path, MF_LOAD_UG_TYPE type, char *file
        mf_retm_if(data == NULL, "data is NULL");
        mf_retm_if(path == NULL, "path is NULL");
 
-       struct appdata *ap = (struct appdata *)data;
        const char *pkg_name = NULL;
        service_h service = NULL;
        service_create(&service);
@@ -431,7 +429,7 @@ int mf_launch_service(void *data, char *path)
        if (ecore_file_file_get(path) == NULL) {
                return LAUNCH_TYPE_FAIL;
        }
-       if (ecore_file_is_dir(path)) {
+       if (mf_file_attr_is_dir(path)) {
                return LAUNCH_TYPE_DIR;
        }
 
index 8bb79d8..be7f417 100644 (file)
@@ -156,6 +156,6 @@ void mf_media_content_scan_folder(const char *path)
 {
        mf_retm_if(path == NULL, "path is NULL");
 
-       media_content_scan_folder(path, NULL, NULL);
+       media_content_scan_folder(path, false, NULL, NULL);
 }
 
index 2f603b5..fb3a2cb 100644 (file)
@@ -430,7 +430,7 @@ void mf_otg_dev_all_removed_update(void *data, mf_otg_ex_opt_e opt)
        /*otg tab destroyed, finalize otg*/
        mf_otg_finalize(ap);
 
-       mf_debug();
+       MF_STORAGE optStorage = MYFILE_OTG;
 
        pNaviBarStorageView = ap->mf_MainWindow.pNaviBar;
        pNaviOTG = mf_navi_bar_get_struct_by_label(ap, GET_STR(MF_LABEL_OTG));
@@ -448,24 +448,42 @@ void mf_otg_dev_all_removed_update(void *data, mf_otg_ex_opt_e opt)
        mf_navi_bar_remove_list_item_by_label(ap, GET_STR(MF_LABEL_OTG));
        mf_debug();
 
-
        if (status & MF_OTG_STATUS_EDIT) {
                mf_navi_bar_recover_list(ap);
        }
 
        pNaviToShowStruct = mf_navi_bar_get_struct_by_label(ap, GET_SYS_STR(MF_LABEL_PHONE));
 
-       if (status & MF_OTG_STATUS_EDIT) {
-               ap->mf_Status.more = MORE_DEFAULT;
-               mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
-       } else if (status & MF_OTG_STATUS_USING){
-               if ( ap->mf_Status.more == MORE_CREATE_FOLDER
-                    && (ap->mf_Status.preMore == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.preMore == MORE_INTERNAL_COPY || ap->mf_Status.preMore == MORE_INTERNAL_MOVE)) {
-                       ap->mf_Status.more = ap->mf_Status.preMore;
-               } else if (ap->mf_Status.more != MORE_INTERNAL_COPY_MOVE && ap->mf_Status.preMore != MORE_INTERNAL_COPY && ap->mf_Status.preMore != MORE_INTERNAL_MOVE) {
+       if (ap->mf_Status.view_type == mf_view_root) {
+               mf_callback_storage_remove_view_operation(ap, optStorage);
+               if (status & MF_OTG_STATUS_EDIT) {
                        ap->mf_Status.more = MORE_DEFAULT;
+                       mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
+               } else if (status & MF_OTG_STATUS_USING){
+                       if ( ap->mf_Status.more == MORE_CREATE_FOLDER
+                            && (ap->mf_Status.preMore == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.preMore == MORE_INTERNAL_COPY || ap->mf_Status.preMore == MORE_INTERNAL_MOVE)) {
+                               ap->mf_Status.more = ap->mf_Status.preMore;
+                       } else if (ap->mf_Status.more != MORE_INTERNAL_COPY_MOVE && ap->mf_Status.preMore != MORE_INTERNAL_COPY && ap->mf_Status.preMore != MORE_INTERNAL_MOVE) {
+                               ap->mf_Status.more = MORE_DEFAULT;
+                       }
+                       mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
                }
-               mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
+       } else if (ap->mf_Status.view_type == mf_view_root_category) {
+               mf_callback_storage_remove_category_view_items(ap, optStorage);
+       } else {
+               if (status & MF_OTG_STATUS_EDIT) {
+                       ap->mf_Status.more = MORE_DEFAULT;
+                       mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
+               } else if (status & MF_OTG_STATUS_USING){
+                       if ( ap->mf_Status.more == MORE_CREATE_FOLDER
+                            && (ap->mf_Status.preMore == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.preMore == MORE_INTERNAL_COPY || ap->mf_Status.preMore == MORE_INTERNAL_MOVE)) {
+                               ap->mf_Status.more = ap->mf_Status.preMore;
+                       } else if (ap->mf_Status.more != MORE_INTERNAL_COPY_MOVE && ap->mf_Status.preMore != MORE_INTERNAL_COPY && ap->mf_Status.preMore != MORE_INTERNAL_MOVE) {
+                               ap->mf_Status.more = MORE_DEFAULT;
+                       }
+                       mf_navi_bar_refresh_recovered_view(ap, pNaviToShowStruct);
+               }
+
        }
 
        /*delete external storage from tab bar*/
index 61c7c9d..525ed29 100644 (file)
@@ -29,6 +29,7 @@
 #include "mf-share.h"
 #include "mf-resource.h"
 
+
 int mf_share_mode_get(Eina_List * selected_list)
 {
        mf_retvm_if(selected_list == NULL, -1, "selected_list is NULL");
@@ -41,7 +42,7 @@ int mf_share_mode_get(Eina_List * selected_list)
        EINA_LIST_FOREACH(selected_list, l, pNode) {
                if (pNode != NULL) {
                        char *file_path = pNode->str;
-                       if (ecore_file_is_dir(file_path)) {
+                       if (mf_file_attr_is_dir(file_path)) {
                                return 0;
                        }
 
@@ -79,55 +80,57 @@ static int __mf_share_get_selected_files(void *data, gchar ** selected_files, Ei
 
        int file_count = 0;
        Eina_List *l = NULL;
-       GString *pNode = NULL;
        gchar *message = NULL;
 
-       EINA_LIST_FOREACH(ap->mf_FileRecordList.selected_files, l, pNode) {
-               if (pNode != NULL) {
-                       if (!ecore_file_is_dir(pNode->str) && mf_drm_is_drm_file(pNode->str) == 0) {
-                               if (mf_drm_is_converted_fl(pNode->str) == 0) {
-                                       message = g_strconcat(GET_STR(MF_POPUP_MESSAGE_SEND_FAIL1), "<br>", ecore_file_file_get(pNode->str),
-                                                       GET_STR(MF_POPUP_MESSAGE_SEND_FAIL2), NULL);
-                                       ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message,
-                                                                                        NULL, NULL, NULL, NULL, NULL);
-
-                                       g_free(message);
-                                       message = NULL;
+       {
+               GString *pNode = NULL;
+               EINA_LIST_FOREACH(selected_list, l, pNode) {
+                       if (pNode != NULL) {
+                               if (!mf_file_attr_is_dir(pNode->str) && mf_drm_is_drm_file(pNode->str) == 0) {
+                                       if (mf_drm_is_converted_fl(pNode->str) == 0) {
+                                               message = g_strconcat(GET_STR(MF_POPUP_MESSAGE_SEND_FAIL1), "<br>", ecore_file_file_get(pNode->str),
+                                                               GET_STR(MF_POPUP_MESSAGE_SEND_FAIL2), NULL);
+                                               ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message,
+                                                                                                NULL, NULL, NULL, NULL, NULL);
+
+                                               g_free(message);
+                                               message = NULL;
+                                               if (*selected_files != NULL) {
+                                                         g_free(*selected_files);
+                                                         *selected_files = NULL;
+                                               }
+                                               MF_TRACE_END;
+                                               return -1;
+                                       }
+                               } else if (mf_file_attr_is_dir(pNode->str)) {
+                                       message = GET_STR(MF_POPUP_MESSAGE_SEND_FAIL3);
+                                       ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
+
                                        if (*selected_files != NULL) {
-                                                 g_free(*selected_files);
-                                                 *selected_files = NULL;
+                                               g_free(*selected_files);
+                                               *selected_files = NULL;
                                        }
                                        MF_TRACE_END;
                                        return -1;
                                }
-                       } else if (ecore_file_is_dir(pNode->str)) {
-                               message = GET_STR(MF_POPUP_MESSAGE_SEND_FAIL3);
-                               ap->mf_MainWindow.pNormalPopup = mf_popup_create_popup(ap, POPMODE_TEXT, NULL, message, NULL, NULL, NULL, NULL, NULL);
 
-                               if (*selected_files != NULL) {
-                                       g_free(*selected_files);
-                                       *selected_files = NULL;
-                               }
-                               MF_TRACE_END;
-                               return -1;
-                       }
-
-                       if (*selected_files == NULL) {
-                               *selected_files = g_strconcat(pNode->str, NULL);
-                               file_count++;
-                       } else {
-                               gchar *temp = *selected_files;
-                               if (ap->mf_Status.more == MORE_SENDVIABLUETOOTH
-                               ) {
-                                       *selected_files = g_strconcat(*selected_files, "?", pNode->str, NULL);
+                               if (*selected_files == NULL) {
+                                       *selected_files = g_strconcat(pNode->str, NULL);
                                        file_count++;
-                               }
-                               else {
-                                       *selected_files = g_strconcat(*selected_files, "\n", pNode->str, NULL);
-                                       file_count++;
-                               }
+                               } else {
+                                       gchar *temp = *selected_files;
+                                       if (ap->mf_Status.more == MORE_SENDVIABLUETOOTH
+                                       ) {
+                                               *selected_files = g_strconcat(*selected_files, "?", pNode->str, NULL);
+                                               file_count++;
+                                       }
+                                       else {
+                                               *selected_files = g_strconcat(*selected_files, "\n", pNode->str, NULL);
+                                               file_count++;
+                                       }
 
-                               g_free(temp);
+                                       g_free(temp);
+                               }
                        }
                }
        }
@@ -144,8 +147,12 @@ void mf_share_launch_multi_file(void *data)
        int number_of_files = 0;
        char count_arg[20] = { 0, };
        const char *message = NULL;
+       Eina_List *select_list = NULL;
 
-       number_of_files = __mf_share_get_selected_files(ap, &myFilenames, ap->mf_FileRecordList.selected_files);
+       {
+               select_list = ap->mf_FileRecordList.selected_files;
+       }
+       number_of_files = __mf_share_get_selected_files(ap, &myFilenames, select_list);
        if (number_of_files < 0) {
                MF_TRACE_END;
                return;
index 2fdce26..ab7a173 100644 (file)
@@ -397,16 +397,14 @@ int mf_util_refresh_screen(void *data)
                        if (pNavi_s == NULL) {
                                continue;
                        }
-                       /*1.1   pop the temporary view in each navigation bar*/
-                       if (pNavi_s->naviFlagEditJoin == TRUE) {
-                               pNavi_s->naviFlagEditJoin = FALSE;
-                       }
                        /*1.2   reset current path for each navigation bar*/
                        SAFE_FREE_CHAR(pNavi_s->pCurrentPath);
-                       pNavi_s->pCurrentPath = g_strdup(pNavi_s->pre_operation.path->str);
-
-                       /*2.1   free the backup data structure */
-                       g_string_free(pNavi_s->pre_operation.path, TRUE);
+                       if (pNavi_s->pre_operation.path && pNavi_s->pre_operation.path->str) {
+                               pNavi_s->pCurrentPath = g_strdup(pNavi_s->pre_operation.path->str);
+                               g_string_free(pNavi_s->pre_operation.path, TRUE);
+                       } else {
+                               pNavi_s->pCurrentPath = g_strdup(PHONE_FOLDER);
+                       }
                        pNavi_s->pre_operation.path = NULL;
                        memset(&(pNavi_s->pre_operation), 0, sizeof(oper_record));
 
@@ -609,6 +607,7 @@ int mf_util_get_eina_list_len(const Eina_List *list)
 
 void mf_util_free_eina_list_with_data(Eina_List **list, MYFILE_CONTENT_TYPE type)
 {
+       MF_TRACE_BEGIN;
        if (list == NULL || *list == NULL) {
                return;
        }
@@ -652,6 +651,7 @@ void mf_util_free_eina_list_with_data(Eina_List **list, MYFILE_CONTENT_TYPE type
 
        eina_list_free(*list);
        *list = NULL;
+       MF_TRACE_END;
        return;
 }
 
@@ -1249,9 +1249,11 @@ int mf_util_generate_file_list(void *data)
        return error_code;
 }
 
-int mf_util_generate_root_view_file_list(Eina_List **list, int storage_state)
+int mf_util_generate_root_view_file_list(void *data, Eina_List **list, int storage_state)
 {
        MF_TRACE_BEGIN;
+       mf_retvm_if(data == NULL, 0, "data is null");
+       struct appdata *ap = (struct appdata *)data;
 
        fsNodeInfo *pNode = NULL;
        pNode = (fsNodeInfo *) malloc(sizeof(fsNodeInfo));
index 861e585..c388210 100644 (file)
@@ -117,5 +117,10 @@ void mf_callback_imf_hide_cb(void *data, Evas_Object *obj, void *event_info);
 void mf_callback_naviframe_title_clicked_cb(void *data, Evas_Object *obj, void *event_info);
 void mf_callback_entry_button_pressed_cb(void *data, Evas_Object * obj, void *event_info);
 void mf_callback_entry_button_unpressed_cb(void *data, Evas_Object * obj, void *event_info);
+void mf_callback_storage_remove_view_operation(void *data, int optStorage);
+void mf_callback_storage_remove_category_view_items(void *data, int optStorage);
+void mf_callback_imf_state_callback_register(void *data);
+void mf_callback_imf_state_callback_del(void *data);
+void mf_callback_illegal_char_popup_cb(void *data, Evas_Object * obj, void *event_info);
 
 #endif
index 3c469a6..99f0c5d 100644 (file)
@@ -33,6 +33,8 @@
 
 #define LOG_TAG                "MYFILES"
 #include <dlog.h>
+#define LOG_COLOR_RED      "\033[31m"
+#define LOG_COLOR_RESET    "\033[0m"
 
 #define MYFILE_TRACE_DEBUG(fmt, arg...) do { LOGD("[%s][%d] "fmt "\n", __FILE__, __LINE__, ##arg); } while (0)
 #define MYFILE_TRACE_ERROR(fmt, arg...) do { LOGE("[%s][%d] "fmt"\n", strrchr(__FILE__, '/')+1, __LINE__, ##arg); } while (0)
 #define mf_func_line()                 do { LOGD("[%s][%s][%d] \n", __FILE__, __func__, __LINE__); } while (0)
 #define mf_debug(fmt, args...) do { LOGD("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
 
-#define mf_error(fmt, args...)         do {\
-                                               LOGE("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); \
-                                               MF_LOG_RECORD(fmt,##args); \
-                                          } while (0)
+#define mf_error(fmt, arg...)  LOGE(LOG_COLOR_RED"[ %s : %d]   "fmt""LOG_COLOR_RESET, __FUNCTION__, __LINE__,##arg)
 #define mf_warnig(fmt, args...)        do { LOGW("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
 #define mf_info(fmt, args...)          do { LOGI("[%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
 #define mf_assert(fmt, args...)        do { LOGE("[ASSERT][%s][%d] "fmt"\n", __func__, __LINE__, ##args); } while (0)
index 7902a00..e0a8993 100644 (file)
@@ -76,5 +76,6 @@ gboolean mf_fm_svc_is_mass_storage_on();
 char *mf_fm_svc_path_info_get(const char *original_path);
 char *mf_fm_svc_path_info_translate(char *path_info, int path_info_max_len);
 char *mf_fm_svc_get_file_name(GString *path);
+char *mf_fm_svc_get_file_name_without_ext(const char *name);
 
 #endif
index 61e29cc..65164a4 100644 (file)
@@ -61,6 +61,8 @@
 #define OTG_FOLDER             "/opt/storage/usb"
 #define OTG_NAME               "usb"
 #endif
+
+
 #define DEBUG_FOLDER           "SLP_debug"
 
 #define MYFILE_NAME_PATTERN    "[\\:;*\"<>|?/]"
 #define MF_ICON_ENTRY_FOLDER_PRESS     ICON_PATH"/myfile_icon_entry_folder_press.png"
 
 
+
+/************************myfile_5shortcut****************************/
+#define MF_ICON_SHORTCUT_LCIR_BOTOM  ICON_PATH"/myfile_icon_shortcut_left.png"
+#define MF_ICON_SHORTCUT_RCIR_BOTOM  ICON_PATH"/myfile_icon_shortcut_right.png"
+#define MF_ICON_SHORTCUT_IMAGE_BOTOM  ICON_PATH"/myfile_icon_shortcut_image.png"
+#define MF_ICON_SHORTCUT_IMAGE_PRESS_BOTOM  ICON_PATH"/myfile_icon_shortcut_image_press.png"
+#define MF_ICON_SHORTCUT_VIDEO_BOTOM ICON_PATH"/myfile_icon_shortcut_video.png"
+#define MF_ICON_SHORTCUT_VIDEO_PRESS_BOTOM ICON_PATH"/myfile_icon_shortcut_video_press.png"
+#define MF_ICON_SHORTCUT_SOUND_BOTOM ICON_PATH"/myfile_icon_shortcut_sound.png"
+#define MF_ICON_SHORTCUT_SOUND_PRESS_BOTOM ICON_PATH"/myfile_icon_shortcut_sound_press.png"
+#define MF_ICON_SHORTCUT_DOCUMENT_BOTOM ICON_PATH"/myfile_icon_shortcut_document.png"
+#define MF_ICON_SHORTCUT_DOCUMENT_PRESS_BOTOM  ICON_PATH"/myfile_icon_shortcut_document_press.png"
+#define MF_ICON_SHORTCUT_OTHERS_BOTOM  ICON_PATH"/myfile_icon_shortcut_others.png"
+#define MF_ICON_SHORTCUT_OTHERS_PRESS_BOTOM  ICON_PATH"/myfile_icon_shortcut_others_press.png"
+/*****************************************************************/
+
+
 #define MF_ICON_THUMBNAIL_EXCEL                ICON_PATH"/myfile_thumbnail_icon_excel.png"
 #define MF_ICON_THUMBNAIL_FOLDER       ICON_PATH"/myfile_thumbnail_icon_folder.png"
 #define MF_ICON_THUMBNAIL_FOLDER_OPEN  ICON_PATH"/myfile_thumbnail_icon_folder_open.png"
@@ -390,5 +409,6 @@ const char *mf_file_attr_get_default_thumbnail_by_type(fsFileType ftype);
 int mf_file_attr_get_path_level(const char *fullpath, int *level);
 int mf_file_attr_is_system_dir(char *fullpath, bool *result);
 int mf_file_attr_is_disk_link(const char *fullpath, bool *result);
+fsFileType mf_file_attr_get_file_type(const char *mime);
 
 #endif
index 6bdb6f5..e07161f 100644 (file)
 #ifndef __DEF_MYFILE_GENGRID_H
 #define __DEF_MYFILE_GENGRID_H
 
+#include "mf-util.h"
+
 #define MF_LANDSCAPE_GENGRID_ITEM_WIDTH                118
 #define MF_LANDSCAPE_GENGRID_ITEM_HEIGTH       161
 
-#define MF_SCALE_FACTORY                       elm_config_scale_get()
 #define MF_ICON_SIZE                           (165*MF_SCALE_FACTORY)
 
 
-#define MF_WVGA_GENGRID_ITEM_WIDTH             (184*MF_SCALE_FACTORY)
-
-#define MF_WVGA_GENGRID_ITEM_HEIGTH            (240*MF_SCALE_FACTORY)
 
 
-#define MF_HD_GENGRID_ITEM_WIDTH               (int)((8*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(8*MF_SCALE_FACTORY))
+#define MF_HD_GENGRID_ITEM_WIDTH               177*MF_SCALE_FACTORY //(int)((8*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(8*MF_SCALE_FACTORY))
 
-#define MF_HD_GENGRID_ITEM_HEIGTH              (int)((18*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(72*MF_SCALE_FACTORY))
+#define MF_HD_GENGRID_ITEM_HEIGTH              (177 + 64)*MF_SCALE_FACTORY//(int)((18*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(72*MF_SCALE_FACTORY))
 
 void mf_gengrid_create_grid_items(void *data, Evas_Object *grid, Eina_List *file_list);
 
-Evas_Object *mf_gengrid_create_grid (Evas_Object *parent);
+Evas_Object *mf_gengrid_create_grid(Evas_Object *parent);
+Evas_Object *mf_gengrid_create(Evas_Object *parent);
 
 void mf_gengrid_refresh(void *data);
 void mf_gengrid_get_grid_selected_files(Evas_Object *gengrid, Eina_List **list);
index 92534ba..3a81a22 100644 (file)
@@ -57,9 +57,9 @@
 
 #define CTRL_DISABLE_EDIT_ALL                          (CTRL_DISABLE_DELETE | CTRL_DISABLE_SEND | CTRL_DISABLE_MORE)
 #define CTRL_DISABLE_DEFAULT_SEL                       (CTRL_DISABLE_COPY)
-#define CTRL_DISABLE_NOCONTENT_VIEW                    (CTRL_DISABLE_EDIT | CTRL_DISABLE_LIST_BY | CTRL_DISABLE_SEARCH)
+#define CTRL_DISABLE_NOCONTENT_VIEW                    (CTRL_DISABLE_EDIT | CTRL_DISABLE_SEND)
 #define CTRL_DISABLE_USER_FOLDER_SEL                   (CTRL_DISABLE_DELETE | CTRL_DISABLE_MORE)
-#define CTRL_DISABLE_DEFAULT_ALL                       (CTRL_DISABLE_LIST_BY | CTRL_DISABLE_MORE | CTRL_DISABLE_EDIT | CTRL_DISABLE_SEARCH)
+#define CTRL_DISABLE_DEFAULT_ALL                       (CTRL_DISABLE_SEND | CTRL_DISABLE_MORE | CTRL_DISABLE_EDIT | CTRL_DISABLE_SEARCH)
 #define CTRL_DISABLE_OTG_ROOT                          ~CTRL_DISABLE_SEARCH
 #define CTRL_DISABLE_SYSFOLDER_SELECT                  (CTRL_DISABLE_MOVE_HERE)
 #define CTRL_DISABLE_OTG_OPT_ROOT                      (CTRL_DISABLE_MOVE_HERE | CTRL_DISABLE_COPY_HERE | CTRL_DISABLE_CREATE)
@@ -111,7 +111,6 @@ struct _myfileNaviBar {
        MORE_TYPE pre_more;     /*for tab function only*/
        bool naviFlagInUse;
        bool naviFlagEditStart;
-       bool naviFlagEditJoin;  /*to indicate if pop in refresh needed*/
 };
 
 typedef struct _mfEditView mfEditView;
@@ -191,9 +190,6 @@ struct _myfileMainWindow {
        Evas_Object *pNaviInfoBox;
        Evas_Object *pTrayBox;
 
-       const Elm_Object_Item *pSearchViewSweepItem;
-       const Elm_Object_Item *pPreSearchViewSweepItem;
-       Ecore_Timer *pSearchViewTimer;
        Ecore_Timer *pPopupTimer;
 
 #ifdef MYFILE_SPLIT_VIEW
@@ -274,6 +270,7 @@ struct _myfileStatus {
        Evas_Object *old_content;
 
        bool b_run_background; /* 20121008 added for fix PLM P121001-0404 temporary */
+
 };
 
 
index 8836400..22e5925 100644 (file)
@@ -91,6 +91,7 @@
 #define GL_SHARE_PICASA                        "IDS_COM_BODY_PICASA"
 #define MF_LABEL_BACK                  "IDS_COM_SK_BACK"
 #define MF_LABEL_ADDED                 "IDS_COM_OPT_ADDED"
+#define MF_LABEL_SEARCHING             "IDS_COM_POP_SEARCHING"
 /******************  Local strings ****************/
 
 /**********No string ID  ************/
 #define MF_LABEL_Z_TO_A                                "Z to A"
 #define MF_LABEL_MOST_RECENT                   "Most recent"
 #define MF_LABEL_OLDEST                                "Oldest"
+#define MF_LABE_NOT_SUPPORT                    "Not support now"
 /********************  local string ID ************/
 
 #define MF_POPUP_MESSAGE_SEND_FAIL1            "IDS_MF_POP_SEND_FAILED"
index 57fe369..dd94c96 100644 (file)
 #include "mf-conf.h"
 #include "mf-fs-util.h"
 
-#define MF_ICON_CATEGORY_BG                            ICON_PATH"/myfile_icon_category_bg.png"
-#define MF_ICON_CATEGORY_BG_PRESS                      ICON_PATH"/myfile_icon_category_bg_press.png"
-
-#define MF_ICON_CATEGORY_IMAGE                         ICON_PATH"/myfile_icon_category_image.png"
-#define MF_ICON_CATEGORY_VIDEO                         ICON_PATH"/myfile_icon_category_video.png"
-#define MF_ICON_CATEGORY_SOUNDS                                ICON_PATH"/myfile_icon_category_sounds.png"
-#define MF_ICON_CATEGORY_DOCUMENT                      ICON_PATH"/myfile_icon_category_document.png"
-#define MF_ICON_CATEGORY_OTHERS                                ICON_PATH"/myfile_icon_category_others.png"
-
-#define MF_ICON_CATEGORY_IMAGE_PRESS                   ICON_PATH"/myfile_icon_category_image_press.png"
-#define MF_ICON_CATEGORY_VIDEO_PRESS                   ICON_PATH"/myfile_icon_category_video_press.png"
-#define MF_ICON_CATEGORY_SOUNDS_PRESS                  ICON_PATH"/myfile_icon_category_sounds_press.png"
-#define MF_ICON_CATEGORY_DOCUMENT_PRESS                        ICON_PATH"/myfile_icon_category_document_press.png"
-#define MF_ICON_CATEGORY_OTHERS_PRESS                  ICON_PATH"/myfile_icon_category_others_press.png"
+#define MF_ICON_SHORTCUT_IMAGE                         ICON_PATH"/myfile_icon_shortcut_image.png"
+#define MF_ICON_SHORTCUT_VIDEO                         ICON_PATH"/myfile_icon_shortcut_video.png"
+#define MF_ICON_SHORTCUT_SOUNDS                                ICON_PATH"/myfile_icon_shortcut_sound.png"
+#define MF_ICON_SHORTCUT_DOCUMENT                      ICON_PATH"/myfile_icon_shortcut_document.png"
+#define MF_ICON_SHORTCUT_OTHERS                                ICON_PATH"/myfile_icon_shortcut_others.png"
+
+#define MF_ICON_SHORTCUT_IMAGE_PRESS                   ICON_PATH"/myfile_icon_shortcut_image_press.png"
+#define MF_ICON_SHORTCUT_VIDEO_PRESS                   ICON_PATH"/myfile_icon_shortcut_video_press.png"
+#define MF_ICON_SHORTCUT_SOUNDS_PRESS                  ICON_PATH"/myfile_icon_shortcut_sound_press.png"
+#define MF_ICON_SHORTCUT_DOCUMENT_PRESS                        ICON_PATH"/myfile_icon_shortcut_document_press.png"
+#define MF_ICON_SHORTCUT_OTHERS_PRESS                  ICON_PATH"/myfile_icon_shortcut_others_press.png"
+
 
 #ifdef MYFILE_TRAY_FEATURE
 
index 2696105..26ac521 100644 (file)
@@ -31,7 +31,7 @@
 #include "mf-fo-common.h"
 #include "mf-fs-util.h"
 
-
+#define MF_SCALE_FACTORY               elm_config_scale_get()
 #define SAFE_FREE_CHAR(x) do {\
                                        if ((x) != NULL) {\
                                                free(x); \
@@ -148,6 +148,7 @@ typedef enum _MORE_TYPE MORE_TYPE;
 enum _MORE_TYPE {                      /* softkey / contextual popup */
        MORE_DEFAULT = 0,
        MORE_EDIT,
+       MORE_SHARE_EDIT,
        MORE_CREATE_FOLDER,
        MORE_DELETE,
        MORE_IDLE_DELETE,
@@ -287,7 +288,7 @@ int mf_util_generate_file_list(void *data);
 char *mf_util_get_text(const char *ID);
 void mf_util_set_view_style(int value);
 void mf_util_rotate_state_set(void *data, app_device_orientation_e  rotate_mode);
-int mf_util_generate_root_view_file_list(Eina_List **list, int storage_state);
+int mf_util_generate_root_view_file_list(void *data, Eina_List **list, int storage_state);
 void mf_util_set_extension_state(int value);
 const char *mf_util_search_markup_keyword(const char *string, char *searchword, bool *result);
 void mf_util_set_recent_file(char *path);
@@ -295,5 +296,7 @@ Eina_List *mf_util_get_all_selected_items(void *data);
 void mf_util_remove_item_from_list_by_location(Eina_List **list, int location);
 void mf_util_generate_list(Eina_List **list, const char *path, int file_type);
 bool mf_util_is_rotation_lock(void);
-
+void mf_util_remove_item_from_list_by_name(Eina_List **list, const char *path);
+fsNodeInfo *mf_util_generate_pnode(const char *path, int file_type);
+void mf_util_update_item_from_list_by_name(Eina_List **list, const char *path, char *new_name);
 #endif /* __DEF_MYFILE_UTIL_H_ */
index 50e3206..6f2ea5a 100644 (file)
@@ -187,7 +187,6 @@ Evas_Object *mf_navi_bar_create_header_box(void *data);
 void mf_navi_bar_reset_ctrl_button(void *data);
 void mf_navi_bar_button_set_disable(Elm_Object_Item *navi_it, int disable_item, bool disable);
 int mf_navi_bar_button_get_disable(Elm_Object_Item *navi_it);
-void mf_navi_bar_set_toolbar_visible(Elm_Object_Item *navi_item, bool visible);
 void mf_navi_bar_set_panes_navi_to_main(void *data);
 
 /***********   Content Definition              ************/
@@ -257,7 +256,6 @@ typedef enum {
        POPMODE_TEXT,
        POPMODE_TITLE_TEXT,
        POPMODE_TEXT_NOT_DISABLED,
-       POPMODE_TEXT_BTN_SEARCH,
        POPMODE_TEXT_TWO_BTN,
        POPMODE_TITLE_TEXT_TWO_BTN,
        POPMODE_TEXT_BTN,
@@ -265,7 +263,6 @@ typedef enum {
        POPMODE_TITLE_TEXT_THREE_BTN,
        POPMODE_PROGRESSBAR,
        POPMODE_TITLE_LIST_BTN,
-       POPMODE_STORAGE_BTN,
        POPMODE_VIEW_AS_LIST,
        POPMPDE_MAX
 } ePopMode;
@@ -298,7 +295,6 @@ Evas_Object *mf_popup_create_popup(void *data, ePopMode popupMode, char *title,
                                   const char *third_btn_text, Evas_Smart_Cb func, void *param);
 Evas_Object *mf_popup_create_pb_popup(void *data, char *context, int file_count, void *func, void *param);
 void mf_popup_indicator_popup(void *data, const char *text);
-
 /***********   Search Bar API  ************/
 Evas_Object *mfSearchBarCreate(void *data);
 
index 698e0e5..4a3f1bc 100644 (file)
@@ -853,6 +853,9 @@ void __mf_main_terminate_app(void *data)
 #endif
        mf_sbeam_finalize();
 
+#ifdef MYFILE_SPLIT_VIEW
+       SAFE_FREE_OBJ(ap->mf_MainWindow.sSplitData.pPanes);
+#endif
        if (ap->mf_FileOperation.job_pop_list != NULL) {        /*job callback must not run before*/
                mf_util_clear_handler_list(ap);
                ap->mf_FileOperation.job_pop_list = NULL;
index 4fed9fa..2af2bf7 100644 (file)
@@ -295,6 +295,7 @@ static void __mf_share_select(void *data, Evas_Object * obj, void *event_info)
        if (item != NULL) {
                const char *label = NULL;
                label = elm_object_item_text_get(item);
+               ap->mf_Status.preMore = MORE_SHARE_EDIT;
                if (g_strcmp0(label, GET_SYS_STR(MF_POP_MSG_BT)) == 0) {
                        ap->mf_Status.more = MORE_SENDVIABLUETOOTH;
                } else if (g_strcmp0(label, GET_SYS_STR(MF_POP_MSG_EMAIL)) == 0) {
index 3e53e80..24d6d40 100644 (file)
@@ -31,7 +31,7 @@ static inline void __mf_gengrid_get_thumbnail(mfItemData_s *params)
 {
        int error_code = 0;
        if (params->thumb_path == NULL) {
-               if (ecore_file_is_dir(params->m_ItemName->str)) {
+               if (mf_file_attr_is_dir(params->m_ItemName->str)) {
                        if (params->ap->mf_Status.view_type == mf_view_root) {
                                params->thumb_path = strdup(MF_ICON_THUMBNAIL_FOLDER);
                        } else if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
@@ -76,7 +76,7 @@ static inline void __mf_gengrid_get_thumbnail(mfItemData_s *params)
                /*set default icon*/
                fsFileType type = FILE_TYPE_NONE;
                type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str);
-               if (ecore_file_is_dir(params->m_ItemName->str)) {
+               if (mf_file_attr_is_dir(params->m_ItemName->str)) {
                        if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
                                params->thumb_path = strdup(MF_ICON_EXTERNAL_DEVICE);
                        } else {
@@ -109,7 +109,7 @@ static void __mf_gengrid_icon_clicked(void *data, Evas_Object *obj, void *event_
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        int ret = 0;
 
-       if (ap->mf_Status.more == MORE_EDIT)
+       if (ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT)
                return;
        if (item != NULL) {
                elm_gengrid_item_selected_set(item, EINA_FALSE);
@@ -332,7 +332,7 @@ void mf_gengrid_item_select(void *data, Evas_Object *pGengrid, int *file_count,
        while (it) {
                itemData = elm_object_item_data_get(it);
                if (itemData->m_checked) {
-                       if (ecore_file_is_dir(itemData->m_ItemName->str)) {
+                       if (mf_file_attr_is_dir(itemData->m_ItemName->str)) {
                                //bool systemfolder = FALSE;
                                ap->mf_Status.flagFolderSelect = TRUE;
                                (*dir_count)++;
@@ -401,39 +401,13 @@ static Evas_Object *__mf_gengrid_item_icon_get(void *data, Evas_Object *obj, con
        mf_retvm_if(ap == NULL, NULL, "ap is NULL");
 
        if (!strcmp(part, "elm.swallow.icon")) {
-               Evas_Object *bg = elm_bg_add(obj);
                __mf_gengrid_get_thumbnail(params);
-               elm_bg_load_size_set(bg, MF_ICON_SIZE, MF_ICON_SIZE);
 
-               if (bg) {
-                       elm_bg_file_set(bg, params->thumb_path, NULL);
-                       evas_object_size_hint_max_set(bg, MF_ICON_SIZE, MF_ICON_SIZE);
-                       evas_object_size_hint_aspect_set(bg, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-                       evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
-                       evas_object_show(bg);
-
-               }
-               fsFileType type = FILE_TYPE_NONE;
-               type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str);
-               if (type == FILE_TYPE_VIDEO) {
-                       Evas_Object *layout = NULL;;
-                       layout = elm_layout_add(obj);
-                       elm_object_focus_set(layout, EINA_FALSE);
-                       elm_layout_file_set(layout, EDJ_NAME, GRP_THUMBNAIL_ONLY);
-                       elm_object_part_content_set(layout, "thumbnail", bg);
-
-                       const char *play_icon_path = MF_ICON_THUMBNAIL_VIDEO_PLAY;
-                       Evas_Object *play_icon = NULL;
-                       play_icon = elm_image_add(obj);
-                       elm_object_focus_set(play_icon, EINA_FALSE);
-                       elm_image_file_set(play_icon, play_icon_path, NULL);
-                       evas_object_show(play_icon);
-                       elm_object_part_content_set(layout, "video_play", play_icon);
-                       return layout;
-
-               }
-               return bg;
+               Evas_Object *icon = elm_image_add(obj);
+               elm_image_file_set(icon, params->thumb_path, NULL);
+               elm_image_aspect_fixed_set(icon, EINA_FALSE);
+               evas_object_show(icon);
+               return icon;
        } else if (!strcmp(part, "elm.swallow.block") && params->ap->mf_Status.more == MORE_EDIT) {
                Evas_Object *layout = elm_layout_add(obj);
                elm_layout_theme_set(layout, "gengrid", "item", "block/default");
@@ -528,12 +502,31 @@ static void __mf_gengrid_item_del(void *data, Evas_Object * obj)
 
 
 
-Evas_Object *mf_gengrid_create_grid (Evas_Object *parent)
+void mf_gengrid_gen_style_set()
+{
+       gic.item_style = "default_gridtext";
+       gic.func.text_get = __mf_gengrid_item_label_get;
+       gic.func.content_get = __mf_gengrid_item_icon_get;
+       gic.func.state_get = NULL;
+       gic.func.del = __mf_gengrid_item_del;
+}
+
+Evas_Object *mf_gengrid_create(Evas_Object *parent)
 {
        MF_TRACE_BEGIN;
        mf_retvm_if(parent == NULL, NULL, "parent is NULL");
+
        Evas_Object *grid = NULL;
+       grid = mf_gengrid_create_grid(parent);
+       mf_gengrid_gen_style_set();
+       return grid;
+}
 
+Evas_Object *mf_gengrid_create_grid (Evas_Object *parent)
+{
+       MF_TRACE_BEGIN;
+       mf_retvm_if(parent == NULL, NULL, "parent is NULL");
+       Evas_Object *grid = NULL;
        grid = elm_gengrid_add(parent);
        evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -543,13 +536,6 @@ Evas_Object *mf_gengrid_create_grid (Evas_Object *parent)
        elm_gengrid_horizontal_set(grid, EINA_FALSE);
        elm_scroller_bounce_set(grid, EINA_FALSE, EINA_TRUE);
        elm_gengrid_multi_select_set(grid, EINA_TRUE);
-
-       gic.item_style = "default_gridtext";
-       gic.func.text_get = __mf_gengrid_item_label_get;
-       gic.func.content_get = __mf_gengrid_item_icon_get;
-       gic.func.state_get = NULL;
-       gic.func.del = __mf_gengrid_item_del;
-
        evas_object_show(grid);
        return grid;
 }
@@ -607,15 +593,11 @@ Evas_Object *mf_gengrid_create_list(void *data, Evas_Object *parent)
                dir_list = ap->mf_FileOperation.folder_list;
        }
 
-       gengrid = mf_gengrid_create_grid(parent);
+       gengrid = mf_gengrid_create(parent);
 
        evas_object_smart_callback_add(gengrid, "longpressed",
                                       __mf_gengrid_thumbs_longpressed, ap);
-       if (MF_SCALE_FACTORY == 1) {
-               elm_gengrid_item_size_set(gengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH);
-       } else {
-               elm_gengrid_item_size_set(gengrid, MF_WVGA_GENGRID_ITEM_WIDTH, MF_WVGA_GENGRID_ITEM_HEIGTH);
-       }
+       elm_gengrid_item_size_set(gengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH);
 
        if (gengrid == NULL) {
                return NULL;
index 1b3f209..b548daf 100644 (file)
@@ -66,31 +66,6 @@ static void __mf_genlist_gl_del(void *data, Evas_Object *obj);
 static Eina_Bool __mf_genlist_gl_state_get(void *data, Evas_Object *obj, const char *part);
 static inline void __mf_genlist_get_thumbnail(mfItemData_s *params);
 
-static void __mf_genlist_reset_serch_sweep_item(void *data)
-{
-       struct appdata *ap = data;
-       mf_retm_if(ap == NULL, "input ad is NULL");
-       mf_retm_if(ap->mf_Status.more != MORE_SEARCH, "more is not MORE_SEARCH");
-       mf_retm_if(ap->mf_MainWindow.pNaviGenlist == NULL, "input pNaviGenlist is NULL");
-       mf_retm_if(ap->mf_MainWindow.pSearchViewSweepItem == NULL, "input pSearchViewSweepItem is NULL");
-       const Elm_Object_Item *decorated_item = elm_genlist_decorated_item_get(ap->mf_MainWindow.pNaviGenlist);
-       Elm_Object_Item *item = NULL;
-       if(decorated_item) {
-               mf_debug("it is decorate status");
-               ap->mf_MainWindow.pSearchViewSweepItem = decorated_item;
-               return;
-       }
-
-       for(item =  elm_genlist_first_item_get(ap->mf_MainWindow.pNaviGenlist); item != NULL; item = elm_genlist_item_next_get(item)) {
-               if(item == ap->mf_MainWindow.pSearchViewSweepItem) {
-                       //elm_object_scroll_freeze_push(ap->mf_MainWindow.pNaviGenlist);
-                       elm_genlist_item_decorate_mode_set(item, "slide", EINA_TRUE);
-                       elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE);
-                       //elm_object_scroll_freeze_pop(ap->mf_MainWindow.pNaviGenlist);
-                       return;
-               }
-       }
-}
 
 void mf_genlist_rename_done(void *data, Evas_Object *obj, void *event_info)
 {
@@ -209,21 +184,6 @@ static Evas_Object *__mf_genlist_rename_editfiled_create(void *data, Evas_Object
        return edit_field;
 }
 
-static Eina_Bool __mf_genlist_timer_cb(void *data)
-{
-       struct appdata *ap = (struct appdata *)data;
-       mf_retvm_if(ap == NULL, EINA_FALSE, "ap is null");
-
-       if (ap->mf_MainWindow.pPreSearchViewSweepItem)
-               elm_genlist_item_update(ap->mf_MainWindow.pPreSearchViewSweepItem);
-
-       if(ap->mf_MainWindow.pSearchViewTimer) {
-               ecore_timer_del(ap->mf_MainWindow.pSearchViewTimer);
-               ap->mf_MainWindow.pSearchViewTimer = NULL;
-       }
-       return false;
-}
-
 void mf_genlist_gl_mode_sweep_set(void *data, Evas_Object *obj, void *event_info)
 {
        MF_TRACE_BEGIN;
@@ -241,7 +201,7 @@ void mf_genlist_gl_mode_sweep_set(void *data, Evas_Object *obj, void *event_info
        if (ap->mf_Status.more == MORE_RENAME) {
                mf_genlist_rename_done(ap, NULL, NULL);
                return;
-       } else if(ap->mf_Status.more == MORE_EDIT) {
+       } else if(ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) {
                return;
        }
 
@@ -250,8 +210,6 @@ void mf_genlist_gl_mode_sweep_set(void *data, Evas_Object *obj, void *event_info
        }
        /* Start genlist sweep */
        Elm_Object_Item *it = (Elm_Object_Item *)elm_genlist_decorated_item_get(obj);
-       mf_debug("it=%p, event_info=%p, pSearchViewSweepItem=%p",
-               it, event_info, ap->mf_MainWindow.pSearchViewSweepItem);
        if (it && (it != event_info)) {
                elm_genlist_item_decorate_mode_set(it, "slide", EINA_FALSE);
                elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DEFAULT);
@@ -262,16 +220,6 @@ void mf_genlist_gl_mode_sweep_set(void *data, Evas_Object *obj, void *event_info
        elm_genlist_item_decorate_mode_set(event_info, "slide", EINA_TRUE);
        elm_genlist_item_select_mode_set(event_info, ELM_OBJECT_SELECT_MODE_NONE);
 
-       if (ap->mf_Status.more == MORE_SEARCH && event_info) {
-               if(ap->mf_MainWindow.pSearchViewTimer) {
-                       ecore_timer_del(ap->mf_MainWindow.pSearchViewTimer);
-                       ap->mf_MainWindow.pSearchViewTimer = NULL;
-               }
-               ap->mf_MainWindow.pSearchViewTimer = ecore_timer_add(0.3, __mf_genlist_timer_cb, ap);
-               ap->mf_MainWindow.pPreSearchViewSweepItem = it;
-               ap->mf_MainWindow.pSearchViewSweepItem = event_info;
-       }
-
        MF_TRACE_END;
 }
 
@@ -294,22 +242,10 @@ void mf_genlist_gl_mode_sweep_unset(void *data, Evas_Object *obj, void *event_in
        if (ap->mf_Status.more == MORE_RENAME) {
                mf_genlist_rename_done(ap, NULL, NULL);
                return;
-       } else if(ap->mf_Status.more == MORE_EDIT) {
+       } else if(ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) {
                return;
        }
 
-       if (obj)
-               //elm_object_scroll_freeze_push(obj);
-
-       if (ap->mf_Status.more == MORE_SEARCH && ap->mf_MainWindow.pSearchViewSweepItem) {
-               if(ap->mf_MainWindow.pSearchViewTimer) {
-                       ecore_timer_del(ap->mf_MainWindow.pSearchViewTimer);
-                       ap->mf_MainWindow.pSearchViewTimer = NULL;
-               }
-               ap->mf_MainWindow.pSearchViewTimer = ecore_timer_add(0.3, __mf_genlist_timer_cb, ap);
-               ap->mf_MainWindow.pPreSearchViewSweepItem = ap->mf_MainWindow.pSearchViewSweepItem;
-               ap->mf_MainWindow.pSearchViewSweepItem = NULL;
-       }
 
        /* Finish genlist sweep */
        elm_genlist_item_decorate_mode_set(event_info, "slide", EINA_FALSE);
@@ -334,14 +270,12 @@ void mf_genlist_gl_mode_cancel(void *data, Evas_Object * obj, void *event_info)
        if (ap->mf_Status.more == MORE_RENAME) {
                mf_genlist_rename_done(ap, NULL, NULL);
                return;
-       } else if(ap->mf_Status.more == MORE_EDIT) {
+       } else if(ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) {
                return;
        }
        /* Get sweeped item */
        Elm_Object_Item *it = (Elm_Object_Item *) elm_genlist_decorated_item_get(obj);
 
-       if (ap->mf_Status.more == MORE_SEARCH)
-               ap->mf_MainWindow.pSearchViewSweepItem = NULL;
 
        /* Finish genlist sweep */
        if (it) {
@@ -358,7 +292,6 @@ static char *__mf_genlist_gl_label_get(void *data, Evas_Object * obj, const char
        mfItemData_s *params = (mfItemData_s *) data;
        mf_retv_if(params == NULL, NULL);
        mf_debug("part=%s", part);
-       __mf_genlist_reset_serch_sweep_item(params->ap);
        if (strcmp(part, "elm.text") == 0) {
                /* supporting multi-lang for default folders */
                if (g_strcmp0(params->m_ItemName->str, PHONE_FOLDER) == 0) {
@@ -485,7 +418,7 @@ static char *__mf_genlist_gl_label_get(void *data, Evas_Object * obj, const char
                                        return NULL;
                                }
                        } else {
-                               if (ecore_file_is_dir(params->m_ItemName->str)) {
+                               if (mf_file_attr_is_dir(params->m_ItemName->str)) {
                                        Eina_List *file_list = NULL;
                                        Eina_List *folder_list = NULL;
                                        int ret = 0;
@@ -532,7 +465,6 @@ static Evas_Object *__mf_genlist_gl_default_icon_get(void *data, Evas_Object * o
        mf_retvm_if(part == NULL, NULL, "part is NULL");
        mf_retvm_if(obj == NULL, NULL, "obj is NULL");
        mf_debug("part=%s", part);
-       __mf_genlist_reset_serch_sweep_item(params->ap);
 
        if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1")) {
                Evas_Object *thumb = NULL;
@@ -576,7 +508,7 @@ static Evas_Object *__mf_genlist_gl_default_icon_get(void *data, Evas_Object * o
                        }
                }
        } else if (!strcmp(part, "elm.icon.2")) {
-               if (params->ap->mf_Status.more == MORE_EDIT) {
+               if (params->ap->mf_Status.more == MORE_EDIT || params->ap->mf_Status.more == MORE_SHARE_EDIT) {
                        return NULL;
                }
                Evas_Object *entry_button = NULL;
@@ -644,7 +576,7 @@ static Evas_Object *__mf_genlist_gl_default_icon_get(void *data, Evas_Object * o
        return layout;
 }
 
-static void __mf_genlist_item_check_changed_callback(void *data, Evas_Object * obj, void *event_info)
+void mf_genlist_item_check_changed_callback(void *data, Evas_Object * obj, void *event_info)
 {
        MF_TRACE_BEGIN;
        mfItemData_s *params = (mfItemData_s *) data;
@@ -775,7 +707,7 @@ static Evas_Object *__mf_genlist_gl_edit_icon_get(void *data, Evas_Object * obj,
                        elm_object_focus_set(check, EINA_FALSE);
                        evas_object_propagate_events_set(check, EINA_FALSE);
                        elm_check_state_pointer_set(check, &params->m_checked);
-                       evas_object_smart_callback_add(check, "changed", __mf_genlist_item_check_changed_callback, params);
+                       evas_object_smart_callback_add(check, "changed", mf_genlist_item_check_changed_callback, params);
                        return check;
                } else if (!strcmp(part, "elm.edit.icon.2")) {
                        layout = elm_button_add(obj);
@@ -1111,7 +1043,7 @@ void mf_genlist_gl_selected(void *data, Evas_Object * obj, void *event_info)
                                mf_callback_rename_save_cb(ap, NULL, NULL);
                                return;
                        }
-               } else if (ap->mf_Status.more != MORE_EDIT) {
+               } else if (ap->mf_Status.more != MORE_EDIT && ap->mf_Status.more != MORE_SHARE_EDIT) {
 #ifdef MYFILE_SPLIT_VIEW
                        if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
                                mf_split_view_left_genlist_refresh(ap);
@@ -1304,7 +1236,7 @@ void mf_genlist_gl_sel(void *data, Evas_Object * obj, void *event_info)
        struct appdata *ap = (struct appdata *)selected->ap;
        mf_retm_if(ap == NULL, "input parameter data error");
 
-       if (ap->mf_Status.more != MORE_EDIT) {
+       if (ap->mf_Status.more != MORE_EDIT && ap->mf_Status.more != MORE_SHARE_EDIT) {
                return;
        }
 
@@ -1349,7 +1281,7 @@ void mf_genlist_genlist_item_select(void *data, Evas_Object *pGenlist, int *file
                        if (itemData->m_ItemName == NULL || itemData->m_ItemName->str == NULL) {
                                continue;
                        }
-                       if (ecore_file_is_dir(itemData->m_ItemName->str)) {
+                       if (mf_file_attr_is_dir(itemData->m_ItemName->str)) {
                                //bool systemfolder = FALSE;
                                ap->mf_Status.flagFolderSelect = TRUE;
                                (*dir_count)++;
@@ -1370,7 +1302,7 @@ void mf_genlist_gl_edit_item_selected(void *data)
        mf_retm_if(data == NULL, "data is NULL");
        struct appdata *ap = (struct appdata *)data;
 
-       if (ap->mf_Status.more != MORE_EDIT)
+       if (ap->mf_Status.more != MORE_EDIT && ap->mf_Status.more != MORE_SHARE_EDIT)
                return;
        Evas_Object *notify_popup = NULL;
        char *label = NULL;
@@ -1421,7 +1353,7 @@ static inline void __mf_genlist_get_thumbnail(mfItemData_s *params)
 {
        int error_code = 0;
        if (params->thumb_path == NULL) {
-               if (ecore_file_is_dir(params->m_ItemName->str)) {
+               if (mf_file_attr_is_dir(params->m_ItemName->str)) {
                        if (params->ap->mf_Status.view_type == mf_view_root) {
                                params->thumb_path = strdup(MF_ICON_FOLDER);
                        } else if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
@@ -1457,8 +1389,7 @@ static inline void __mf_genlist_get_thumbnail(mfItemData_s *params)
                        }
                }
        } else if (params->thumb_path && ecore_file_exists(params->thumb_path)) {
-
-               if (ecore_file_is_dir(params->m_ItemName->str)) {
+               if (mf_file_attr_is_dir(params->m_ItemName->str)) {
                        if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
                                params->thumb_path = strdup(MF_ICON_EXTERNAL_DEVICE);
                        } else {
@@ -1473,35 +1404,38 @@ static inline void __mf_genlist_get_thumbnail(mfItemData_s *params)
                        error_code = MYFILE_ERR_GET_THUMBNAIL_FAILED;
                }
        } else if (!ecore_file_exists(params->thumb_path)) {
-               mf_error("thumb_path[%s] is not exist", params->thumb_path);
-               free(params->thumb_path);
-               params->thumb_path = NULL;
 
-               fsFileType type = FILE_TYPE_NONE;
-               type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str);
-               if (ecore_file_is_dir(params->m_ItemName->str)) {
-                       if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
-                               params->thumb_path = strdup(MF_ICON_EXTERNAL_DEVICE);
-                       } else {
-                               if (params->flagExpand == true) {
-                                       params->thumb_path = strdup(MF_ICON_FOLDER_OPEN);
+               {
+                       mf_error("thumb_path[%s] is not exist", params->thumb_path);
+                       free(params->thumb_path);
+                       params->thumb_path = NULL;
+
+                       fsFileType type = FILE_TYPE_NONE;
+                       type = mf_file_attr_get_file_type_by_mime(params->m_ItemName->str);
+                       if (mf_file_attr_is_dir(params->m_ItemName->str)) {
+                               if (mf_fm_svc_wrapper_is_root_path(params->ap->mf_Status.path->str) == MYFILE_OTG) {
+                                       params->thumb_path = strdup(MF_ICON_EXTERNAL_DEVICE);
                                } else {
-                                       params->thumb_path = strdup(MF_ICON_FOLDER);
+                                       if (params->flagExpand == true) {
+                                               params->thumb_path = strdup(MF_ICON_FOLDER_OPEN);
+                                       } else {
+                                               params->thumb_path = strdup(MF_ICON_FOLDER);
+                                       }
                                }
-                       }
 
-               } else {
-                       if (type == FILE_TYPE_VIDEO) {
-                               params->thumb_path = strdup(MF_ICON_VIDEO);
-                       } else if (type == FILE_TYPE_IMAGE) {
-                               params->thumb_path = strdup(MF_ICON_IMAGE);
                        } else {
-                               params->thumb_path = strdup(DEFAULT_ICON);
+                               if (type == FILE_TYPE_VIDEO) {
+                                       params->thumb_path = strdup(MF_ICON_VIDEO);
+                               } else if (type == FILE_TYPE_IMAGE) {
+                                       params->thumb_path = strdup(MF_ICON_IMAGE);
+                               } else {
+                                       params->thumb_path = strdup(DEFAULT_ICON);
+                               }
                        }
+                       /*set default icon*/
+                       params->real_thumb_flag = FALSE;
+                       error_code = MYFILE_ERR_GET_THUMBNAIL_FAILED;
                }
-               /*set default icon*/
-               params->real_thumb_flag = FALSE;
-               error_code = MYFILE_ERR_GET_THUMBNAIL_FAILED;
        }
        if (error_code != 0) {
                mf_callback_create_thumbnail(params, mf_callback_thumb_created_cb);
@@ -1631,6 +1565,12 @@ void mf_genlist_create_data(mfItemData_s **m_TempItem, const char *name, void *d
        (*m_TempItem)->ap = (struct appdata *)data;
 
 }
+
+void mf_genlist_set_folder_edit_style()
+{
+       userfolderitc.decorate_all_item_style = NULL;
+}
+
 void mf_genlist_create_list_default_style(Evas_Object *pGenlist, void *data, Eina_List *dir_list,
                                          Eina_List *file_list)
 {
index aeebbb4..84550e6 100644 (file)
@@ -225,7 +225,7 @@ Evas_Object *mf_navi_bar_content_create(void *data)
                        mf_util_free_eina_list_with_data(&(ap->mf_FileOperation.file_list), MYFILE_TYPE_FSNODE);
                }
 
-               mf_util_generate_root_view_file_list(&(ap->mf_FileOperation.folder_list), ap->mf_Status.iStorageState);
+               mf_util_generate_root_view_file_list(ap, &(ap->mf_FileOperation.folder_list), ap->mf_Status.iStorageState);
                ap->mf_Status.flagNoContent = EINA_FALSE;
                mf_debug("count is [%d]", eina_list_count(ap->mf_FileOperation.folder_list));
        } else if (ap->mf_Status.view_type == mf_view_root_category) {
@@ -235,7 +235,9 @@ Evas_Object *mf_navi_bar_content_create(void *data)
                } else {
                        ap->mf_Status.flagNoContent = EINA_TRUE;
                }
-       } else {
+       }
+       else {
+               mf_error();
                MF_TA_ACUM_ITEM_BEGIN("      mf_util_generate_file_list", 0);
                error_code = mf_util_generate_file_list(ap);
                MF_TA_ACUM_ITEM_END("      mf_util_generate_file_list", 0);
@@ -359,6 +361,41 @@ Evas_Object *mf_navi_bar_get_content(Evas_Object *pConform)
 **    Modification : Created function
 **
 ******************************/
+static void __mf_navi_bar_title(void *data)
+{
+       MF_TRACE_BEGIN;
+       mf_retm_if(data == NULL, "data is NULL");
+       struct appdata *ap = (struct appdata *)data;
+
+       Evas_Object *pNavi = ap->mf_MainWindow.pNaviBar;
+       Elm_Object_Item *navi_it = ap->mf_MainWindow.pNaviItem;
+       myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
+
+       Evas_Object *unset = NULL;
+       int more = ap->mf_Status.more;
+
+       Evas_Object *label = elm_label_add(pNavi);
+       // set the label style
+       elm_object_style_set(label, "naviframe_title");
+       // set the label for the title slide mode
+       elm_label_slide_mode_set(label, ELM_LABEL_SLIDE_MODE_AUTO);
+       elm_label_wrap_width_set(label, 1);
+       elm_label_ellipsis_set(label, EINA_TRUE);
+       // set the label text
+       if (more == MORE_EDIT) {
+               elm_object_text_set(label, GET_SYS_STR(MF_LABEL_EDIT));
+       } else if (more == MORE_SHARE_EDIT) {
+               elm_object_text_set(label, GET_SYS_STR(LABEL_SHARE));
+       }
+       else {
+               elm_object_text_set(label, pNavi_s->pNaviTitle);
+       }
+       evas_object_show(label);
+       unset = elm_object_item_part_content_unset(navi_it, "elm.swallow.title");
+       SAFE_FREE_OBJ(unset);
+       elm_object_item_part_content_set(navi_it, "elm.swallow.title", label);
+
+}
 void mf_navi_bar_title_set(void *data)
 {
        MF_TRACE_BEGIN;
@@ -368,64 +405,53 @@ void mf_navi_bar_title_set(void *data)
        char *path = ap->mf_Status.path->str;
        Elm_Object_Item *navi_it = ap->mf_MainWindow.pNaviItem;
        Evas_Object *pNavi = ap->mf_MainWindow.pNaviBar;
+       Evas_Object *unset = NULL;
 
-       if (more == MORE_RENAME || more == MORE_CREATE_FOLDER ||  more == MORE_THUMBNAIL_RENAME) {
-               // do nothing
-       } else {
-               myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
-               if (more != MORE_EDIT && more != MORE_SEARCH) {
-                       if (ap->mf_Status.view_type != mf_view_root) {
-                               Evas_Object *home_btn = elm_button_add(pNavi);
-                               //elm_object_style_set(home_btn, TITLE_BTN_STYLE);
-                               elm_object_style_set(home_btn, "naviframe/title_icon");
-                               Evas_Object *home_ic = elm_image_add(pNavi);
-                               elm_image_file_set(home_ic, MF_TITLE_ICON_HOME, NULL);
-                               elm_image_resizable_set(home_ic, EINA_TRUE, EINA_TRUE);
-                               elm_object_content_set(home_btn, home_ic);
-                               mf_language_mgr_register_object(home_btn, OBJ_TYPE_ELM_OBJECT, NULL, MF_LABEL_HOME);
-                               evas_object_smart_callback_add(home_btn, "clicked", mf_callback_home_button_cb, ap);
-                               evas_object_smart_callback_add(home_btn, "pressed", mf_callback_home_button_pressed_cb, home_ic);
-                               evas_object_smart_callback_add(home_btn, "unpressed", mf_callback_home_button_unpressed_cb, home_ic);
-                               evas_object_show(home_btn);
-                               elm_object_item_part_content_set(navi_it, TITLE_LEFT_BTN, home_btn);
-
-                               Evas_Object *up_btn = elm_button_add(pNavi);
-                               //elm_object_style_set(up_btn, TITLE_BTN_STYLE);
-                               elm_object_style_set(up_btn, "naviframe/title_icon");
-                               Evas_Object *up_ic = elm_image_add(pNavi);
-                               elm_image_file_set(up_ic, MF_TITLE_ICON_UPPER, NULL);
-                               elm_image_resizable_set(up_ic, EINA_TRUE, EINA_TRUE);
-                               elm_object_content_set(up_btn, up_ic);
-                               mf_language_mgr_register_object(up_btn, OBJ_TYPE_ELM_OBJECT, NULL, MF_LABEL_UPPER);
-                               evas_object_smart_callback_add(up_btn, "clicked", mf_callback_upper_click_cb, ap);
-                               evas_object_smart_callback_add(up_btn, "pressed", mf_callback_upper_button_pressed_cb, up_ic);
-                               evas_object_smart_callback_add(up_btn, "unpressed", mf_callback_upper_button_unpressed_cb, up_ic);
-                               evas_object_show(up_btn);
-                               elm_object_item_part_content_set(navi_it, TITLE_RIGHT_BTN, up_btn);
-
-                               elm_naviframe_item_title_visible_set(navi_it, EINA_TRUE);
-                       }
+       myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
 
-               } else {
-                       elm_naviframe_item_title_visible_set(navi_it, EINA_TRUE);
-               }
+       if (ap->mf_Status.more == MORE_CREATE_FOLDER || ap->mf_Status.more == MORE_THUMBNAIL_RENAME || ap->mf_Status.more == MORE_SEARCH) {
+               __mf_navi_bar_title(ap);
+       } else if (more != MORE_EDIT && more != MORE_SEARCH) {
+               if (ap->mf_Status.view_type != mf_view_root) {
+                       Evas_Object *home_btn = elm_button_add(pNavi);
+                       //elm_object_style_set(home_btn, TITLE_BTN_STYLE);
+                       elm_object_style_set(home_btn, "naviframe/title_icon");
+                       Evas_Object *home_ic = elm_image_add(pNavi);
+                       elm_image_file_set(home_ic, MF_TITLE_ICON_HOME, NULL);
+                       elm_image_resizable_set(home_ic, EINA_TRUE, EINA_TRUE);
+                       elm_object_content_set(home_btn, home_ic);
+                       mf_language_mgr_register_object(home_btn, OBJ_TYPE_ELM_OBJECT, NULL, MF_LABEL_HOME);
+                       evas_object_smart_callback_add(home_btn, "clicked", mf_callback_home_button_cb, ap);
+                       evas_object_smart_callback_add(home_btn, "pressed", mf_callback_home_button_pressed_cb, home_ic);
+                       evas_object_smart_callback_add(home_btn, "unpressed", mf_callback_home_button_unpressed_cb, home_ic);
+                       evas_object_show(home_btn);
+
+                       unset = elm_object_item_part_content_unset(navi_it, TITLE_LEFT_BTN);
+                       SAFE_FREE_OBJ(unset);
+                       elm_object_item_part_content_set(navi_it, TITLE_LEFT_BTN, home_btn);
+
+                       Evas_Object *up_btn = elm_button_add(pNavi);
+                       //elm_object_style_set(up_btn, TITLE_BTN_STYLE);
+                       elm_object_style_set(up_btn, "naviframe/title_icon");
+                       Evas_Object *up_ic = elm_image_add(pNavi);
+                       elm_image_file_set(up_ic, MF_TITLE_ICON_UPPER, NULL);
+                       elm_image_resizable_set(up_ic, EINA_TRUE, EINA_TRUE);
+                       elm_object_content_set(up_btn, up_ic);
+                       mf_language_mgr_register_object(up_btn, OBJ_TYPE_ELM_OBJECT, NULL, MF_LABEL_UPPER);
+                       evas_object_smart_callback_add(up_btn, "clicked", mf_callback_upper_click_cb, ap);
+                       evas_object_smart_callback_add(up_btn, "pressed", mf_callback_upper_button_pressed_cb, up_ic);
+                       evas_object_smart_callback_add(up_btn, "unpressed", mf_callback_upper_button_unpressed_cb, up_ic);
+                       evas_object_show(up_btn);
+                       unset = elm_object_item_part_content_unset(navi_it, TITLE_RIGHT_BTN);
+                       SAFE_FREE_OBJ(unset);
+                       elm_object_item_part_content_set(navi_it, TITLE_RIGHT_BTN, up_btn);
 
-               Evas_Object *label = elm_label_add(pNavi);
-               // set the label style
-               elm_object_style_set(label, "naviframe_title");
-               // set the label for the title slide mode
-               elm_label_slide_mode_set(label, ELM_LABEL_SLIDE_MODE_AUTO);
-               elm_label_wrap_width_set(label, 1);
-               elm_label_ellipsis_set(label, EINA_TRUE);
-               // set the label text
-               if (more == MORE_EDIT) {
-                       elm_object_text_set(label, GET_SYS_STR(MF_LABEL_EDIT));
-               } else {
-                       elm_object_text_set(label, pNavi_s->pNaviTitle);
                }
-               evas_object_show(label);
-               elm_object_item_part_content_set(navi_it, "elm.swallow.title", label);
+               __mf_navi_bar_title(ap);
+
        }
+       elm_naviframe_item_title_visible_set(navi_it, EINA_TRUE);
+
        MF_TRACE_END;
 
 }
@@ -572,6 +598,8 @@ void mf_navi_add_back_button(void *data)
 
        pBackButton = __mf_navi_bar_backbutton_create(ap->mf_MainWindow.pNaviBar, ap->mf_MainWindow.pWindow);
        if (pBackButton) {
+               Evas_Object *unset = elm_object_item_part_content_unset(ap->mf_MainWindow.pNaviItem, "prev_btn");
+               SAFE_FREE_OBJ(unset);
                elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "prev_btn", pBackButton);
                evas_object_smart_callback_add(pBackButton, "clicked", mf_callback_backbutton_clicked_cb, ap);
        }
@@ -636,6 +664,7 @@ Evas_Object *mf_navi_bar_create_header_box(void *data)
        Evas_Object *pathinfo_layout = NULL;
        char *pathinfo = NULL;
        char *info = NULL;
+
        if (!mf_fm_svc_wrapper_is_root_path(ap->mf_Status.path->str)) {
                myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
                mf_retvm_if(pNavi_s == NULL, NULL, "pNavi_s is NULL");
@@ -691,12 +720,13 @@ void mf_navi_bar_set_ctrl_button(void *data)
                        bt_1 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, MF_LABEL_SEARCH, NULL, mf_search_bar_enter_search_routine, ap);
                } else {
                        bt_1 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, MF_LABEL_EDIT, NULL, mf_callback_edit_cb, ap);
+                       bt_2 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_SHARE, NULL, mf_callback_edit_cb, ap);
                }
                break;
        case MORE_EDIT:
                more_bt = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_EDIT, MF_LABEL_MORE, NULL, mf_callback_more_button_cb, ap);
                bt_1 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_DELETE, NULL, mf_callback_delete_cb, ap);
-               bt_2 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_SHARE, NULL, mf_callback_share_cb, ap);
+               //bt_2 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_SHARE, NULL, mf_callback_share_cb, ap);
                break;
        case MORE_INTERNAL_COPY:
        case MORE_DATA_COPYING:
@@ -712,6 +742,8 @@ void mf_navi_bar_set_ctrl_button(void *data)
                }
                bt_1 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_MOVE_HERE, NULL, mf_callback_move_here_cb, ap);
                break;
+       case MORE_SHARE_EDIT:
+               bt_1 = mf_widget_util_create_button(ap->mf_MainWindow.pNaviBar, NAVI_BUTTON_STYLE, LABEL_SHARE, NULL, mf_callback_share_cb, ap);
        default:
                break;
        }
@@ -797,7 +829,8 @@ void mf_navi_bar_create_default_view(void *data)
        MF_TA_ACUM_ITEM_END("      set conform to box", 0);
 
        MF_TA_ACUM_ITEM_BEGIN("      create header box", 0);
-       if (ap->mf_Status.view_type == mf_view_normal) {
+       if (ap->mf_Status.view_type == mf_view_normal
+               ) {
                box = mf_navi_bar_create_header_box(ap);
                if (box) {
                        ap->mf_MainWindow.pNaviInfoBox = box;
@@ -942,24 +975,29 @@ void mf_navi_bar_edit_list_update(void *data)
                if (ap->mf_MainWindow.pNaviGenlist) {
                        mf_genlist_sweep_item_recover(ap->mf_MainWindow.pNaviGenlist);
                        mf_genlist_update_edit_view_item_style(ap);
+                       if (ap->mf_Status.more == MORE_SHARE_EDIT) {
+                               mf_genlist_set_folder_edit_style();
+                       }
                        ap->mf_MainWindow.pEditView.pGenlist = ap->mf_MainWindow.pNaviGenlist;
                        elm_genlist_decorate_mode_set(ap->mf_MainWindow.pNaviGenlist, EINA_TRUE);
                }
        } else {
                Eina_List *file_list = NULL;
                Eina_List *dir_list = NULL;
+               {
 
-               if (ap->mf_Status.view_type == mf_view_root_category) {
-                       file_list = ap->mf_FileOperation.category_list;
-               } else {
-                       file_list = ap->mf_FileOperation.file_list;
-                       dir_list = ap->mf_FileOperation.folder_list;
-               }
+                       if (ap->mf_Status.view_type == mf_view_root_category) {
+                               file_list = ap->mf_FileOperation.category_list;
+                       } else {
+                               file_list = ap->mf_FileOperation.file_list;
+                               dir_list = ap->mf_FileOperation.folder_list;
+                       }
 
-               if (ap->mf_MainWindow.pNaviGengrid) {
-                       elm_gengrid_clear(ap->mf_MainWindow.pNaviGengrid);
-                       mf_gengrid_create_list_default_style(ap->mf_MainWindow.pNaviGengrid, ap, dir_list, file_list);
-                       ap->mf_MainWindow.pEditView.pGengrid = ap->mf_MainWindow.pNaviGengrid;
+                       if (ap->mf_MainWindow.pNaviGengrid) {
+                               elm_gengrid_clear(ap->mf_MainWindow.pNaviGengrid);
+                               mf_gengrid_create_list_default_style(ap->mf_MainWindow.pNaviGengrid, ap, dir_list, file_list);
+                               ap->mf_MainWindow.pEditView.pGengrid = ap->mf_MainWindow.pNaviGengrid;
+                       }
                }
        }
 
@@ -1236,12 +1274,39 @@ void mf_navi_bar_create_search_view(void *data)
        mf_retm_if(pNavi_s == NULL, "get navigation bar in use failed");
        Evas_Object *pSearchViewLayout = NULL;
        //ap->mf_MainWindow.pNaviLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "selectinfo_layout");
-       pSearchViewLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "selectinfo_layout");
-       ap->mf_MainWindow.pNaviLayout = pSearchViewLayout;
 
-       ap->mf_MainWindow.pNaviSearchBar = mf_navi_bar_create_search_bar(pSearchViewLayout, ap);
+#if 1
+       ap->mf_MainWindow.pNaviLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "search_view_layout");
+       ap->mf_MainWindow.pNaviSearchBar = mf_navi_bar_create_search_bar(ap->mf_MainWindow.pNaviLayout, ap);
+       pSearchViewLayout = ap->mf_MainWindow.pNaviLayout;
+
+       path_label = elm_label_add(pSearchViewLayout);
+       elm_object_focus_set(path_label, EINA_FALSE);
+       evas_object_size_hint_weight_set(path_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(path_label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_show(path_label);
+       /*2.2 contribute label content*/
+       char *path_in_label = mf_fm_svc_wrapper_translate_path(ap->mf_Status.path->str, MF_TRANS_OPTION_LABEL);
+       char *label_content = g_strconcat(GET_SYS_STR(MF_LABEL_SEARCH), ":", "<br>", path_in_label, NULL);
+       /*2.3 set style for path_label*/
+       elm_label_line_wrap_set(path_label, ELM_WRAP_WORD);
+       elm_object_text_set(path_label, label_content);
+
+       elm_object_part_content_set(pSearchViewLayout, "search_bar", ap->mf_MainWindow.pNaviSearchBar);
+       elm_object_part_content_set(pSearchViewLayout, "content", path_label);
+
+#else
        ap->mf_MainWindow.pNaviBox = mf_widget_create_box(ap->mf_MainWindow.pNaviBar);
 
+       Evas_Object *pSearchbarLayout = NULL;
+       pSearchbarLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "search_bar_layout");
+       evas_object_size_hint_weight_set(pSearchbarLayout, EVAS_HINT_EXPAND, 0);
+       evas_object_size_hint_align_set(pSearchbarLayout, EVAS_HINT_FILL, 0.0);
+
+       ap->mf_MainWindow.pNaviSearchBar = mf_navi_bar_create_search_bar(pSearchbarLayout, ap);
+       pSearchViewLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "selectinfo_layout");
+       ap->mf_MainWindow.pNaviLayout = pSearchViewLayout;
+
        /*set content*/
        /*2. create path label for the start of search view*/
        /*2.1 create path label*/
@@ -1261,22 +1326,24 @@ void mf_navi_bar_create_search_view(void *data)
        elm_entry_entry_set(path_label, label_content);
 
        /*set title segment or title*/
+       /*navigation view integration*/
+       elm_object_part_content_set(pSearchbarLayout, "content", ap->mf_MainWindow.pNaviSearchBar);
+       elm_object_part_content_set(pSearchViewLayout, "content", path_label);
+       elm_box_pack_start(ap->mf_MainWindow.pNaviBox, pSearchbarLayout);
+       elm_box_pack_end(ap->mf_MainWindow.pNaviBox, pSearchViewLayout);
+#endif
+
        title = g_string_new(GET_SYS_STR(MF_LABEL_SEARCH));
        if (title != NULL) {
                pNavi_s->pNaviTitle = g_strdup(title->str);
                g_string_free(title, TRUE);
                title = NULL;
        }
-       /*navigation view integration*/
-       elm_object_part_content_set(pSearchViewLayout, "content", path_label);
-       elm_box_pack_end(ap->mf_MainWindow.pNaviBox, pSearchViewLayout);
-       elm_box_pack_start(ap->mf_MainWindow.pNaviBox, ap->mf_MainWindow.pNaviSearchBar);
-
 
        ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem;
 
        mf_language_mgr_unregister_object_item_by_type(ITEM_TYPE_CTRL);
-       ap->mf_MainWindow.pNaviItem = elm_naviframe_item_push(ap->mf_MainWindow.pNaviBar, NULL, NULL, NULL, ap->mf_MainWindow.pNaviBox, MF_NAVI_STYLE_ENABLE);
+       ap->mf_MainWindow.pNaviItem = elm_naviframe_item_push(ap->mf_MainWindow.pNaviBar, NULL, NULL, NULL, pSearchViewLayout, MF_NAVI_STYLE_ENABLE);
 
 
        /*hide Tab Bar in search view*/
@@ -1293,6 +1360,7 @@ void mf_navi_bar_create_search_view(void *data)
        }
        mf_navi_bar_title_set(ap);
        evas_object_show(ap->mf_MainWindow.pSearchEntry);
+
        elm_object_focus_set(ap->mf_MainWindow.pSearchEntry, EINA_TRUE);
        mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
 
@@ -1370,6 +1438,8 @@ void mf_navi_bar_create_new_folder_view(void *data)
 
        Evas_Object *pNaviBar = NULL;
        GString *title = NULL;
+
+       mf_widget_set_navi_blocking(data, EINA_TRUE);
 #ifdef MYFILE_SPLIT_VIEW
        if (ap->mf_Status.rotation_type == MF_ROTATE_LANDSCAPE) {
                mf_navi_bar_set_panes_navi_to_main(ap);
@@ -1398,6 +1468,14 @@ void mf_navi_bar_create_new_folder_view(void *data)
        /*set title segment or title*/
        /*navigation view integration*/
 
+       title = g_string_new(GET_SYS_STR(MF_LABEL_CREATE_FOLDER));
+
+       if (title != NULL) {
+               pNavi_s->pNaviTitle = g_strdup(title->str);
+               g_string_free(title, TRUE);
+               title = NULL;
+       }
+
        Elm_Object_Item *navi_it = NULL;
        //mf_navi_bar_set_style(ap, NAVI_BAR_DEFAULT, newContent);
        ap->mf_Status.pPreNaviItem = ap->mf_MainWindow.pNaviItem;
@@ -1406,6 +1484,7 @@ void mf_navi_bar_create_new_folder_view(void *data)
 
        ap->mf_MainWindow.pNaviItem = navi_it;
 
+       mf_navi_bar_title_set(ap);
        //mf_navi_add_back_button(ap);
 
        Evas_Object *l_bt = NULL;
@@ -1413,15 +1492,15 @@ void mf_navi_bar_create_new_folder_view(void *data)
 
        l_bt = elm_button_add(ap->mf_MainWindow.pNaviBar);
        elm_object_focus_set(l_bt, EINA_FALSE);
-       elm_object_style_set(l_bt, "naviframe/title/default");
+       elm_object_style_set(l_bt, "naviframe/toolbar/default");
        elm_object_text_set(l_bt, GET_SYS_STR(LABEL_SAVE));
        mf_language_mgr_register_object(l_bt, OBJ_TYPE_ELM_OBJECT, NULL, LABEL_SAVE);
        evas_object_smart_callback_add(l_bt, "clicked", mf_callback_save_cb, ap);
        evas_object_show(l_bt);
-       elm_object_item_part_content_set(navi_it, "title_toolbar_button1", l_bt);
+       elm_object_item_part_content_set(navi_it, NAVI_BOTTOM_BUTTON_1_PART, l_bt);
        //elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, TITLE_LEFT_BTN, l_bt);
 
-#if 1
+
        r_bt = elm_button_add(ap->mf_MainWindow.pNaviBar);
        elm_object_focus_set(r_bt, EINA_FALSE);
        elm_object_style_set(r_bt, "naviframe/end_btn/default");
@@ -1430,12 +1509,12 @@ void mf_navi_bar_create_new_folder_view(void *data)
        //mf_language_mgr_register_object(r_bt, OBJ_TYPE_ELM_OBJECT, NULL, LABEL_CANCEL);
        evas_object_smart_callback_add(r_bt, "clicked", mf_callback_cancel_cb, ap);
        evas_object_show(r_bt);
-       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "title_prev_btn", r_bt);
-#endif
-       elm_object_item_signal_emit(navi_it, "elm,state,sip,shown", "");
+       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "prev_btn", r_bt);
 
-       elm_object_focus_set(ap->mf_MainWindow.pEntry, EINA_TRUE);
 
+       mf_callback_imf_state_callback_register(ap);
+
+       elm_object_focus_set(ap->mf_MainWindow.pEntry, EINA_TRUE);
 
 }
 
@@ -1595,26 +1674,28 @@ void mf_navi_bar_create_rename_view(void *data)
        mf_language_mgr_unregister_object_item_by_type(ITEM_TYPE_CTRL);
        ap->mf_MainWindow.pNaviItem = elm_naviframe_item_push(pNaviBar, NULL, NULL, NULL, ap->mf_MainWindow.pNaviBox, NULL);
 
+       mf_navi_bar_title_set(ap);
 
        Evas_Object *l_bt = NULL;
        Evas_Object *r_bt = NULL;
 
        l_bt = elm_button_add(ap->mf_MainWindow.pNaviBar);
        elm_object_focus_set(l_bt, EINA_FALSE);
-       elm_object_style_set(l_bt, "naviframe/title/default");
+       elm_object_style_set(l_bt, "naviframe/toolbar/default");
        elm_object_text_set(l_bt, GET_SYS_STR(LABEL_SAVE));
        mf_language_mgr_register_object(l_bt, OBJ_TYPE_ELM_OBJECT, NULL, LABEL_SAVE);
        evas_object_smart_callback_add(l_bt, "clicked", mf_callback_save_cb, ap);
        evas_object_show(l_bt);
-       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "title_toolbar_button1", l_bt);
+       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, NAVI_BOTTOM_BUTTON_1_PART, l_bt);
 
        r_bt = elm_button_add(ap->mf_MainWindow.pNaviBar);
        elm_object_focus_set(r_bt, EINA_FALSE);
        elm_object_style_set(r_bt, "naviframe/end_btn/default");
        evas_object_smart_callback_add(r_bt, "clicked", mf_callback_cancel_cb, ap);
        evas_object_show(r_bt);
-       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "title_prev_btn", r_bt);
-       elm_object_item_signal_emit(ap->mf_MainWindow.pNaviItem, "elm,state,sip,shown", "");
+
+       mf_callback_imf_state_callback_register(ap);
+       elm_object_item_part_content_set(ap->mf_MainWindow.pNaviItem, "prev_btn", r_bt);
        MF_TRACE_END;
 }
 
@@ -1919,6 +2000,13 @@ void mf_navi_bar_button_set_disable(Elm_Object_Item *navi_it, int disable_item,
 
        }
        if (disable_item & CTRL_DISABLE_SEND) {
+               btn = elm_object_item_part_content_get(navi_it, NAVI_BOTTOM_BUTTON_1_PART);
+               const char *button_label = elm_object_text_get(btn);
+               if (g_strcmp0(button_label, GET_SYS_STR(LABEL_SHARE)) == 0)
+                       elm_object_disabled_set(btn, disable);
+
+       }
+       if (disable_item & CTRL_DISABLE_SEND) {
                btn = elm_object_item_part_content_get(navi_it, NAVI_BOTTOM_BUTTON_2_PART);
                const char *button_label = elm_object_text_get(btn);
                if (g_strcmp0(button_label, GET_SYS_STR(LABEL_SHARE)) == 0)
@@ -1979,16 +2067,3 @@ int mf_navi_bar_button_get_disable(Elm_Object_Item *navi_it)
        return disable_item;
 }
 
-void mf_navi_bar_set_toolbar_visible(Elm_Object_Item *navi_item, bool visible)
-{
-       mf_retm_if(navi_item == NULL, "navi_item is NULL");
-
-       mf_debug("visible: %d", visible);
-       if(visible) {
-               elm_object_item_signal_emit(navi_item, "elm,state,toolbar,open", "");
-       } else {
-               elm_object_item_signal_emit(navi_item, "elm,state,toolbar,close", "");
-       }
-}
-
-
index 7a174bc..868243a 100644 (file)
@@ -555,56 +555,34 @@ Evas_Object *mf_ug_popup_create_search(void *data, Evas_Smart_Cb func, void *par
        MF_TRACE_BEGIN;
        struct appdata *ap = (struct appdata *)data;
        mf_retvm_if(ap == NULL, NULL, "ap is NULL");
-       Evas_Object *popup = NULL;
-       Evas_Object *btn1 = NULL;
-       Evas_Object *box = NULL;
-       Evas_Object *content = NULL;
-       Evas_Object *label = NULL;
-
-       popup = elm_popup_add(ap->mf_MainWindow.pWindow);
-       elm_object_style_set(popup,"min_menustyle");
-       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       ap->mf_MainWindow.pNormalPopup = popup;
 
-       btn1 = elm_button_add(popup);
-       elm_object_text_set(btn1, GET_SYS_STR(LABEL_CANCEL));
-       elm_object_part_content_set(popup, "button1", btn1);
-       evas_object_smart_callback_add(btn1, "clicked", func, param);
 
-       box = elm_box_add(popup);
-       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-       content = elm_layout_add(popup);
-       elm_layout_file_set(content, EDJ_NAME, "search_path");
-
-       evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND,
-                       EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       Evas_Object *popup;
+       Evas_Object *layout;
+       Evas_Object *label = NULL;
 
-       label = elm_label_add(content);
-       ap->mf_MainWindow.pSearchLabel = label;
-       elm_object_style_set(label, "popup/default");
-       elm_label_wrap_width_set(label, 720);
-       elm_label_ellipsis_set(label, EINA_TRUE);
-       evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_object_text_set(label, "Test");
 
+       popup = elm_popup_add(ap->mf_MainWindow.pMainLayout);
+       elm_object_focus_set(popup, EINA_FALSE);
 
-       elm_object_part_content_set(content, "path", label);
-       evas_object_show(label);
-       elm_box_pack_end(box, content);
+       layout = elm_layout_add(popup);
+       elm_object_focus_set(layout, EINA_FALSE);
+       elm_layout_file_set(layout, EDJ_NAME, "popup_center_text");
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       ap->mf_MainWindow.pSearchLabel = layout;
 
-       evas_object_size_hint_min_set(box, 720, 300);
-       evas_object_size_hint_max_set(box, 720, 300);
+       elm_object_part_text_set(layout, "elm.swallow.content", "Phone");
+       elm_object_part_text_set(layout, "elm.title", mf_util_get_text(MF_LABEL_SEARCHING));
 
-       evas_object_show(btn1);
-       evas_object_show(content);
-       evas_object_show(box);
+       elm_object_content_set(popup, layout);
 
-       elm_object_content_set(popup, box);
+       Evas_Object *btn1 = mf_widget_button_create(popup, GET_SYS_STR(LABEL_CANCEL));
+       elm_object_style_set(btn1, "popup_button/default");
+       evas_object_smart_callback_add(btn1, "clicked", func, param);
+       elm_object_part_content_set(popup, "button1", btn1);
 
        evas_object_show(popup);
+
        return popup;
 }
 
@@ -678,13 +656,6 @@ Evas_Object *mf_popup_create_popup(void *data, ePopMode popupMode, char *title,
                evas_object_smart_callback_add(btn1, "clicked", func, param);
                elm_object_part_content_set(popup, "button1", btn1);
                break;
-       case POPMODE_TEXT_BTN_SEARCH:
-               btn1 = mf_widget_button_create(popup, GET_SYS_STR(LABEL_CANCEL));
-               elm_object_style_set(btn1, "popup_button/default");
-               evas_object_smart_callback_add(btn1, "clicked", func, param);
-               elm_object_part_content_set(popup, "button1", btn1);
-               break;
-
        case POPMODE_TITLE_TEXT_THREE_BTN:
 
                elm_object_style_set(popup, "verticalbuttonstyle");
@@ -763,44 +734,6 @@ Evas_Object *mf_popup_create_popup(void *data, ePopMode popupMode, char *title,
                elm_object_content_set(popup, box);
                evas_object_smart_callback_add(popup, "response", func, param);
                break;
-#ifdef MYFILE_SPLIT_VIEW
-       case POPMODE_STORAGE_BTN:
-               if (ap->mf_Status.pRadioGroup ) {
-                       evas_object_del(ap->mf_Status.pRadioGroup);
-                       ap->mf_Status.pRadioGroup = NULL;
-               }
-
-               radio_group = elm_radio_add(ap->mf_MainWindow.pWindow);
-               elm_object_focus_set(radio_group, EINA_FALSE);
-               elm_radio_value_set(radio_group, 0);
-               evas_object_hide(radio_group);
-               ap->mf_Status.pRadioGroup = radio_group;
-
-               storage = mf_fm_svc_wrapper_is_root_path(ap->mf_Status.path->str);
-               ap->mf_Status.iRadioValue = storage;
-
-               elm_object_style_set(popup, "menustyle");
-
-               btn1 = mf_widget_button_create(popup, GET_SYS_STR(MF_POP_MSG_CLOSE));
-               elm_object_style_set(btn1, "popup_button/default");
-               evas_object_smart_callback_add(btn1, "clicked", func, param);
-               elm_object_part_content_set(popup, "button1", btn1);
-
-               storage_itc.item_style = "1text.1icon.2";
-               storage_itc.func.text_get = __mf_popup_get_storage_genlist_label;
-               storage_itc.func.content_get = __mf_popup_get_storage_genlist_icon;
-               storage_itc.func.state_get = NULL;
-               storage_itc.func.del = __mf_popup_storage_genlist_del;
-               genlist = elm_genlist_add(popup);
-               //elm_genlist_homogeneous_set(genlist, EINA_TRUE);
-               elm_object_focus_set(genlist, EINA_FALSE);
-               evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
-               mf_popup_storage_item_append(ap, popup, genlist);
-               elm_object_content_set(popup, genlist);
-               evas_object_smart_callback_add(popup, "response", func, param);
-               break;
-#endif
        case POPMODE_VIEW_AS_LIST:
                elm_object_style_set(popup, MF_POPUP_STYLE_MIN_MENUSTYLE);
 
index 87bb4b0..8834d11 100644 (file)
@@ -99,7 +99,6 @@ static void __mf_search_bar_click_item(struct appdata *data, GString * path)
                        pNavi_s->pCurrentPath = NULL;
                }
                pNavi_s->pCurrentPath = g_strdup(new_path->str);
-
                mf_widget_refresh_view(ap);
        } else {
                struct timeval mytime;
@@ -259,18 +258,6 @@ void mf_search_bar_item_append(void *data, void *user_data)
 
 }
 
-static void __mf_search_bar_genlist_del_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
-{
-       MF_TRACE_BEGIN;
-       struct appdata *ap = (struct appdata *)data;
-       mf_retm_if(ap == NULL, "ap is NULL");
-       if(ap->mf_MainWindow.pSearchViewTimer) {
-               ecore_timer_del(ap->mf_MainWindow.pSearchViewTimer);
-               ap->mf_MainWindow.pSearchViewTimer = NULL;
-       }
-       MF_TRACE_END;
-}
-
 static void __mf_search_bar_result_cb(mf_search_result_t *result, void *user_data)
 {
        MF_TRACE_BEGIN;
@@ -341,7 +328,6 @@ static void __mf_search_bar_result_cb(mf_search_result_t *result, void *user_dat
                        if (ap->mf_Status.view_type == mf_view_root_category && ap->mf_Status.more != MORE_SEARCH) {
                                evas_object_smart_callback_add(ap->mf_MainWindow.pNaviGenlist, "selected", mf_genlist_gl_selected, ap);
                        }
-                       evas_object_event_callback_add(ap->mf_MainWindow.pNaviGenlist,EVAS_CALLBACK_FREE, __mf_search_bar_genlist_del_cb, ap);
                        evas_object_show(ap->mf_MainWindow.pNaviGenlist);
                        mfNaviBarSetContent(ap, ap->mf_MainWindow.pNaviLayout, ap->mf_MainWindow.pNaviGenlist);
                } else {
@@ -349,11 +335,7 @@ static void __mf_search_bar_result_cb(mf_search_result_t *result, void *user_dat
                                ap->mf_MainWindow.pNaviGengrid = mf_gengrid_create_grid(ap->mf_MainWindow.pNaviLayout);
                        }
                        elm_gengrid_clear(ap->mf_MainWindow.pNaviGengrid);
-                       if (MF_SCALE_FACTORY == 1) {
-                               elm_gengrid_item_size_set(ap->mf_MainWindow.pNaviGengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH);
-                       } else {
-                               elm_gengrid_item_size_set(ap->mf_MainWindow.pNaviGengrid, MF_WVGA_GENGRID_ITEM_WIDTH, MF_WVGA_GENGRID_ITEM_HEIGTH);
-                       }
+                       elm_gengrid_item_size_set(ap->mf_MainWindow.pNaviGengrid, MF_HD_GENGRID_ITEM_WIDTH, MF_HD_GENGRID_ITEM_HEIGTH);
                        evas_object_show(ap->mf_MainWindow.pNaviGengrid);
                        mfNaviBarSetContent(ap, ap->mf_MainWindow.pNaviLayout, ap->mf_MainWindow.pNaviGengrid);
                }
@@ -428,15 +410,11 @@ static void __mf_search_bar_pipe_cb(void *data, void *buffer, unsigned int nbyte
        } else if (pSearchMsg->mf_sp_msg_type == MF_SEARCH_PIPE_MSG_ROOT_CHANGE) {
                mf_debug("path change   %s", pSearchMsg->current_path);
                char *new_desc = mf_fm_svc_wrapper_translate_path(pSearchMsg->current_path, MF_TRANS_OPTION_POPUP);
-               elm_object_text_set(ap->mf_MainWindow.pSearchLabel, new_desc);
-               if (pSearchMsg->current_path) {
-                       free(pSearchMsg->current_path);
-                       pSearchMsg->current_path = NULL;
-               }
-               if (new_desc != NULL) {
-                       free(new_desc);
-                       new_desc = NULL;
-               }
+               elm_object_part_text_set(ap->mf_MainWindow.pSearchLabel, "elm.swallow.content", new_desc);
+
+               //edje_object_part_text_set(elm_layout_edje_get(ap->mf_MainWindow.pSearchLabel), "elm.swallow.content", new_desc);
+               SAFE_FREE_CHAR(pSearchMsg->current_path);
+               SAFE_FREE_CHAR(new_desc);
        } else if (pSearchMsg->mf_sp_msg_type == MF_SEARCH_PIPE_MSG_FINISHED) {
                evas_object_del(ap->mf_MainWindow.pNormalPopup);
                ap->mf_MainWindow.pNormalPopup = NULL;
@@ -477,7 +455,6 @@ void mf_search_bar_category_search_start(void *data, int category)
                **it's sure that new_desc is not NULL even if original path is NULL*/
                new_desc = mf_fm_svc_wrapper_translate_path(ap->mf_Status.path->str, MF_TRANS_OPTION_POPUP);
                ap->mf_MainWindow.pNormalPopup = mf_ug_popup_create_search(ap, __mf_search_bar_stop_cb, ap);
-                       //mf_popup_create_popup(ap, POPMODE_TEXT_BTN_SEARCH, NULL, new_desc, NULL, NULL, NULL, __mf_search_bar_stop_cb, ap);
        } else {
                mf_debug("search failed");
        }
@@ -501,72 +478,74 @@ static bool __mf_search_bar_idle_search_start(void *data)
                return ECORE_CALLBACK_CANCEL;
        }
 
-       int root_num = 0;
-       mf_genlist_create_search_itc();
+       {
 
-       char *text = NULL;
-       const char *SearchRoot[3] = {0};
-       if (ap->mf_Status.more == MORE_SEARCH) {
-               text = g_strdup(elm_object_text_get(ap->mf_MainWindow.pSearchEntry));
-       }
+               int root_num = 0;
+               mf_genlist_create_search_itc();
 
-       if (ap->mf_Status.view_type == mf_view_root || ap->mf_Status.view_type == mf_view_root_category) {
-               SearchRoot[0] = PHONE_FOLDER;
-               root_num++;
-               if (ap->mf_Status.iStorageState & MYFILE_MMC) {
-                       SearchRoot[root_num] = MEMORY_FOLDER;
-                       root_num++;
-               }
-               if (ap->mf_Status.iStorageState & MYFILE_OTG) {
-                       SearchRoot[root_num] = OTG_FOLDER;
-                       root_num++;
+               char *text = NULL;
+               const char *SearchRoot[3] = {0};
+               if (ap->mf_Status.more == MORE_SEARCH) {
+                       text = g_strdup(elm_object_text_get(ap->mf_MainWindow.pSearchEntry));
                }
-       } else {
-               if (ap->mf_Status.flagSearchAll == EINA_FALSE) {
-                       SearchRoot[0] = ap->mf_Status.path->str;
+
+               if (ap->mf_Status.view_type == mf_view_root || ap->mf_Status.view_type == mf_view_root_category) {
+                       SearchRoot[0] = PHONE_FOLDER;
                        root_num++;
+                       if (ap->mf_Status.iStorageState & MYFILE_MMC) {
+                               SearchRoot[root_num] = MEMORY_FOLDER;
+                               root_num++;
+                       }
+                       if (ap->mf_Status.iStorageState & MYFILE_OTG) {
+                               SearchRoot[root_num] = OTG_FOLDER;
+                               root_num++;
+                       }
                } else {
-                       int root = mf_fm_svc_wrapper_is_root_path(ap->mf_Status.path->str);
-                       switch (root) {
-                       case MYFILE_PHONE:
-                               SearchRoot[0] = PHONE_FOLDER;
-                               break;
-                       case MYFILE_MMC:
-                               SearchRoot[0] = MEMORY_FOLDER;
-                               break;
-                       case MYFILE_OTG:
-                               SearchRoot[0] = OTG_FOLDER;
-                               break;
-                       default:
-                               SearchRoot[0] = PHONE_FOLDER;
-                               break;
+                       if (ap->mf_Status.flagSearchAll == EINA_FALSE) {
+                               SearchRoot[0] = ap->mf_Status.path->str;
+                               root_num++;
+                       } else {
+                               int root = mf_fm_svc_wrapper_is_root_path(ap->mf_Status.path->str);
+                               switch (root) {
+                               case MYFILE_PHONE:
+                                       SearchRoot[0] = PHONE_FOLDER;
+                                       break;
+                               case MYFILE_MMC:
+                                       SearchRoot[0] = MEMORY_FOLDER;
+                                       break;
+                               case MYFILE_OTG:
+                                       SearchRoot[0] = OTG_FOLDER;
+                                       break;
+                               default:
+                                       SearchRoot[0] = PHONE_FOLDER;
+                                       break;
+                               }
+                               root_num++;
                        }
-                       root_num++;
                }
-       }
-       mf_debug("search root is %s text is [%s]", ap->mf_Status.path->str, text);
-       char *new_desc = NULL;
-       /*Start Search routine*/
-       if (!mf_search_start(ap->mf_Status.search_handler, SearchRoot, root_num, \
-                            ((text) ? text : NULL), MF_SEARCH_OPTION_DEF, (void *)ap, NULL, mf_tray_item_category_none)) {
-               /*generate the popup used to show search path
-               **it's sure that new_desc is not NULL even if original path is NULL*/
-               new_desc = mf_fm_svc_wrapper_translate_path(ap->mf_Status.path->str, MF_TRANS_OPTION_POPUP);
-               ap->mf_MainWindow.pNormalPopup = mf_ug_popup_create_search(ap, __mf_search_bar_stop_cb, ap);
-                       //mf_popup_create_popup(ap, POPMODE_TEXT_BTN_SEARCH, NULL, new_desc, NULL, NULL, NULL, __mf_search_bar_stop_cb, ap);
-       }
+               mf_debug("search root is %s text is [%s]", ap->mf_Status.path->str, text);
+               char *new_desc = NULL;
+               /*Start Search routine*/
+               if (!mf_search_start(ap->mf_Status.search_handler, SearchRoot, root_num, \
+                                    ((text) ? text : NULL), MF_SEARCH_OPTION_DEF, (void *)ap, NULL, mf_tray_item_category_none)) {
+                       /*generate the popup used to show search path
+                       **it's sure that new_desc is not NULL even if original path is NULL*/
+                       new_desc = mf_fm_svc_wrapper_translate_path(ap->mf_Status.path->str, MF_TRANS_OPTION_POPUP);
+                       ap->mf_MainWindow.pNormalPopup = mf_ug_popup_create_search(ap, __mf_search_bar_stop_cb, ap);
+               }
 
-       if (new_desc != NULL) {
-               free(new_desc);
-               new_desc = NULL;
-       }
+               if (new_desc != NULL) {
+                       free(new_desc);
+                       new_desc = NULL;
+               }
 
-       if (text != NULL) {
-               free(text);
-               text = NULL;
-       }
+               if (text != NULL) {
+                       free(text);
+                       text = NULL;
+               }
 
-       ap->mf_FileOperation.search_IME_hide_timer = NULL;
+               ap->mf_FileOperation.search_IME_hide_timer = NULL;
+       }
        return ECORE_CALLBACK_CANCEL;
 }
 
index ee91b20..af2e073 100644 (file)
@@ -220,7 +220,7 @@ static void _gl_con(void *data, Evas_Object *obj, void *event_info)
                mf_debug("the transition of the naviframe is not finished");
                return;
        }
-       if (ap->mf_Status.more != MORE_EDIT) {
+       if (ap->mf_Status.more != MORE_EDIT && ap->mf_Status.more != MORE_SHARE_EDIT) {
                Elm_Object_Item *item = event_info;
                elm_genlist_item_subitems_clear(item);
                SAFE_FREE_OBJ(ap->mf_MainWindow.pContextPopup);
@@ -235,14 +235,10 @@ static void _gl_con(void *data, Evas_Object *obj, void *event_info)
                        if (ap->mf_Status.more == MORE_DEFAULT) {
                                mf_navi_bar_create_default_view(ap);
                                mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                               mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_OTG_ROOT, true);
-                               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_OTG_ROOT, TRUE);
                        } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
                                   || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
                                mf_navi_bar_create_path_select_view(ap);
                                mf_navi_bar_remove_previous_contents(ap, ap->mf_MainWindow.pNaviBar);
-                               mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_OTG_ROOT, true);
-                               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_OTG_ROOT, TRUE);
                        }
                }
 
@@ -273,7 +269,7 @@ static void _gl_exp_ndepth(void *data, Evas_Object *obj, void *event_info)
                                mf_callback_rename_save_cb(ap, NULL, NULL);
                                return;
                        }
-               } else if (ap->mf_Status.more != MORE_EDIT) {
+               } else if (ap->mf_Status.more != MORE_EDIT && ap->mf_Status.more != MORE_SHARE_EDIT) {
                        if (g_string_equal(selected->m_ItemName, ap->mf_Status.path)) {
 
                                myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
index c23f280..3c2623a 100644 (file)
@@ -96,17 +96,11 @@ static void __item_mouse_down_cb(void *data, Evas *evas, Evas_Object *obj, void
        mf_retm_if(NULL == obj, "NULL == obj");
 
        Evas_Object *icon = NULL;
-       Evas_Object *bg = NULL;
        char *press_icon = NULL;
 
-       bg = elm_object_part_content_get(obj, LAYOUT_SWALLOW_BG);
        icon = elm_object_part_content_get(obj, LAYOUT_INFO_SHORTCUT_ITEM_ICON);
        press_icon = mf_tray_item_get_data(obj, STR_ATTRIBUTE_ICON_PRESS);
 
-       if (bg) {
-               mf_debug(" set bg icon %s", MF_ICON_CATEGORY_BG_PRESS);
-               elm_image_file_set(bg, MF_ICON_CATEGORY_BG_PRESS, NULL);
-       }
        if (icon) {
                elm_image_file_set(icon, press_icon, NULL);
        }
@@ -120,24 +114,21 @@ static void __item_mouse_up_cb(void *data, Evas *evas, Evas_Object *obj, void *e
 
        struct appdata *ap = (struct appdata *)data;
        Evas_Object *icon = NULL;
-       Evas_Object *bg = NULL;
        char *unpress_icon = NULL;
        const char *name = NULL;
 
-       bg = elm_object_part_content_get(obj, LAYOUT_SWALLOW_BG);
        icon = elm_object_part_content_get(obj, LAYOUT_INFO_SHORTCUT_ITEM_ICON);
        unpress_icon = mf_tray_item_get_data(obj, STR_ATTRIBUTE_ICON);
        name = mf_tray_item_get_data(obj, STR_ATTRIBUTE_NAME);
+       mf_debug(" %s\t ~~~~~~~~~~~~~~~~name: %s\n",__FUNCTION__, name);
 
-       if (bg) {
-               mf_debug(" set bg icon %s", MF_ICON_CATEGORY_BG);
-               elm_image_file_set(bg, MF_ICON_CATEGORY_BG, NULL);
-       }
        if (icon) {
                elm_image_file_set(icon, unpress_icon, NULL);
        }
 
-       int category = mf_tray_item_category_none;
+       int category = mf_tray_item_category_none;  //change for test
+
+       
        if (g_strcmp0(name, CATEGORY_IMAGE) == 0) {
                category = mf_tray_item_category_image;
        } else if (g_strcmp0(name, CATEGORY_VIDEO) == 0) {
@@ -189,15 +180,15 @@ static char *__mf_tray_item_get_press_icon(const char *name)
 {
        mf_retvm_if(NULL == name, NULL, "NULL == name");
        if (g_strcmp0(name, CATEGORY_IMAGE) == 0) {
-               return MF_ICON_CATEGORY_IMAGE_PRESS;
+               return MF_ICON_SHORTCUT_IMAGE_PRESS;
        } else if (g_strcmp0(name, CATEGORY_VIDEO) == 0) {
-               return MF_ICON_CATEGORY_VIDEO_PRESS;
+               return MF_ICON_SHORTCUT_VIDEO_PRESS;
        } else if (g_strcmp0(name, CATEGORY_SOUNDS) == 0) {
-               return MF_ICON_CATEGORY_SOUNDS_PRESS;
+               return MF_ICON_SHORTCUT_SOUNDS_PRESS;
        } else if (g_strcmp0(name, CATEGORY_DOC) == 0) {
-               return MF_ICON_CATEGORY_DOCUMENT_PRESS;
+               return MF_ICON_SHORTCUT_DOCUMENT_PRESS;
        } else if (g_strcmp0(name, CATEGORY_OTHERS) == 0) {
-               return MF_ICON_CATEGORY_OTHERS_PRESS;
+               return MF_ICON_SHORTCUT_OTHERS_PRESS;
        } else {
                return NULL;
        }
@@ -226,15 +217,6 @@ Evas_Object *mf_tray_item_create(Evas_Object *parent, const char *icon_file, con
        evas_object_size_hint_max_set(bg, ICON_NORMAL_SIZE_WIDTH * elm_config_scale_get(), ICON_NORMAL_SIZE_HEIGHT * elm_config_scale_get());
        #endif
 
-       bg = elm_image_add(layout);
-       if (elm_image_file_set(bg, MF_ICON_CATEGORY_BG, NULL) == EINA_FALSE) {
-               mf_error("Icon file is not accessible (%s)\n", MF_ICON_CATEGORY_BG);
-               evas_object_del(bg);
-               bg = NULL;
-       }
-       elm_image_resizable_set(bg, EINA_TRUE, EINA_TRUE);
-       evas_object_show(bg);
-       elm_object_part_content_set(layout, LAYOUT_SWALLOW_BG, bg);
 
        Evas_Object *icon = NULL;
 
@@ -273,30 +255,32 @@ Evas_Object *mf_tray_create(Evas_Object *parent, void *data)
        mf_retvm_if(parent == NULL, NULL, "parent is NULL");
        mf_retvm_if(data == NULL, NULL, "data is NULL");
 
-       Evas_Object *tray_box = elm_box_add(parent);
+       
+
+       Evas_Object *layout = mf_widget_create_layout(parent, EDJ_NAME, "myfile_shortcut_5_images");
 
-       elm_box_horizontal_set(tray_box, EINA_TRUE);
-       elm_box_align_set(tray_box, 0.0, 0.0);
-       evas_object_size_hint_weight_set(tray_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+  
+       elm_box_horizontal_set(layout, EINA_TRUE);
+       evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-       Evas_Object *Image = mf_tray_item_create(tray_box, MF_ICON_CATEGORY_IMAGE, CATEGORY_IMAGE);
-       elm_box_pack_end(tray_box, Image);
+       Evas_Object *Image = mf_tray_item_create(layout, MF_ICON_SHORTCUT_IMAGE, CATEGORY_IMAGE);
+       elm_object_part_content_set(layout, "mf_shortcut_image", Image);
        __mf_tray_item_register_event(data, Image);
 
-       Evas_Object *Video = mf_tray_item_create(tray_box, MF_ICON_CATEGORY_VIDEO, CATEGORY_VIDEO);
-       elm_box_pack_end(tray_box, Video);
+       Evas_Object *Video = mf_tray_item_create(layout, MF_ICON_SHORTCUT_VIDEO, CATEGORY_VIDEO);
+       elm_object_part_content_set(layout, "mf_shortcut_video", Video);
        __mf_tray_item_register_event(data, Video);
 
-       Evas_Object *Sounds = mf_tray_item_create(tray_box, MF_ICON_CATEGORY_SOUNDS, CATEGORY_SOUNDS);
-       elm_box_pack_end(tray_box, Sounds);
+       Evas_Object *Sounds = mf_tray_item_create(layout, MF_ICON_SHORTCUT_SOUNDS, CATEGORY_SOUNDS);
+       elm_object_part_content_set(layout, "mf_shortcut_sound", Sounds);
        __mf_tray_item_register_event(data, Sounds);
 
-       Evas_Object *Document = mf_tray_item_create(tray_box, MF_ICON_CATEGORY_DOCUMENT, CATEGORY_DOC);
-       elm_box_pack_end(tray_box, Document);
+       Evas_Object *Document = mf_tray_item_create(layout, MF_ICON_SHORTCUT_DOCUMENT, CATEGORY_DOC);
+       elm_object_part_content_set(layout, "mf_shortcut_document", Document);
        __mf_tray_item_register_event(data, Document);
 
-       Evas_Object *Others = mf_tray_item_create(tray_box, MF_ICON_CATEGORY_OTHERS, CATEGORY_OTHERS);
-       elm_box_pack_end(tray_box, Others);
+       Evas_Object *Others = mf_tray_item_create(layout, MF_ICON_SHORTCUT_OTHERS, CATEGORY_OTHERS);
+       elm_object_part_content_set(layout, "mf_shortcut_others", Others);
        __mf_tray_item_register_event(data, Others);
 
        //evas_object_event_callback_add(icon, EVAS_CALLBACK_MOUSE_DOWN, _item_mouse_down_cb, app_tray);
@@ -304,6 +288,7 @@ Evas_Object *mf_tray_create(Evas_Object *parent, void *data)
 
        //evas_object_event_callback_add(icon, EVAS_CALLBACK_MOUSE_UP, _item_mouse_up_cb, app_tray);
        //evas_object_event_callback_add(icon, EVAS_CALLBACK_FOCUS_OUT, _item_focus_out_cb, app_tray);
-       return tray_box;
+       return layout;
+
 }
 #endif
index 483d1aa..721daed 100644 (file)
@@ -339,7 +339,11 @@ Elm_Object_Item *mf_widget_item_append(Evas_Object *parent, fsNodeInfo *pNode, v
                if (ap->mf_Status.view_type == mf_view_root_category) {
                        it = elm_genlist_item_append(parent, &categoryitc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, mf_genlist_gl_sel, m_TempItem);
                } else {
-                       it = elm_genlist_item_append(parent, &userfolderitc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, mf_genlist_gl_sel, m_TempItem);
+                       if (mf_file_attr_is_dir(m_TempItem->m_ItemName->str)) {
+                               it = elm_genlist_item_append(parent, &userfolderitc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, mf_genlist_gl_sel, m_TempItem);
+                       } else {
+                               it = elm_genlist_item_append(parent, &itc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, mf_genlist_gl_sel, m_TempItem);
+                       }
                }
        } else {
                it = elm_gengrid_item_append(parent, &gic, m_TempItem, NULL, NULL);
@@ -646,7 +650,7 @@ void mf_widget_refresh_view(void *data)
        } else if (ap->mf_Status.more == MORE_INTERNAL_COPY_MOVE || ap->mf_Status.more == MORE_INTERNAL_COPY || ap->mf_Status.more == MORE_INTERNAL_MOVE
                   || ap->mf_Status.more == MORE_DATA_COPYING || ap->mf_Status.more == MORE_DATA_MOVING) {
                mf_navi_bar_create_path_select_view(ap);
-       } else if (ap->mf_Status.more == MORE_EDIT) {
+       } else if (ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) {
                mf_callback_edit_cb(ap, NULL, NULL);
        }