[TIZENIOT 1527] Image Viewer Update Design

Change-Id: I9b8fc2ce481bc9df4b8048810ab9eb2e46fa4512

diff --git a/res/edje/icons/Image_viewer_popup_bg_stroke.#.png b/res/edje/icons/Image_viewer_popup_bg_stroke.#.png
index 9c2ac4131b9cdd3dad0a3b4ce4cf22b9f7fc67c9..12799cb15262bd648a1010d9cd874cc31ebbe2e3 100644 (file)
Binary files a/res/edje/icons/Image_viewer_popup_bg_stroke.#.png and b/res/edje/icons/Image_viewer_popup_bg_stroke.#.png differ

diff --git a/res/edje/icons/viwer_video_play.png b/res/edje/icons/viwer_video_play.png
index bb808cd6dd1cb6f71022de645b4fa3effe50ae82..317ad1b4949d6f94fda936244e69296f7d5f6861 100644 (file)
Binary files a/res/edje/icons/viwer_video_play.png and b/res/edje/icons/viwer_video_play.png differ

diff --git a/res/edje/images/core_icon_back.png b/res/edje/images/core_icon_back.png
index 88b46cfdb15b14b122a326d285e5de977e483d4f..a0caa9fc6e7a111fc9636e9fe3bbe92750a31572 100644 (file)
Binary files a/res/edje/images/core_icon_back.png and b/res/edje/images/core_icon_back.png differ

diff --git a/res/edje/images/image_viewer_icon_favorite.png b/res/edje/images/image_viewer_icon_favorite.png
index 367e2c7ecaf170f45ab993ca33e4bf44f5a4e8f2..11de6e5a49bfae298e84007a0b3566b4785c34af 100644 (file)
Binary files a/res/edje/images/image_viewer_icon_favorite.png and b/res/edje/images/image_viewer_icon_favorite.png differ

diff --git a/res/edje/images/image_viewer_icon_favorite_shadow.png b/res/edje/images/image_viewer_icon_favorite_shadow.png
index 8d7bae03fc1185b59bcaf3b1be1a2e4741bf5ffd..7a73ad1e5857ce69e163bc441ed8980884efdd6b 100644 (file)
Binary files a/res/edje/images/image_viewer_icon_favorite_shadow.png and b/res/edje/images/image_viewer_icon_favorite_shadow.png differ

diff --git a/res/edje/ivug-button_new.edc b/res/edje/ivug-button_new.edc
index 4006dbb094bcae94624caaa8f1047c1f39c86211..73b1048836f7f6e99132916bc0c78e286b2363af 100644 (file)
--- a/res/edje/ivug-button_new.edc
+++ b/res/edje/ivug-button_new.edc
@@ -27,7 +27,6 @@
                        align: 0.5 0.5; \
                        min: w h; max: w h; fixed: 1 1;\
                        image { normal: img_dim; }   \
-                       color: 107 107 107 255;/*AO005;*/\
                        visible: 1; \
                }       \
                description {           \
@@ -37,74 +36,17 @@
                }       \
                description {           \
                        state: "on" 0.0;                     \
-                       inherit: "default" 0.0;         \
-                       color: 255 255 0 255; /*0 0 0 102;AO001;*/\
-                       visible: 1; \
-               }\
-               description {           \
-                       state: "normal" 0.0;                       \
-                       inherit: "default" 0.0;         \
-                       image { normal: img_normal; }\
-                       visible: 1; \
-               }       \
-       }\
-       part {  \
-               name: part_name"_effect";        \
-               type: IMAGE;            \
-               scale: 1;       \
-               mouse_events: 0;        \
-               description {           \
-                       state: "default" 0.0;   \
                        rel1 { relative: 0.0 0.0; }     \
                        rel2 { relative: 1.0 1.0; } \
                        align: 0.5 0.5; \
                        min: w h; max: w h; fixed: 1 1;\
                        image { normal: img_normal_effect; }   \
-                       visible: 0; \
-               }       \
-               description {           \
-                       state: "press" 0.0;                     \
-                       inherit: "default" 0.0;         \
-                       visible: 1; \
-               }       \
-               description {           \
-                       state: "on" 0.0;                     \
-                       inherit: "default" 0.0;         \
-                       visible: 1; \
-               }\
-               description {           \
-                       state: "normal" 0.0;                       \
-                       inherit: "default" 0.0;         \
                        visible: 1; \
-               }       \
-       }\
-       part {  \
-               name: part_name"_effect2";        \
-               type: IMAGE;            \
-               scale: 1;       \
-               mouse_events: 0;        \
-               description {           \
-                       state: "default" 0.0;   \
-                       rel1 { relative: 0.0 0.0; }     \
-                       rel2 { relative: 1.0 1.0; } \
-                       align: 0.5 0.5; \
-                       min: w h; max: w h; fixed: 1 1;\
-                       image { normal: img_press_effect; }   \
-                       visible: 0;\
-               }       \
-               description {           \
-                       state: "press" 0.0;                     \
-                       inherit: "default" 0.0;         \
-                       visible: 1; \
-               }       \
-               description {           \
-                       state: "on" 0.0;                     \
-                       inherit: "default" 0.0;         \
-                       visible: 0; \
                }\
                description {           \
                        state: "normal" 0.0;                       \
                        inherit: "default" 0.0;         \
+                       image { normal: img_normal; }\
                        visible: 1; \
                }       \
        }\
