[TIZENIOT-1964] [Gallery] Make the thumbnail area a white background

[TIZENIOT-2035] [Gallery] Images moves to right in edit mode
[TIZENIOT-2036/1749] [Gallery] Check box is missing in edit mode
[TIZENIOT-2038] [Gallery] Font size of "Select all" seems smaller comparing the GUI guide

Change-Id: Ia0770f32c39746a1dbae9fd305251a8fb82a2bd6
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/res/edje/gallery.edc b/res/edje/gallery.edc
index 3c6c9a36571958188ba499371f7a8e6cbfa0b73b..eae3c6911697827357b7a4dbe51f0d4f81664af6 100755 (executable)
--- a/res/edje/gallery.edc
+++ b/res/edje/gallery.edc
@@ -584,7 +584,7 @@ collections {
                                        rel2 { relative: 0.6 1.0; to: "select.all.area.bg";}
                                        text {
                                                text: "Select All";
-                                               size: 10;
+                                               size: 12;
                                                align: 0.0 0.325;
                                        }
                                        color: 0 0 0 255;
@@ -665,7 +665,16 @@ collections {
                                        min: 0 0;
                                        max: 0 -1;
                                        align: 0 0;
-                                       rel1 { relative: 0.02 1.0; to: select.all.area.bg;}
+                                       rel1 { relative: 0.03 1.0; to: select.all.area.bg;}
+                                       rel2 { relative: 1.0 1.0; }
+                               }
+                               description {
+                                       state: "edit_view" 0.0;
+                                       fixed: 1 1;
+                                       min: 0 0;
+                                       max: 0 -1;
+                                       align: 0 0;
+                                       rel1 { relative: 0.0 1.0; to: select.all.area.bg;}
                                        rel2 { relative: 1.0 1.0; }
                                }
                        }
@@ -823,7 +832,7 @@ collections {
                                name: "split_view_default";
                                signal: "elm,splitview,state,default";
                                source: "elm";
-                               action: STATE_SET "default" 0.0;
+                               action: STATE_SET "edit_view" 0.0;
                                target: "split.view";
                                transition : LINEAR 0.3;
                        }
