[TIZEN_3.0] changed SD card resource

Change-Id: I4d9032d539d3c7249b457a196c42ed8e9976eb45
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/inc/util/gl-icons.h b/inc/util/gl-icons.h
index 0c3648b43219d99438ee8836208db24da3f6966b..dac2605fb7eb4fa8d65d55efb5926f87c0720752 100755 (executable)
--- a/inc/util/gl-icons.h
+++ b/inc/util/gl-icons.h
@@ -39,6 +39,7 @@
 #define GL_ICON_ALBUM_DOWNLOAD "T01_album_icon_download.png"
 #define GL_ICON_ALBUM_FOLDER "T01_album_icon_folder.png"
 #define GL_ICON_ALBUM_MMC "T01_album_icon_sd_card.png"
+#define GL_ICON_ALBUM_MMC_BG "gallery_icon_sd_card.png"
 
 #define GL_ICON_VIDEO_PLAY "T01_btn_thumbnail_play.png"
 #define GL_ICON_THUMB_BOOKMARK "T01_icon_thumbnail_bookmark.png"

diff --git a/res/edje/gallery-edc-res.h b/res/edje/gallery-edc-res.h
index 9b7337b50446a5ce94697efe2b3befac8e310dcf..9247a6fa0f10145667850d299303a35f6ca41057 100755 (executable)
--- a/res/edje/gallery-edc-res.h
+++ b/res/edje/gallery-edc-res.h
@@ -110,3 +110,4 @@
 #define GALLERY_EDC_DELETE_SHOW_IMAGE_BG "gallery_icon_container.png"
 #define GALLERY_EDC_DELETE_SHOW_IMAGE "gallery_icon_full.png"
 #define GALLERY_EDC_SD_CARD_ICON "T01_album_icon_sd_card.png"
+#define GALLERY_EDC_SD_CARD_ICON_BG "gallery_icon_sd_card.png"