@@ -183,15 +125,11 @@
                        if(get_int(check_state) == 1)\
                        {\
                                set_state(PART:part_name, "on", 0.0); \
-                               set_state(PART:part_name"_effect", "on", 0.0); \
-                               set_state(PART:part_name"_effect2", "on", 0.0); \
                                set_state(PART:part_name"_event", "normal", 0.0); \
                        }\
                        else\
                        {\
                                set_state(PART:part_name, "normal", 0.0); \
-                               set_state(PART:part_name"_effect", "normal", 0.0); \
-                               set_state(PART:part_name"_effect2", "normal", 0.0); \
                                set_state(PART:part_name"_event", "normal", 0.0); \
                        }\
                } \
@@ -202,8 +140,6 @@
                signal: part_name",press"; \
                script: { \
                        set_state(PART:part_name, "press", 0.0); \
-                       set_state(PART:part_name"_effect", "press", 0.0); \
-                       set_state(PART:part_name"_effect2", "press", 0.0); \
                } \
        } \
        program { \
@@ -212,8 +148,6 @@
                signal: part_name",dim"; \
                script: { \
                        set_state(PART:part_name, "default", 0.0); \
-                       set_state(PART:part_name"_effect", "default", 0.0); \
-                       set_state(PART:part_name"_effect2", "default", 0.0); \
                        set_state(PART:part_name"_event", "default", 0.0); \
                } \
        } \