@@ -974,7 +983,7 @@ collections {
        styles{
                style{
                        name: "image_name_style_detail";
-                       base: "font=Tizen:weight=Regular:width=BreezeSans font_size=10 color=#000C2B align=center wrap=mixed ellipsis=1.0";
+                       base: "font=Tizen:weight=Regular:width=BreezeSans font_size=9 color=#000C2B align=center wrap=mixed ellipsis=1.0";
                }
        }
        group { name: "image_name_layout";

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index eac8d342d0789e85761445faae42f80b160ca7ed..4ead5643c57c2216578f8b224b4cadef28433182 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -156,7 +156,7 @@ group {
                                visible: 1;
                                rel1{relative: 0.01 0.02;}
                                rel2{relative: 0.915 0.98;}
-                               color: 230 230 230 255;
+                               color: 255 255 255 255;
                        }
                }
                part {
@@ -176,8 +176,8 @@ group {
                        type: SWALLOW;
                        description {
                                state: "default" 0.0;
-                               rel1 { relative: 0.0 0.0;  }
-                               rel2 { relative: 1.0 1.0;  }
+                               rel1 { relative: 0.0 0.0; offset: 8 -3;}
+                               rel2 { relative: 1.0 1.0; offset: -8 -11;}
                                color: 255 0 0 255;
                                align: 0.0 1.0;
                        }
@@ -455,8 +455,8 @@ group {
                                state: "default" 0.0;
                                min: 0 14;
                                max: -1 28;
-                               rel1 { to: "elm.swallow.icon"; relative: 0.0 1.0; offset: 8 0;}
-                               rel2 { to: "elm.swallow.icon"; relative: 1.0 1.0; offset: -8 -8;}
+                               rel1 { to: "elm.swallow.icon"; relative: 0.0 1.0; offset: 8 -3;}
+                               rel2 { to: "elm.swallow.icon"; relative: 1.0 1.0; offset: -8 -11;}
                                align: 0.0 1.0;
                        }
                }
@@ -859,7 +859,7 @@ group \
                                state: "default" 0.0; \
                                rel1 { relative: 0.0 0.0;} \
                                rel2 { relative: 1.0 1.0;} \
-                               color: 0 0 0 0; \
+                               color: 255 255 255 255; \
                        } \
                } \
                part { \
@@ -920,7 +920,7 @@ group \
                                state: "default" 0.0; \
                                rel1 { relative: 0.0 0.0;} \
                                rel2 { relative: 1.0 1.0;} \
-                               color: 0 0 0 0; \
+                               color: 255 255 255 255; \
                        } \
                } \
                part { \

diff --git a/res/edje/gl-timeline.edc b/res/edje/gl-timeline.edc
index a31ea1293d11c3c0689c24ea1bfd35646ca13196..596221316cbcfe325c3b5927d54aabc405c83648 100755 (executable)
--- a/res/edje/gl-timeline.edc
+++ b/res/edje/gl-timeline.edc
@@ -31,7 +31,7 @@
                                        type: RECT; \
                                        description{ \
                                                state: "default" 0.0; \
-                                               color: 255 255 255 255; \
+                                               color: 240 240 240 255; \
                                                rel1.relative: 0.0 0.0; \
                                                rel2.relative: 1.0 1.0; \
                                                min: 0 Y; \
@@ -1321,7 +1321,7 @@ group{ name: "timeline_gridview";
                                  min : 0 60;
                                  max: -1 60;
                                  align : 0 0;
-                                 color: 255 255 255 255;
+                                 color: 240 240 240 255;
                        }
                }
                part { name: "group_date";
@@ -1379,7 +1379,7 @@ group{ name: "timeline_gridview_date_toast";
                        description {
                                rel1.relative: 0 0;
                                rel2.relative: 1 1;
-                               color: 255 255 255 255;
+                               color: 240 240 240 255;
                        }
                }
                part{
@@ -1475,7 +1475,7 @@ group{
                        type: RECT;
                        description{
                                state: "default" 0.0;
-                               color: 255 255 255 255;
+                               color: 240 240 240 255;
                                rel1.relative: 0.0 0.0;
                                rel2.relative: 1.0 1.0;
                                min: 0 60;

diff --git a/res/edje/images/No_thumbnail_2.png b/res/edje/images/No_thumbnail_2.png
index 769ad9e290cbe2c68baf50bf30023b380b41a76d..7dc6539b853d7561b27e6be1fc53322ddef6413d 100755 (executable)
Binary files a/res/edje/images/No_thumbnail_2.png and b/res/edje/images/No_thumbnail_2.png differ

diff --git a/res/edje/images/No_thumbnail_video.png b/res/edje/images/No_thumbnail_video.png
index 3e7f14bbaaf48583297758783cc39620ca5c1605..8535370039a77036f6027a09ae02e57990a3b67d 100755 (executable)
Binary files a/res/edje/images/No_thumbnail_video.png and b/res/edje/images/No_thumbnail_video.png differ

diff --git a/src/2dview/gl-thumbs-edit.c b/src/2dview/gl-thumbs-edit.c
index c9710b0d3de4b2cc88a910cc39abf0cd8d61ee93..f194de1f08bb753242c3e6d30708c10fa340759e 100755 (executable)
--- a/src/2dview/gl-thumbs-edit.c
+++ b/src/2dview/gl-thumbs-edit.c
@@ -240,6 +240,8 @@ int _gl_thumbs_edit_add_btns(void *data, Evas_Object * parent,
        edje_object_message_send(elm_layout_edje_get(ad->gridinfo.layout),
                                                         EDJE_MESSAGE_INT, 2, msg);
        free(msg);
+       elm_object_signal_emit(ad->gridinfo.layout,
+                                                  "elm,selectall,state,visible,bg", "elm");
        elm_object_signal_emit(ad->gridinfo.layout,
                                                   "elm,selectall,state,visible", "elm");
        _gl_ui_add_selall_ck(ad->gridinfo.layout, "select.all.area.check",

diff --git a/src/2dview/gl-timeline.c b/src/2dview/gl-timeline.c
index 3d66dd78dc68b326fd46cad3e8674703ce1e61f1..459382ec20d36a631229043df99ea6c2aa5e9b96 100755 (executable)
--- a/src/2dview/gl-timeline.c
+++ b/src/2dview/gl-timeline.c
@@ -2688,6 +2688,9 @@ static int __gl_timeline_edit_add_btns(void *data)
                                                   "elm,selectall,state,visible,bg", "elm");
        elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly,
                                                   "elm,selectall,state,visible", "elm");
+       elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly,
+                                                                          "elm,splitview,state,default",
+                                                                          "elm");
        _gl_ui_add_selall_ck(ad->ctrlinfo.ctrlbar_view_ly,
                                                 "select.all.area.check", "select.all.area.check",
                                                 __gl_timeline_thumb_edit_selall_cb, data);