From: Jaehyun Cho Date: Wed, 26 Jun 2013 06:51:36 +0000 (+0900) Subject: [naviframe] Apply Naviframe dark theme GUI v0.7 X-Git-Tag: accepted/tizen/20131029.210118~98 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1887342942996c6d192987a2112ac4b820f17ff;p=profile%2Fivi%2Fefl-theme-tizen.git [naviframe] Apply Naviframe dark theme GUI v0.7 Change-Id: Ic23a0bf88666c10eda698fbaa8903023eb1f275d --- diff --git a/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png new file mode 100755 index 0000000..e2c6a24 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_left.png differ diff --git a/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png new file mode 100755 index 0000000..d4cbfbf Binary files /dev/null and b/themes/images/HD/dark/Naviframe/00_effect_title_text_dim_right.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png index 76f10ec..2f74cbc 100755 Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png new file mode 100755 index 0000000..bc34366 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_cancel.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png new file mode 100755 index 0000000..5274a73 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_delete.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_done.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_done.png new file mode 100755 index 0000000..1ab559d Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_done.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png index a56d1f6..9b3ad23 100755 Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png index d49406f..b743802 100755 Binary files a/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png and b/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png new file mode 100755 index 0000000..c4d63b8 Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_search.png differ diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png new file mode 100755 index 0000000..0c531fc Binary files /dev/null and b/themes/images/HD/dark/Naviframe/Icon/00_icon_select_all.png differ diff --git a/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png new file mode 100755 index 0000000..e2c6a24 Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_left.png differ diff --git a/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png new file mode 100755 index 0000000..d4cbfbf Binary files /dev/null and b/themes/images/HD/light/Naviframe/00_effect_title_text_dim_right.png differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 1bafaed..a0fa8e6 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -48,7 +48,7 @@ #define NAVIFRAME_TITLE_FONT_SIZE_INC 50 #define NAVIFRAME_TITLE_FONT_MIN_SIZE_INC 46 #define NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC 50 -#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44 +#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 42 #define NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC 38 #define NAVIFRAME_ICON_SIZE_INC 45 45 #define NAVIFRAME_PADDING_INC 26 0 @@ -67,15 +67,17 @@ #define NAVIFRAME_TITLE_TEXT_COLOR_INC 250 250 250 255 #define NAVIFRAME_TITLE_STYLE_COLOR_INC "#FAFAFA" #define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 250 250 250 255 -#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32 +#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 30 #define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28 #define NAVIFRAME_SUBTITLE_H_INC 37 #define NAVIFRAME_LANDSCAPE_SUBTITLE_H_INC 30 -#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 6 +#define NAVIFRAME_SUBTITLE_TOP_PADDING_H_INC 2 #define NAVIFRAME_LANDSCAPE_SUBTITLE_TOP_PADDING_H_INC 4 #define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255 #define NAVIFRAME_BADGE_TEXT_COLOR_INC 250 250 250 255; #define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82 +#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC 63 27 +#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC 0 0 13 12 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index 368400e..e46c789 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -103,6 +103,8 @@ #define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255 #define NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC 255 255 255 255 #define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82 +#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC 63 27 +#define NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC 0 0 13 12 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index df9502f..d247bc2 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -5677,7 +5677,7 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png") } styles{ style { name: "btn_naviframe_title_text"; - base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; + base: "font=Tizen:style=Bold font_size="BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC" align=center color="BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC" style=far_shadow,bottom shadow_color="BUTTON_NAVIFRAME_TITLE_TEXT_SHADOW_NORMAL_COLOR_INC" ellipsis=1.0 wrap=none text_class=tizen"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc index 9c46293..7dbe5c7 100644 --- a/themes/widgets/naviframe.edc +++ b/themes/widgets/naviframe.edc @@ -27,6 +27,8 @@ images { image: "00_title_bg.png" COMP; image: "00_badge_bg.png" COMP; + image: "00_effect_title_text_dim_left.png" COMP; + image: "00_effect_title_text_dim_right.png" COMP; } script { public tbar_bg = 0; //Toolbar BG Show call count @@ -178,6 +180,9 @@ return; } + set_state(PART:"title_text_slide_effect_left", "visible", 0.0); + set_state(PART:"title_text_slide_effect_right", "visible", 0.0); + len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP; set_float(title_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); @@ -216,6 +221,9 @@ return; } + set_state(PART:"subtitle_text_slide_effect_left", "visible", 0.0); + set_state(PART:"subtitle_text_slide_effect_right", "visible", 0.0); + len = get_int(subtitle_text_w) + NAVIFRAME_SUBTITLE_SLIDE_TEXT_GAP; if (!get_int(landscape)) set_float(subtitle_duration, len * NAVIFRAME_TITLE_SLIDE_SPEED_WEIGHT); @@ -267,6 +275,9 @@ set_state(PART:"title_text_clip", "default", 0.0); set_state(PART:"slide_title_text_clip", "default", 0.0); + + set_state(PART:"title_text_slide_effect_left", "default", 0.0); + set_state(PART:"title_text_slide_effect_right", "default", 0.0); } // Subtitle Text else { @@ -285,6 +296,9 @@ set_state(PART:"subtitle_text_clip", "default", 0.0); set_state(PART:"slide_subtitle_text_clip", "default", 0.0); + + set_state(PART:"subtitle_text_slide_effect_left", "default", 0.0); + set_state(PART:"subtitle_text_slide_effect_right", "default", 0.0); } } } @@ -607,6 +621,43 @@ text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; } } + part { name: "title_text_slide_effect_left_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + align: 1.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 0.0 0.0; to: "elm.text.title"; } + rel2 { relative: 0.0 1.0; to: "elm.text.title"; } + } + } + part { name: "title_text_slide_effect_left"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 0.0 0.0; to: "title_text_slide_effect_left_bg"; } + rel2 { relative: 0.0 1.0; to: "title_text_slide_effect_left_bg"; } + image { + normal: "00_effect_title_text_dim_left.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "elm.text.full_title"; type: TEXT; scale: 1; @@ -717,6 +768,43 @@ text.size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC; } } + part { name: "title_text_slide_effect_right_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "elm.text.title"; } + rel2 { relative: 1.0 1.0; to: "elm.text.title"; } + } + } + part { name: "title_text_slide_effect_right"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 1.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "title_text_slide_effect_right_bg"; } + rel2 { relative: 1.0 1.0; to: "title_text_slide_effect_right_bg"; } + image { + normal: "00_effect_title_text_dim_right.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "subtitle_top_padding"; type: RECT; scale: 1; @@ -883,6 +971,29 @@ rel2 { relative: 0.0 1.0; to: "slide_subtitle_divider1"; } } } + part { name: "subtitle_text_slide_effect_left"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 0.0 0.0; to_x: "title_text_slide_effect_left_bg"; to_y: "subtitle_text_bg"; } + rel2 { relative: 0.0 1.0; to_x: "title_text_slide_effect_left_bg"; to_y: "subtitle_text_bg"; } + image { + normal: "00_effect_title_text_dim_left.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "elm.text.full_subtitle"; type: TEXT; scale: 1; @@ -958,6 +1069,43 @@ rel2.relative: 0.0 1.0; } } + part { name: "subtitle_text_slide_effect_right_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "elm.text.subtitle"; } + rel2 { relative: 1.0 1.0; to: "elm.text.subtitle"; } + } + } + part { name: "subtitle_text_slide_effect_right"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_subtitle_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 1.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "subtitle_text_slide_effect_right_bg"; } + rel2 { relative: 1.0 1.0; to: "subtitle_text_slide_effect_right_bg"; } + image { + normal: "00_effect_title_text_dim_right.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "padding_before_text"; type: RECT; scale: 1; @@ -1149,7 +1297,6 @@ clip_to: "title_clip"; description { state: "default" 0.0; max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; - fixed: 1 1; align: 1.0 0.5; rel1 { relative: 0.0 0.0; to: "divider2"; } rel2 { relative: 0.0 1.0; to: "divider2"; } @@ -1197,7 +1344,6 @@ description { state: "default" 0.0; max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC; align: 1.0 0.5; - fixed: 1 1; rel1 { relative: 1.0 0.0; to: "title_bg"; } rel2 { relative: 1.0 1.0; to: "title_bg"; } } @@ -1577,7 +1723,6 @@ source: "click_event_area"; script { emit("elm,action,title,clicked", ""); - emit("elm,action,title,slide", ""); } } program { @@ -1712,6 +1857,8 @@ group { name: "elm/naviframe/item/tabbar/default"; images { image: "00_title_bg.png" COMP; + image: "00_effect_title_text_dim_left.png" COMP; + image: "00_effect_title_text_dim_right.png" COMP; } script { public tbar_bg = 0; //Controlbar BG Show call count @@ -1792,6 +1939,9 @@ return; } + set_state(PART:"title_text_slide_effect_left", "visible", 0.0); + set_state(PART:"title_text_slide_effect_right", "visible", 0.0); + len = get_int(title_text_w) + NAVIFRAME_TITLE_SLIDE_TEXT_GAP; if (get_int(landscape)) @@ -1841,6 +1991,9 @@ set_state(PART:"title_text_clip", "default", 0.0); set_state(PART:"slide_title_text_clip", "default", 0.0); + + set_state(PART:"title_text_slide_effect_left", "default", 0.0); + set_state(PART:"title_text_slide_effect_right", "default", 0.0); } } @@ -2092,6 +2245,43 @@ text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; } } + part { name: "title_text_slide_effect_left_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + align: 1.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 0.0 0.0; to: "elm.text.title"; } + rel2 { relative: 0.0 1.0; to: "elm.text.title"; } + } + } + part { name: "title_text_slide_effect_left"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 0.0 0.0; to: "title_text_slide_effect_left_bg"; } + rel2 { relative: 0.0 1.0; to: "title_text_slide_effect_left_bg"; } + image { + normal: "00_effect_title_text_dim_left.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "elm.text.full_title"; type: TEXT; scale: 1; @@ -2170,6 +2360,43 @@ text.size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC; } } + part { name: "title_text_slide_effect_right_bg"; + type: RECT; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_PADDING_INC; + align: 0.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "elm.text.title"; } + rel2 { relative: 1.0 1.0; to: "elm.text.title"; } + } + } + part { name: "title_text_slide_effect_right"; + type: IMAGE; + scale: 1; + mouse_events: 0; + clip_to: "slide_title_text_clip"; + description { state: "default" 0.0; + min: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_SIZE_INC; + align: 1.0 0.5; + fixed: 1 0; + visible: 0; + rel1 { relative: 1.0 0.0; to: "title_text_slide_effect_right_bg"; } + rel2 { relative: 1.0 1.0; to: "title_text_slide_effect_right_bg"; } + image { + normal: "00_effect_title_text_dim_right.png"; + border: NAVIFRAME_TITLE_TEXT_SLIDE_EFFECT_IMAGE_BORDER_INC; + border_scale: 1; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "click_event_area"; type: RECT; ignore_flags: ON_HOLD; @@ -2486,7 +2713,6 @@ source: "click_event_area"; script { emit("elm,action,title,clicked", ""); - emit("elm,action,title,slide", ""); } } program {