@@ -270,7 +204,7 @@ collections {
                }
 
                parts {
-                       GENERAL_BUTTON_EFFECT2_SIZE("image", 30,30, "image_viewer_icon_favorite.png", "image_viewer_icon_favorite_shadow.png", "image_viewer_icon_favorite_stroke.png", "image_viewer_icon_favorite.png")
+                       GENERAL_BUTTON_EFFECT2_SIZE("image", 20,20, "image_viewer_icon_favorite.png", "image_viewer_icon_favorite_shadow.png", "image_viewer_icon_favorite_stroke.png", "image_viewer_icon_favorite.png")
                }
                programs {
                        GENERAL_PROGRAMS_EFFECT2("image", "ivug.btn.favorite")
@@ -280,8 +214,6 @@ collections {
                                signal: "image,on,effect";
                                script: {
                                        set_state(PART:"image", "on", 0.0);
-                                       set_state(PART:"image_effect", "on", 0.0);
-                                       set_state(PART:"image_effect2", "on", 0.0);
                                        set_int(check_state, 1);
                                }
                        }
@@ -291,8 +223,6 @@ collections {
                                signal: "image,off,effect";
                                script: {
                                        set_state(PART:"image", "normal", 0.0);
-                                       set_state(PART:"image_effect", "normal", 0.0);
-                                       set_state(PART:"image_effect2", "normal", 0.0);
                                        set_int(check_state, 0);
                                }
                        }
@@ -308,7 +238,7 @@ collections {
                }
 
                parts {
-                       GENERAL_BUTTON_EFFECT2_SIZE("image", 4,17, "image_viewer_icon_popup.png", "image_viewer_icon_popup.png", "image_viewer_icon_popup.png", "image_viewer_icon_popup.png")
+                       GENERAL_BUTTON_EFFECT2_SIZE("image", 6,24, "image_viewer_icon_popup.png", "image_viewer_icon_popup.png", "image_viewer_icon_popup.png", "image_viewer_icon_popup.png")
                }
                programs {
                        GENERAL_PROGRAMS_EFFECT2("image", "ivug.btn.popup")
@@ -318,8 +248,6 @@ collections {
                                signal: "image,on,effect";
                                script: {
                                        set_state(PART:"image", "on", 0.0);
-                                       set_state(PART:"image_effect", "on", 0.0);
-                                       set_state(PART:"image_effect2", "on", 0.0);
                                        set_int(check_state, 1);
                                }
                        }
@@ -329,8 +257,6 @@ collections {
                                signal: "image,off,effect";
                                script: {
                                        set_state(PART:"image", "normal", 0.0);
-                                       set_state(PART:"image_effect", "normal", 0.0);
-                                       set_state(PART:"image_effect2", "normal", 0.0);
                                        set_int(check_state, 0);
                                }
                        }

diff --git a/res/edje/ivug-main.edc b/res/edje/ivug-main.edc
index 619fafa477bff8f9f98de17618943854e501361f..4ff2b75d7672b909c6e0e004c3ab61b89632f109 100644 (file)
--- a/res/edje/ivug-main.edc
+++ b/res/edje/ivug-main.edc
@@ -297,11 +297,9 @@ collections {
                                        state: "default" 0.0;
                                        visible : 1;
                                        align: 0.0 0.0;
-                                       min : 4.5 8;
-                                       max : 4.5 8;
+                                       min : 6.75 11;
+                                       max : 6.75 11;
                                        image.normal : ICON_BACK_BUTTON;
-                                       //rel1 { relative: 1.0 1.0; to_x: "ivug.main.padding.l.10"; to_y: "ivug.main.padding.t.10"; }
-                                       //rel2 { relative: 1.0 1.0; to_x: "ivug.main.padding.l.10"; to_y: "ivug.main.padding.t.10"; }
                                        rel1{relative: 40/1280 32/720;}
                                        rel2{relative: 40/1280 32/720;}
                                }
@@ -321,10 +319,8 @@ collections {
                                        align: 0.0 0.0;
                                        min : 0.5 0.5 ;
                                        max : 0.5 0.5 ;
-                                       //rel1 { relative: 1 1.0; to_x: "ivug.main.padding.r.15"; to_y: "ivug.main.padding.t.10"; }
-                                       //rel2 { relative: 0.0 1.0; to_x: "ivug.main.padding.r.15"; to_y: "ivug.main.padding.t.10"; }
-                                       rel1{relative: 1210/1280 20/720;}
-                                       rel2{relative: 1210/1280 20/720;}
+                                       rel1{relative: 1237/1280 30/720;}
+                                       rel2{relative: 1237/1280 30/720;}
                                        fixed: 1 1;
                                        visible: 1;
                                }
@@ -344,10 +340,8 @@ collections {
                                        align: 0.0 0.0;
                                        min : 0.5 0.5 ;
                                        max : 0.5 0.5 ;
-                                       //rel1 { relative: 0.0 1.0; to_x: "ivug.main.padding.r.15"; to_y: "ivug.main.padding.t.10"; }
-                                       //rel2 { relative: 0.0 1.0; to_x: "ivug.main.padding.r.15"; to_y: "ivug.main.padding.t.10"; }
-                                       rel1{relative: 1140/1280 20/720;}
-                                       rel2{relative: 1140/1280 20/720;}
+                                       rel1{relative: 1168/1280 30/720;}
+                                       rel2{relative: 1168/1280 30/720;}
                                        fixed: 1 1;
                                        visible: 1;
                                }

diff --git a/res/edje/ivug-slider-new-hd.edc b/res/edje/ivug-slider-new-hd.edc
index 2e23989b4f15f6978f0fa87d45031713c90cc9d7..34acc834d1ad6c6432760233997fdb1f76c855bc 100644 (file)
--- a/res/edje/ivug-slider-new-hd.edc
+++ b/res/edje/ivug-slider-new-hd.edc
@@ -97,9 +97,9 @@ collections {
                                        state: "landscape_select_mode" 0.0;
                                        color: 0 0 0 255;
                                        rel1.relative: 0.0 0.0;
-                                       align: 0.5 1;
-                                       min: 500 245;
-                                       max: 500 245;
+                                       align: 0.5 0.5;
+                                       min: 500 277;
+                                       max: 720 480;
                                        fixed: 1 1;
                                }
                        }

diff --git a/res/edje/ivug-ss-ly.edc b/res/edje/ivug-ss-ly.edc
index 8991dca27bead6d91c96f012f1b8a687ce19ce50..cdcddc1bda300dd91d0a57e27c1d0a3e387be042 100644 (file)
--- a/res/edje/ivug-ss-ly.edc
+++ b/res/edje/ivug-ss-ly.edc
@@ -115,7 +115,8 @@ collections {
                                        align: 0.5 0.5;
                                        visible: 1;
                                        fixed: 1 1;
-                                       max: 140 140;
+                                       min: 405.33 405.33;
+                                       max: 405.33 405.33;
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
                                        image.normal: "viwer_video_play.png";
@@ -195,13 +196,13 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       align: 0.8 0.5;
+                                       align: 0.8 1.0;
                                        visible: 1;
-                                       min: 0 72;
-                                       max: 240 72;
+                                       min: 315 92.5;
+                                       max: 315 92.5;
                                        fixed: 1 1;
                                        rel1 { relative: 0.050 0.486; to: "bottom_icon_area"; }
-                                       rel2 { relative: 0.475 0.799; to: "bottom_icon_area"; }
+                                       rel2 { relative: 0.475 0.68; to: "bottom_icon_area"; }
                                        image.normal: "Image_viewer_popup_bg.#.png";
                                        color: 255 255 255 255;
                                }
@@ -230,7 +231,7 @@ collections {
                                        rel1 { relative: 0.0 0.0; to: "effect.icon.bg";}
                                        rel2 { relative: 1.0 1.0; to: "effect.icon.bg";}
                                        image.normal: "Image_viewer_popup_bg_stroke.#.png";
-                                       color: 128 128 128 255;
+                                       color: 10 14 74 255;
                                }
                                description {
                                        state: "hide" 0.0;
@@ -251,7 +252,7 @@ collections {
                                        color: 0 0 0 255;
                                        visible: 1;
                                        text {
-                                               font: "Tizen:style=Bold";
+                                               font: "Tizen:style=Regular";
                                                size: 30;
                                                align: 0.5 0.5;
                                                max: 1 1;
@@ -296,13 +297,13 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       align: 0.2 0.8;
+                                       align: 0.2 1.0;
                                        visible: 1;
-                                       min: 0 72;
-                                       max: 240 72;
+                                       min: 315 92.5;
+                                       max: 315 92.5;
                                        fixed: 1 1;
                                        rel1 { relative: 0.525 0.486; to: "bottom_icon_area"; }
-                                       rel2 { relative: 0.950 0.799; to: "bottom_icon_area"; }
+                                       rel2 { relative: 0.950 0.68; to: "bottom_icon_area"; }
                                        image.normal: "Image_viewer_popup_bg.#.png";
                                        color: 255 255 255 255;
                                }
@@ -331,7 +332,7 @@ collections {
                                        rel1 { relative: 0.0 0.0; to: "slide_interval_setting.icon.bg";}
                                        rel2 { relative: 1.0 1.0; to: "slide_interval_setting.icon.bg";}
                                        image.normal: "Image_viewer_popup_bg_stroke.#.png";
-                                       color: 128 128 128 255;
+                                       color: 10 14 74 255;
                                }
                                description {
                                        state: "hide" 0.0;
@@ -352,7 +353,7 @@ collections {
                                        color: 0 0 0 255;
                                        visible: 1;
                                        text {
-                                               font: "Tizen:style=Bold";
+                                               font: "Tizen:style=Regular";
                                                size: 30;
                                                align: 0.5 0.5;
                                                max: 1 1;

diff --git a/res/po/en.po b/res/po/en.po
index 405c392dd098e639d55e566b97d32ead62de73f7..303f3fb61a155b2d57c785965e7ad733ba5f16c0 100644 (file)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -839,7 +839,7 @@ msgid "IDS_MF_POP_THERE_IS_NOT_ENOUGH_SPACE_IN_YOUR_DEVICE_STORAGE_GO_TO_SETTING
 msgstr "There is not enough space in your device storage. Go to Settings > Power and storage > Storage, then delete some files and try again."
 
 msgid "IDS_IV_HEADER_SLIDE_INTERVAL_ABB"
-msgstr "Slide interval"
+msgstr "SLIDE INTERVAL"
 
 msgid "IDS_IV_MBODY_SLIDE_INTERVAL_ABB"
 msgstr "Slide interval"
@@ -986,7 +986,7 @@ msgid "IDS_COM_BODY_PD_SECONDS"
 msgstr "%d seconds"
 
 msgid "IDS_IV_BODY_EFFECT"
-msgstr "Effect"
+msgstr "EFFECT"
 
 msgid "IDS_IMGE_HEARDER_EFFECTS"
 msgstr "Effects"

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index f4511f73d0d8d5d32683edabe141e98eeb6eefa4..51ce9be01a8bc2c8b34d15336a28ee7743cb6d58 100644 (file)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -839,7 +839,7 @@ msgid "IDS_MF_POP_THERE_IS_NOT_ENOUGH_SPACE_IN_YOUR_DEVICE_STORAGE_GO_TO_SETTING
 msgstr "There is not enough space in your device storage. Go to Settings > Power and storage > Storage, then delete some files and try again."
 
 msgid "IDS_IV_HEADER_SLIDE_INTERVAL_ABB"
-msgstr "Slide interval"
+msgstr "SLIDE INTERVAL"
 
 msgid "IDS_IV_MBODY_SLIDE_INTERVAL_ABB"
 msgstr "Slide interval"
@@ -986,7 +986,7 @@ msgid "IDS_COM_BODY_PD_SECONDS"
 msgstr "%d seconds"
 
 msgid "IDS_IV_BODY_EFFECT"
-msgstr "Effect"
+msgstr "EFFECT"
 
 msgid "IDS_IMGE_HEARDER_EFFECTS"
 msgstr "Effects"

diff --git a/res/po/en_US.po b/res/po/en_US.po
index f572f5d84d0a113984b415cb041a6ec28242ff70..82d1476bc2740f680bdb342bf0783c723668fc73 100644 (file)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -839,7 +839,7 @@ msgid "IDS_MF_POP_THERE_IS_NOT_ENOUGH_SPACE_IN_YOUR_DEVICE_STORAGE_GO_TO_SETTING
 msgstr "There is not enough space in your device storage. Go to Settings > Power and storage > Storage, then delete some files and try again."
 
 msgid "IDS_IV_HEADER_SLIDE_INTERVAL_ABB"
-msgstr "Slide interval"
+msgstr "SLIDE INTERVAL"
 
 msgid "IDS_IV_MBODY_SLIDE_INTERVAL_ABB"
 msgstr "Slide interval"
@@ -986,7 +986,7 @@ msgid "IDS_COM_BODY_PD_SECONDS"
 msgstr "%d seconds"
 
 msgid "IDS_IV_BODY_EFFECT"
-msgstr "Effect"
+msgstr "EFFECT"
 
 msgid "IDS_IMGE_HEARDER_EFFECTS"
 msgstr "Effects"

diff --git a/src/main/view/ivug-main-view-menu.cpp b/src/main/view/ivug-main-view-menu.cpp
index 55f66642029372ba1458e4b3123ebbe19c344554..410509bdc7237d2e0c9fe4a540d43d1bc1442cd2 100644 (file)
--- a/src/main/view/ivug-main-view-menu.cpp
+++ b/src/main/view/ivug-main-view-menu.cpp
@@ -610,7 +610,7 @@ _ivug_ctxpopup_rename_sel_cb(void *data, Evas_Object *obj, void *event_info)
  */
 static void _ivug_move_more_ctxpopup(Evas_Object *win, Evas_Object *ctxpopup)
 {
-       evas_object_move(ctxpopup, 1200, 300);
+       evas_object_move(ctxpopup, 1200, 64);
 }
 
 /**
@@ -744,7 +744,8 @@ void on_btn_more_clicked(void *data, Evas_Object *obj, void *event_info)
        if (pMainView->bShowMenu == true) {
                ivug_main_view_del_hide_timer(pMainView);
        }
-
+       edje_object_signal_emit(_EDJ(pMainView->lyContent), "elm,state,show", "user");
+       edje_object_signal_emit(elm_layout_edje_get(pMainView->lyContent), "show,back,btn", "user");
        Evas_Object *ctxpopup = elm_ctxpopup_add(gGetCurrentWindow());
        elm_object_style_set(ctxpopup, "more/default");
 

diff --git a/src/slideshow/control/ivug-slideshow.cpp b/src/slideshow/control/ivug-slideshow.cpp
index 66b43bba53bdeb748220ef3a333fa00e1bb74f6a..dff7f55000f5c854b3b8952cdc6425108077c2a6 100644 (file)
--- a/src/slideshow/control/ivug-slideshow.cpp
+++ b/src/slideshow/control/ivug-slideshow.cpp
@@ -933,7 +933,6 @@ static void _stop_cb(void *data, Evas_Object *obj, const char *emission, const c
 static char *
 _gl_text_get_effect_type(void *data, Evas_Object *obj, const char *part)
 {
-       MSG_ERROR("IN 936 %s",part);
        if (!strcmp(part, "elm.text")) {
                st_temp *ob = (st_temp *)data;
                int index = ob->index;