From 7c144b0b6d8f196f8f3df8a000b341e3ca7f9404 Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Thu, 13 Jun 2013 16:39:31 +0900 Subject: [PATCH] [toolbar]GUI for dark theme ver 0.3 Change-Id: I9863118ef2f7a097d6be1062b061494179f9d28b --- .../images/HD/dark/Naviframe/00_toolbar_press.png | Bin 0 -> 2896 bytes .../images/HD/light/Naviframe/00_toolbar_press.png | Bin 0 -> 2896 bytes themes/inc/tizen-dark-inc.edc | 8 +- themes/widgets/toolbar.edc | 1129 ++++---------------- 4 files changed, 193 insertions(+), 944 deletions(-) create mode 100644 themes/images/HD/dark/Naviframe/00_toolbar_press.png create mode 100644 themes/images/HD/light/Naviframe/00_toolbar_press.png diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_press.png b/themes/images/HD/dark/Naviframe/00_toolbar_press.png new file mode 100644 index 0000000000000000000000000000000000000000..9e405c8678de497d91bbb0840398f3a882c9dfcb GIT binary patch literal 2896 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 4) - set_state(PART:"elm.text", "visible_30", 0.0); - } - } - } - program { name: "text_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); - if (!strcmp(st, "visible")) - { - set_state(PART:"elm.swallow.icon", "icononly", 0.0); - set_state(PART:"icon_rect", "icononly", 0.0); - set_state(PART:"padding_after_icon", "icononly", 0.0); - } - set_state(PART:"elm.text", "default", 0.0); - } - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - set_state(PART:"elm.swallow.icon", "visible", 0.0); - set_state(PART:"icon_rect", "visible", 0.0); - set_state(PART:"padding_after_icon", "visible", 0.0); - set_state(PART:"elm.text", "visible", 0.0); - } - else - { - set_state(PART:"elm.swallow.icon", "icononly", 0.0); - set_state(PART:"icon_rect", "icononly", 0.0); - set_state(PART:"padding_after_icon", "icononly", 0.0); - } - } - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - if (get_int(items_number) <= 3) - set_state(PART:"elm.text", "visible_32", 0.0); - else if (get_int(items_number) >= 4) - set_state(PART:"elm.text", "visible_30", 0.0); - } - set_state(PART:"elm.swallow.icon", "default", 0.0); - set_state(PART:"icon_rect", "default", 0.0); - set_state(PART:"padding_after_icon", "default", 0.0); - } - } - program { name: "text_only_item_1"; - signal: "elm,number,item,1"; - source: "elm"; - script { - set_int(items_number, 1); - } - after: "text_only_item_under_3"; - } - program { name: "text_only_item_2"; - signal: "elm,number,item,2"; - source: "elm"; - script { - set_int(items_number, 2); - } - after: "text_only_item_under_3"; - } - program { name: "text_only_item_3"; - signal: "elm,number,item,3"; - source: "elm"; - script { - set_int(items_number, 3); - } - after: "text_only_item_under_3"; - } - program { name: "text_only_item_under_3"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); - if (strcmp(st, "visible")) - { - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - set_state(PART:"elm.text", "visible_32", 0.0); - } - } - } - } - program { name: "text_only_item_4"; - signal: "elm,number,item,4"; - source: "elm"; - script { - set_int(items_number, 4); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_5"; - signal: "elm,number,item,5"; - source: "elm"; - script { - set_int(items_number, 5); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_6"; - signal: "elm,number,item,6"; - source: "elm"; - script { - set_int(items_number, 6); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_7"; - signal: "elm,number,item,7"; - source: "elm"; - script { - set_int(items_number, 7); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_8"; - signal: "elm,number,item,8"; - source: "elm"; - script { - set_int(items_number, 8); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_9"; - signal: "elm,number,item,9"; - source: "elm"; - script { - set_int(items_number, 9); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_10"; - signal: "elm,number,item,10"; - source: "elm"; - script { - set_int(items_number, 10); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_upper_4"; - signal: "elm,number,item,4"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); - if (strcmp(st, "visible")) - { - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - set_state(PART:"elm.text", "visible_30", 0.0); - } - } - } - } - } -} - -group { name: "elm/toolbar/item/item_horizontal"; - inherit: "elm/toolbar/item/default"; - parts { - part { name: "icon_rect"; - description { state: "default" 0.0; - fixed: 1 0; - align: 0.0 0.5; - } - description { state: "visible" 0.0; - fixed: 1 0; - rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; - } - align: 0.0 0.5; - } - } - part { name: "padding_after_icon"; - description { state: "default" 0.0; //when only icon or no icon is there - rel1.relative: 1.0 0.0; - fixed: 1 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - min: 6 0; - } - } - part { name: "padding_before_text"; - description { state: "default" 0.0; //when only icon or no icon is there - align: 1.0 0.5; - rel1 { - relative: 0.0 1.0; - to_x: "elm.text"; - to_y: "padding_left_top"; - } - rel2 { - to_x: "elm.text"; - to_y: "padding_right_bottom"; - } - fixed: 1 0; - min: 6 0; - } - } - part { name: "elm.swallow.icon"; - description { state: "default" 0.0; - align: 0.0 0.5; - rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; - } - fixed: 1 0; - } - description { state: "visible" 0.0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - relative: 0.0 1.0; - to_x: "padding_before_text"; - to_y: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to_x: "padding_before_text"; - to_y: "padding_right_bottom"; - } - aspect_preference: VERTICAL; - } - description { state: "icononly" 0.0; - aspect_preference: VERTICAL; - } - } - part { name: "elm.swallow.icon_new"; - description { state: "default" 0.0; - align: 0.0 0.5; - rel2 { - relative: 1.0 0.0; - to_x: "padding_left_top"; - to_y: "padding_right_bottom"; - } - fixed: 1 0; - } - description { state: "visible" 0.0; - fixed: 1 0; - align: 1.0 0.5; - rel1 { - relative: 0.0 1.0; - to_x: "padding_before_text"; - to_y: "padding_left_top"; - } - rel2 { - relative: 0.0 0.0; - to_x: "padding_before_text"; - to_y: "padding_right_bottom"; - } - aspect_preference: VERTICAL; - } - description { state: "icononly" 0.0; - aspect_preference: VERTICAL; - } + signal: "mouse,out"; + source: "event"; + action: SIGNAL_EMIT "elm,mouse,out" "elm"; } - part { name: "elm.text"; - type: TEXTBLOCK; - description { state: "default" 0.0; - rel1 { - relative: 1.0 1.0; - to_x: "padding_after_icon"; - to_y: "padding_left_top"; - } - text { - min: 1 0; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_int(item_state, ITEM_STATE_DISABLED); + set_state(PART:"bg", "disabled", 0.0); + set_state(PART:"elm.text.clipper", "disabled", 0.0); + run_program(PROGRAM:"label_set,animation,done"); } - description { state: "visible_30" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_30"; - visible: 1; + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_int(item_state, ITEM_STATE_ENABLED); + set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.text.clipper", "default", 0.0); + run_program(PROGRAM:"label_set,animation,done"); } - description { state: "visible_32" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_32"; - visible: 1; + } + program { name: "label_set,animation,forward"; + signal: "elm,state,label_set,forward"; + source: "elm"; + after: "label_set,sync"; + } + program { name: "label_set,animation,backward"; + signal: "elm,state,label_set,backward"; + source: "elm"; + after: "label_set,sync"; + } + program { name: "label_set,sync"; + signal: "elm,state,label_set"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + set_state(PART:"elm.text_new", st, vl); } - description { state: "visible_36" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_36"; - visible: 1; + after: "label_set,animation"; + } + program { name: "label_set,animation"; + action: STATE_SET "animation" 0.0; + target: "elm.text.clipper"; + target: "elm.text_new.clipper"; + transition: LINEAR 0.2; + after: "label_set,animation,done"; + } + program { name: "label_set,animation,done"; + action: SIGNAL_EMIT "elm,state,label_set,done" "elm"; + } + program { name: "label,reset"; + signal: "elm,state,label,reset"; + source: "elm"; + script { + set_state(PART:"elm.text_new.clipper", "default", 0.0); + if (get_int(item_state) != ITEM_STATE_DISABLED) + set_state(PART:"elm.text.clipper", "default", 0.0); + else + set_state(PART:"elm.text.clipper", "disabled", 0.0); } } - part { name: "elm.text_new"; - type: TEXTBLOCK; - description { state: "default" 0.0; - rel1 { - relative: 1.0 1.0; - to_x: "padding_after_icon"; - to_y: "padding_left_top"; - } - text { - min: 1 0; - } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + set_state(PART:"elm.text", "visible", 0.0); } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + script { + set_state(PART:"elm.text", "default", 0.0); } - description { state: "visible_30" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_30"; - visible: 1; + } + program { name: "text_only_item_1"; + signal: "elm,number,item,1"; + source: "elm"; + script { + set_int(items_number, 1); + set_state(PART:"padding_left_top", "1_item", 0.0); + set_state(PART:"padding_right_bottom", "1_item", 0.0); } - description { state: "visible_32" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_32"; - visible: 1; + } + program { name: "text_only_item_2"; + signal: "elm,number,item,2"; + source: "elm"; + script { + set_int(items_number, 2); + set_state(PART:"padding_left_top", "2_items", 0.0); + set_state(PART:"padding_right_bottom", "2_items", 0.0); } - description { state: "visible_36" 0.0; - inherit: "default" 0.0; - text.style: "toolbar_text_style_36"; - visible: 1; + } + program { name: "text_only_item_3"; + signal: "elm,number,item,3"; + source: "elm"; + script { + set_int(items_number, 3); + set_state(PART:"padding_left_top", "3_items", 0.0); + set_state(PART:"padding_right_bottom", "3_items", 0.0); } } + program { name: "divider_visible"; + signal: "elm,order,first,item"; + signal: "elm,order,default,item"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "divider"; + } + program { name: "divider_hidden"; + signal: "elm,order,last,item"; + source: "elm"; + action: STATE_SET "hidden" 0.0; + target: "divider"; + } } } @@ -1561,37 +1041,6 @@ group { name: "elm/toolbar/item/tabbar"; inherit: "default" 0.0; visible: 1; } - description { state: "visible" 0.24; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_24"; - } - description { state: "visible" 0.28; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_28"; - } - description { state: "visible" 0.30; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_30"; - } - description { state: "selected" 0.0; - inherit: "visible" 0.0; - text.style: "toolbar_selected_text_style_30"; - } - description { state: "selected" 0.24; - inherit: "visible" 0.24; - text.style: "toolbar_selected_text_style_24"; - } - description { state: "selected" 0.28; - inherit: "visible" 0.28; - text.style: "toolbar_selected_text_style_28"; - } - description { state: "selected" 0.30; - inherit: "visible" 0.30; - text.style: "toolbar_selected_text_style_30"; - } } part { name: "elm.text_new"; type: TEXTBLOCK; @@ -1621,37 +1070,6 @@ group { name: "elm/toolbar/item/tabbar"; inherit: "default" 0.0; visible: 1; } - description { state: "visible" 0.24; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_24"; - } - description { state: "visible" 0.28; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_28"; - } - description { state: "visible" 0.30; - inherit: "visible" 0.0; - max: 0 34; - text.style: "toolbar_text_style_30"; - } - description { state: "selected" 0.0; - inherit: "visible" 0.0; - text.style: "toolbar_selected_text_style_30"; - } - description { state: "selected" 0.24; - inherit: "visible" 0.24; - text.style: "toolbar_selected_text_style_24"; - } - description { state: "selected" 0.28; - inherit: "visible" 0.28; - text.style: "toolbar_selected_text_style_28"; - } - description { state: "selected" 0.30; - inherit: "visible" 0.30; - text.style: "toolbar_selected_text_style_30"; - } } part { name: "selected_line"; type: IMAGE; @@ -1980,7 +1398,7 @@ group { name: "elm/toolbar/item/tabbar"; set_int(selected, 1); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "selected", vl); + set_state(PART:"elm.text", "visible", vl); } } program { name: "go_passive"; @@ -2183,28 +1601,7 @@ group { name: "elm/toolbar/item/tabbar"; set_state(PART:"padding_after_icon", "visible", 0.0); set_state(PART:"bg", "icon_text", 0.0); } - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "default")) - { - if (get_int(selected)) - set_str(temp, "selected"); - else - set_str(temp, "visible"); - get_str(temp, st, 31); - - if (get_int(items_number) <= 2) - set_state(PART:"elm.text", st, 0.30); - else if (get_int(items_number) == 3) - set_state(PART:"elm.text", st, 0.28); - else if (get_int(items_number) >= 4) - { - get_state(PART:"bg", st, 30, vl); - if (!strcmp(st, "icon_text")) - set_state(PART:"elm.text", st, 0.28); - else - set_state(PART:"elm.text", st, 0.24); - } - } + set_state(PART:"elm.text", "visible", 0.0); } } program { name: "text_hide"; @@ -2256,126 +1653,6 @@ group { name: "elm/toolbar/item/tabbar"; set_state(PART:"bg", "default", 0.0); } } - program { name: "text_only_item_1"; - signal: "elm,number,item,1"; - source: "elm"; - script { - set_int(items_number, 1); - } - after: "text_only_item_under_2"; - } - program { name: "text_only_item_2"; - signal: "elm,number,item,2"; - source: "elm"; - script { - set_int(items_number, 2); - } - after: "text_only_item_under_2"; - } - program { name: "text_only_item_under_2"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - set_state(PART:"elm.text", st, 0.30); - } - set_state(PART:"padding.badge", "default", 0.10); - } - } - program { name: "text_only_item_3"; - signal: "elm,number,item,3"; - source: "elm"; - script { - new st[31]; - new Float:vl; - set_int(items_number, 3); - get_state(PART:"elm.text", st, 30, vl); - if (!strncmp(st, "visible", 7)) - { - set_state(PART:"elm.text", st, 0.28); - } - set_state(PART:"padding.badge", "default", 0.06); - } - } - program { name: "text_only_item_4"; - signal: "elm,number,item,4"; - source: "elm"; - script { - set_int(items_number, 4); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_5"; - signal: "elm,number,item,5"; - source: "elm"; - script { - set_int(items_number, 5); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_6"; - signal: "elm,number,item,6"; - source: "elm"; - script { - set_int(items_number, 6); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_7"; - signal: "elm,number,item,7"; - source: "elm"; - script { - set_int(items_number, 7); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_8"; - signal: "elm,number,item,8"; - source: "elm"; - script { - set_int(items_number, 8); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_9"; - signal: "elm,number,item,9"; - source: "elm"; - script { - set_int(items_number, 9); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_10"; - signal: "elm,number,item,10"; - source: "elm"; - script { - set_int(items_number, 10); - } - after: "text_only_item_upper_4"; - } - program { name: "text_only_item_upper_4"; - script { - new st[31]; - new stb[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible") || !strcmp(st, "selected")) - { - get_state(PART:"bg", stb, 30, vl); - if (!strcmp(stb, "icon_text")) - set_state(PART:"elm.text", st, 0.28); - else - set_state(PART:"elm.text", st, 0.24); - } - get_state(PART:"bg", stb, 30, vl); - if (!strcmp(stb, "icon_text")) - set_state(PART:"padding.badge", "default", 0.06); - else - set_state(PART:"padding.badge", "default", 0.04); - } - } program { name: "badge_show"; signal: "elm,state,elm.text.badge,visible"; source: "elm"; @@ -2501,29 +1778,3 @@ group { name: "elm/toolbar/item/tabbar/item_with_title"; } } } - -group { name: "elm/toolbar/base/tabbar/item_horizontal"; - alias: "elm/toolbar/base/tabbar"; -} - -group { name: "elm/toolbar/item/tabbar/item_horizontal"; - inherit: "elm/toolbar/item/tabbar"; - parts { - part { name: "bg"; - description { state: "default" 0.0; - min: 320 0; - } - description { state: "icon_text" 0.0; - inherit: "default" 0.0; - min: 320 0; - } - } - } - program { name: "icon_text,horizontal"; - signal: "elm,state,horizontal_icon_text,tabbar"; - source: "elm"; - script { - set_state(PART:"bg", "icon_text", 0.0); - } - } -} -- 2.7.4