diff --git a/res/edje/gl-gengrid-item-albums.edc b/res/edje/gl-gengrid-item-albums.edc
index 53d184e133e00760285812b77183d9bf73ebb02b..43722fd676604ee24b2ee46b0c87cedadb2254ca 100755 (executable)
--- a/res/edje/gl-gengrid-item-albums.edc
+++ b/res/edje/gl-gengrid-item-albums.edc
@@ -342,6 +342,7 @@ group {
        images {
                image: GALLERY_EDC_IMAGE_ALBUM_BG COMP;
                image: GALLERY_EDC_IMAGE_THUMBS_BG_FOCUS COMP;
+               image: GALLERY_EDC_SD_CARD_ICON_BG COMP;
        }
        parts {
                PARTS_PADDING_LEFT("padding.check.left", CHECK_GAP_L)
@@ -409,6 +410,26 @@ group {
                GL_ALBUM_ICON
                GL_ALBUM_LABEL_BG
                GL_ALBUM_TYPE_ICON
+               part {
+                       name: "sd_card_icon_img_bg";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       description {
+                               state: "default" 0.0;
+                               visible: 0;
+                               rel1 { relative: 0.82 0.82; to: "elm.icon.clipper"; }
+                               rel2 { relative: 0.98 0.98; to: "elm.icon.clipper"; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+                       description {
+                               state: "show" 0.0;
+                               visible: 1;
+                               rel1 { relative: 0.82 0.82; to: "elm.icon.clipper"; }
+                               rel2 { relative: 0.98 0.98; to: "elm.icon.clipper"; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+               }
                GL_ALBUM_SD_ICON
                GL_ALBUM_COUNT
                part {
@@ -445,6 +466,14 @@ group {
                        source: "elm.swallow.sd_icon";
                        action: STATE_SET "default" 0.0;
                        target: "elm.swallow.sd_icon";
+                       target: "sd_card_icon_img_bg";
+               }
+               program {
+                       name: "show_sd_icon";
+                       signal: "show_sd_icon";
+                       source: "elm.swallow.sd_icon_bg";
+                       action: STATE_SET "show" 0.0;
+                       target: "sd_card_icon_img_bg";
                }
                GL_GENGRID_FOCUS("focus_event")
                GL_GENGRID_SOUND("focus_event")
@@ -555,6 +584,28 @@ group {
                                align: 0.5 0.5;
                        }
                }
+               part {
+                       name: "sd_card_icon_img_bg";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       description {
+                               state: "default" 0.0;
+                               visible: 0;
+                               align: 0.5 0.5;
+                               rel1 { relative: 0.78 0.75; to: "elm.swallow.icon"; }
+                               rel2 { relative: 0.98 0.95; to: "elm.swallow.icon"; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+                       description {
+                               state: "show" 0.0;
+                               visible: 1;
+                               align: 0.5 0.5;
+                               rel1 { relative: 0.78 0.75; to: "elm.swallow.icon"; }
+                               rel2 { relative: 0.98 0.95; to: "elm.swallow.icon"; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+               }
                part {
                        name: "elm.swallow.sd_icon";
                        type: SWALLOW;
@@ -739,6 +790,21 @@ group {
                        target: "elm.text.badge";
                        target: "elm.image.badge";
                }
+               program {
+                       name: "hide_sd_icon";
+                       signal: "hide_sd_icon";
+                       source: "elm.swallow.sd_icon";
+                       action: STATE_SET "default" 0.0;
+                       target: "elm.swallow.sd_icon";
+                       target: "sd_card_icon_img_bg";
+               }
+               program {
+                       name: "show_sd_icon";
+                       signal: "show_sd_icon";
+                       source: "elm.swallow.sd_icon_bg";
+                       action: STATE_SET "show" 0.0;
+                       target: "sd_card_icon_img_bg";
+               }
                GL_GENGRID_FOCUS("focus_event")
                GL_GENGRID_SOUND("focus_event")
                GL_GENGRID_PLARY_SOUND

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index 18e69f0843d2b0ebf48e47d0c04a1ce166759359..1953e191c1b0bc0f7175ab9f73e861e8205e2671 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -123,6 +123,7 @@ group {
           image: GALLERY_EDC_DELETE_SHOW_IMAGE_BG COMP;
           image: GALLERY_EDC_DELETE_SHOW_IMAGE COMP;
           image: GALLERY_EDC_SD_CARD_ICON COMP;
+          image: GALLERY_EDC_SD_CARD_ICON_BG COMP;
        }
 
        parts {
@@ -204,6 +205,26 @@ group {
                                color: 0 0 0 0;
                        }
                }
+               part {
+                       name: "sd_card_icon_img_bg";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       repeat_events: 1;
+                       description {
+                               state: "default" 0.0;
+                               visible: 0;
+                               rel1 {relative: 0 0; to: sd_card_icon_rect; }
+                               rel2 {relative: 1 1; to: sd_card_icon_rect; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+                       description {
+                               state: "show" 0.0;
+                               visible: 1;
+                               rel1 {relative: 0 0; to: sd_card_icon_rect; }
+                               rel2 {relative: 1 1; to: sd_card_icon_rect; }
+                               image.normal: GALLERY_EDC_SD_CARD_ICON_BG;
+                       }
+               }
                part {
                        name: "sd_card_icon_img";
                        type: IMAGE;
@@ -334,6 +355,7 @@ group {
                        source: "sd_card_icon_img";
                        action: STATE_SET "show" 0.0;
                        target: "sd_card_icon_img";
+                       target: "sd_card_icon_img_bg";
                }
                program {
                        name: "hide_sd_icon";
@@ -341,6 +363,7 @@ group {
                        source: "sd_card_icon_img";
                        action: STATE_SET "default" 0.0;
                        target: "sd_card_icon_img";
+                       target: "sd_card_icon_img_bg";
                }
        }
 }

diff --git a/res/edje/gl-images.edc b/res/edje/gl-images.edc
index 31ac0015ed84c801628435ebb6b04f08174d5379..c4a064e61d2b1704019a24323e259b843fd479d2 100644 (file)
--- a/res/edje/gl-images.edc
+++ b/res/edje/gl-images.edc
@@ -54,6 +54,7 @@ collections {
        RESOURCE_IMAGE("T01_album_icon_download.png");
        RESOURCE_IMAGE("T01_album_icon_folder.png");
        RESOURCE_IMAGE("T01_album_icon_sd_card.png");
+       RESOURCE_IMAGE("gallery_icon_sd_card.png");
        RESOURCE_IMAGE("T01_icon_camera_all.png");
        RESOURCE_IMAGE("T01_icon_add_folder.png");
        RESOURCE_IMAGE("T01_title_icon_select_all.png");

diff --git a/res/edje/images/T01_album_icon_sd_card.png b/res/edje/images/T01_album_icon_sd_card.png
old mode 100755 (executable)
new mode 100644 (file)
index f0803db..a0fed68
Binary files a/res/edje/images/T01_album_icon_sd_card.png and b/res/edje/images/T01_album_icon_sd_card.png differ

diff --git a/res/edje/images/gallery_icon_sd_card.png b/res/edje/images/gallery_icon_sd_card.png
new file mode 100644 (file)
index 0000000..5848ce7
Binary files /dev/null and b/res/edje/images/gallery_icon_sd_card.png differ

diff --git a/src/features/gl-albums.c b/src/features/gl-albums.c
index d3b7cef2fb0b2db2ce7e20d2e96ee433aee9184f..d09679c379a267f866f1503e014a03038d5437d1 100644 (file)
--- a/src/features/gl-albums.c
+++ b/src/features/gl-albums.c
@@ -470,6 +470,9 @@ static Evas_Object *__gl_albums_get_content(void *data, Evas_Object *obj,
                if (GL_STORE_T_MMC == album_item->cluster->type) {
                        _obj = _gl_tile_show_part_type_icon(obj,
                                                            GL_TILE_TYPE_MMC_STORAGE);
+                       elm_object_item_signal_emit(album_item->item,
+                                                   "show_sd_icon",
+                                                   "elm.swallow.sd_icon_bg");
                } else {
                        elm_object_item_signal_emit(album_item->item,
                                                    "hide_sd_icon",
@@ -546,6 +549,9 @@ static Evas_Object *__gl_albums_get_content_split_view(void *data, Evas_Object *
                if (GL_STORE_T_MMC == album_item->cluster->type) {
                        _obj = _gl_tile_show_part_type_icon(obj,
                                                            GL_TILE_TYPE_MMC_STORAGE);
+                       elm_object_item_signal_emit(album_item->item,
+                                                   "show_sd_icon",
+                                                   "elm.swallow.sd_icon_bg");
                } else {
                        elm_object_item_signal_emit(album_item->item,
                                                    "hide_sd_icon",