From: Abhishek Sansanwal Date: Sat, 6 May 2017 13:01:48 +0000 (+0530) Subject: Changes to popup in UI X-Git-Tag: accepted/tizen/unified/20170508.153357^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F128124%2F2;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git Changes to popup in UI Change-Id: I3a476374c243399a58fcd0c058f8a76de6805f95 Signed-off-by: Abhishek Sansanwal --- diff --git a/res/images/bg_dimmed.#.png b/res/images/bg_dimmed.#.png new file mode 100644 index 0000000..c116ca1 Binary files /dev/null and b/res/images/bg_dimmed.#.png differ diff --git a/res/images/bg_gradient_dimmed.#.png b/res/images/bg_gradient_dimmed.#.png new file mode 100644 index 0000000..387ad8c Binary files /dev/null and b/res/images/bg_gradient_dimmed.#.png differ diff --git a/res/images/bg_list.#.png b/res/images/bg_list.#.png new file mode 100644 index 0000000..c116ca1 Binary files /dev/null and b/res/images/bg_list.#.png differ diff --git a/res/images/bg_popup.#.png b/res/images/bg_popup.#.png new file mode 100644 index 0000000..c116ca1 Binary files /dev/null and b/res/images/bg_popup.#.png differ diff --git a/res/images/bg_toast.#.png b/res/images/bg_toast.#.png new file mode 100644 index 0000000..c116ca1 Binary files /dev/null and b/res/images/bg_toast.#.png differ diff --git a/res/images/img_popup_bar_line.png b/res/images/img_popup_bar_line.png new file mode 100644 index 0000000..6769657 Binary files /dev/null and b/res/images/img_popup_bar_line.png differ diff --git a/res/images/img_popup_bar_shadow.png b/res/images/img_popup_bar_shadow.png new file mode 100644 index 0000000..4013b5a Binary files /dev/null and b/res/images/img_popup_bar_shadow.png differ diff --git a/res/layout/network.edc b/res/layout/network.edc index 59bed13..30ed559 100644 --- a/res/layout/network.edc +++ b/res/layout/network.edc @@ -53,23 +53,6 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } part { name, "padding.title"; @@ -77,7 +60,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 20; + min, 0 0; rel1.to, "area"; rel2 { to, "area"; @@ -284,7 +267,7 @@ group { state, "default" 0.0; align, 0.0 0.0; fixed, 0 1; - min, 0 64; + min, 0 50; color: 0 255 0 255; rel1 { relative, 0.0 1.0; @@ -307,7 +290,7 @@ group { align, 0.0 0.0; fixed, 0 1; color: 255 0 0 255; - min, 0 64; + min, 0 50; visible: 1; rel1 { relative, 0.525 1.0; @@ -333,23 +316,6 @@ group { visible, 0; } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } part { name, "padding.title"; @@ -357,7 +323,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 20; + min, 0 0; rel1.to, "area"; rel2 { to, "area"; @@ -409,25 +375,7 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } - - part { + /*part { name, "padding.text.content"; type, SPACER; scale, 1; @@ -442,7 +390,7 @@ group { align, 0.5 0.0; fixed, 0 1; } - } + }*/ part { name, "part.text.content"; @@ -452,11 +400,13 @@ group { state, "default" 0.0; min, 0 24; rel1 { - to, "padding.text.content"; - relative, 0.0 1.0; + to, "area";//padding.text.content"; + relative, 0.0 0.0; } - rel2.to, "padding.text.content"; - align, 0 0.0; + rel2.to, "area";//padding.text.content"; + rel2.relative, 1.0 1.0; + + align, 0.5 0.0; fixed, 0 1; color, COLOR_TEXT_POPUP; text { @@ -467,7 +417,7 @@ group { } } - part { + /*part { name, "padding.image.tv"; type, SPACER; scale, 1; @@ -485,7 +435,7 @@ group { align, 0.5 0.0; fixed, 1 1; } - } + }*/ part { name, "part.image.tv"; @@ -496,11 +446,12 @@ group { min, 96 96; max, 96 96; rel1 { - to, "padding.image.tv"; - relative, 0.0 1.0; + to, "part.text.content";//padding.image.tv"; + relative, 0.0 0.0; } - rel2.to, "padding.image.tv"; - rel2.relative, 0.0 1.0; + rel2.to, "part.text.content";//padding.image.tv"; + rel2.relative, 1.0 0.7; + align, 0.3 1.0; fixed, 1 1; visible, 1; image.normal, IC_SETTINGS_NETWORK_TV_PNG; @@ -881,16 +832,14 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 200; + min, 0 300; rel1 { - to, "part.text.content"; - relative, 0.5 1.0; - } - rel2 { - to, "part.text.content"; - relative, 0.5 1.0; + to, "part.dot3"; + relative, 0.0 1.0; } - align, 0.5 0.0; + rel2.to, "part.dot3"; + rel2.relative, 0.0 1.0; + //align, 0.5 1.0; fixed, 1 1; } } @@ -901,8 +850,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 120 40; - max, 120 40; + min, 200 50; + max, 200 50; rel1 { to, "padding.stop.btn"; relative, 0.0 1.0; @@ -911,7 +860,7 @@ group { to, "padding.stop.btn"; relative, 0.0 1.0; } - align, 0.5 0.0; + align, 0.5 1.0; visible, 1; } } @@ -974,25 +923,8 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } - part { +/* part { name, "padding.text.content"; type, SPACER; scale, 1; @@ -1008,7 +940,7 @@ group { fixed, 0 1; } } - +*/ part { name, "part.text.content"; type, TEXT; @@ -1017,10 +949,15 @@ group { state, "default" 0.0; min, 0 24; rel1 { - to, "padding.text.content"; - relative, 0.0 1.0; + to, "area";//"padding.text.content"; + relative, 0.0 0.0; } - rel2.to, "padding.text.content"; + rel2 { + to, "area";//"padding.text.content"; + relative, 1.0 1.0; + } + + //rel2.to, "area";//"padding.text.content"; align, 0 0.0; fixed, 0 1; color, COLOR_TEXT_POPUP; @@ -1032,7 +969,7 @@ group { } } - part { +/* part { name, "padding.image.tv"; type, SPACER; scale, 1; @@ -1043,15 +980,12 @@ group { to, "part.text.content"; relative, 0.35 1.0;//0.0 1.0; } - rel2 { - to, "part.text.content"; - relative, 0.35 1.0; - } + rel2.to, "part.text.content"; align, 0.5 0.0; fixed, 1 1; } } - +*/ part { name, "part.image.tv"; type, IMAGE; @@ -1061,11 +995,12 @@ group { min, 96 96; max, 96 96; rel1 { - to, "padding.image.tv"; - relative, 0.5 1.0; + to, "part.text.content";//padding.image.tv"; + relative, 0.0 0.0; } - rel2.to, "padding.image.tv"; - rel2.relative, 0.5 1.0; + rel2.to, "part.text.content";//padding.image.tv"; + rel2.relative, 1.0 0.7; + align, 0.3 1; fixed, 1 1; visible, 1; image.normal, IC_SETTINGS_NETWORK_TV_PNG; @@ -1318,8 +1253,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 270 40; - max, 270 40; + min, 270 50; + max, 270 50; rel1 { to, "padding.done.btn"; relative, 0.0 1.0; @@ -1360,8 +1295,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 270 40; - max, 270 40; + min, 270 50; + max, 270 50; rel1 { to, "padding.new.network.btn"; relative, 1.0 0.0; @@ -1399,25 +1334,7 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } - - part { + /*part { name, "padding.text.content"; type, SPACER; scale, 1; @@ -1432,7 +1349,7 @@ group { align, 0.5 0.0; fixed, 0 1; } - } + }*/ part { name, "part.text.content"; @@ -1442,11 +1359,16 @@ group { state, "default" 0.0; min, 0 24; rel1 { - to, "padding.text.content"; - relative, 0.0 1.0; + to, "area";//padding.text.content"; + relative, 0.0 0.0; } - rel2.to, "padding.text.content"; - align, 0 0.0; + rel2 { + to, "area";//padding.text.content"; + relative, 1.0 1.0; + } + + //rel2.to, "padding.text.content"; + align, 0.5 0.0; fixed, 0 1; color, COLOR_TEXT_POPUP; text { @@ -1467,10 +1389,11 @@ group { min, 0 24; rel1 { to, "part.text.content"; - relative, 0.0 1.0; + relative, 0.0 0.1; } rel2.to, "part.text.content"; - align, 0 0.1; + rel2.relative, 1.0 1.0; + align, 0.5 0.1; fixed, 0 1; color, COLOR_TEXT_POPUP; text { @@ -1482,7 +1405,7 @@ group { } } - part { + /*part { name, "padding.image.tv"; type, SPACER; scale, 1; @@ -1500,7 +1423,7 @@ group { align, 0.5 0.0; fixed, 1 1; } - } + }*/ part { name, "part.image.tv"; @@ -1511,11 +1434,12 @@ group { min, 96 96; max, 96 96; rel1 { - to, "padding.image.tv"; - relative, 0.5 1.0; + to, "part.text.content";//padding.image.tv"; + relative, 0.0 0.3; } - rel2.to, "padding.image.tv"; - rel2.relative, 0.5 1.0; + rel2.to, "part.text.content";//padding.image.tv"; + rel2.relative, 1.0 1.0; + align, 0.3 0; fixed, 1 1; visible, 1; image.normal, IC_SETTINGS_NETWORK_TV_PNG; @@ -1746,14 +1670,14 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 200; + min, 0 100; rel1 { to, "part.text.content"; - relative, 0.17 1.0; + relative, 0.15 0.0; } rel2 { to, "part.text.content"; - relative, 0.2 1.0; + relative, 0.15 1.0; } align, 0.0 0.0; fixed, 1 1; @@ -1766,8 +1690,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 200 40; - max, 200 40; + min, 245 50; + max, 245 50; rel1 { to, "padding.close.btn"; relative, 0.0 1.0; @@ -1787,7 +1711,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 105 0; + min, 130 0; rel1 { to, "part.close.btn"; relative, 1.0 0.0; @@ -1808,8 +1732,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 200 40; - max, 200 40; + min, 245 50; + max, 245 50; rel1 { to, "padding.retry.btn"; relative, 1.0 0.0; @@ -1829,7 +1753,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 335 0; + min, 382 0; rel1 { to, "part.close.btn"; relative, 1.0 0.0; @@ -1850,8 +1774,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 245 40; - max, 245 40; + min, 245 50; + max, 245 50; rel1 { to, "padding.new.network.btn"; relative, 1.0 0.0; @@ -2130,7 +2054,7 @@ group { state, "default" 0.0; align, 0.0 0.0; fixed, 0 1; - min, 0 64; + min, 0 50; color: 0 255 0 255; rel1 { relative, 0.0 1.0; @@ -2153,7 +2077,7 @@ group { align, 0.0 0.0; fixed, 0 1; color: 255 0 0 255; - min, 0 64; + min, 0 50; visible: 1; rel1 { relative, 0.525 1.0; @@ -3512,25 +3436,8 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } - part { + /*part { name, "padding.text.content"; type, SPACER; scale, 1; @@ -3545,7 +3452,7 @@ group { align, 0.5 0.0; fixed, 0 1; } - } + }*/ part { name, "part.text.content"; @@ -3555,11 +3462,14 @@ group { state, "default" 0.0; min, 0 24; rel1 { - to, "padding.text.content"; - relative, 0.0 1.0; + to, "area";//padding.text.content"; + relative, 0.0 0.0; } - rel2.to, "padding.text.content"; - align, 0 0.0; + rel2 { + to, "area";//padding.text.content"; + relative, 1.0 1.0; + } + align, 0.5 0.0; fixed, 0 1; color, COLOR_TEXT_POPUP; text { @@ -3580,10 +3490,11 @@ group { min, 0 24; rel1 { to, "part.text.content"; - relative, 0.0 1.0; + relative, 0.0 0.1; } rel2.to, "part.text.content"; - align, 0 0.1; + rel2.relative, 1.0 1.0; + align, 0.5 0.1; fixed, 0 1; color, COLOR_TEXT_POPUP; text { @@ -3595,7 +3506,7 @@ group { } } - part { +/* part { name, "padding.image.tv"; type, SPACER; scale, 1; @@ -3614,7 +3525,7 @@ group { fixed, 1 1; } } - +*/ part { name, "part.image.tv"; type, IMAGE; @@ -3624,11 +3535,12 @@ group { min, 96 96; max, 96 96; rel1 { - to, "padding.image.tv"; - relative, 0.5 1.0; + to, "part.text.content";//padding.image.tv"; + relative, 0.0 0.3; } - rel2.to, "padding.image.tv"; - rel2.relative, 0.5 1.0; + rel2.to, "part.text.content";//padding.image.tv"; + rel2.relative, 1.0 1.0; + align, 0.3 0; fixed, 1 1; visible, 1; image.normal, IC_SETTINGS_NETWORK_TV_PNG; @@ -3879,8 +3791,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 200 40; - max, 200 40; + min, 200 50; + max, 200 50; rel1 { to, "padding.close.btn"; relative, 0.0 1.0; @@ -3920,8 +3832,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 200 40; - max, 200 40; + min, 200 50; + max, 200 50; rel1 { to, "padding.retry.btn"; relative, 1.0 0.0; @@ -3957,25 +3869,7 @@ group { } } - part { - name, "part.line"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - color, 0 0 0 255; - min: 2 2; - max: -1 2; - rel1.to, "area"; - rel2 { - to, "area"; - relative, 1.0 0.0; - } - - } - } - - part { + /* part { name, "padding.text.content"; type, SPACER; scale, 1; @@ -3990,7 +3884,7 @@ group { align, 0.5 0.0; fixed, 0 1; } - } + }*/ part { name, "part.text.content"; @@ -4000,10 +3894,13 @@ group { state, "default" 0.0; min, 0 24; rel1 { - to, "padding.text.content"; - relative, 0.0 1.0; + to, "area";//"padding.text.content"; + relative, 0.0 0.0; } - rel2.to, "padding.text.content"; + rel2 { + to, "area";//"padding.text.content"; + relative, 1.0 1.0; + } align, 0 0.0; fixed, 0 1; color, COLOR_TEXT_POPUP; @@ -4015,7 +3912,7 @@ group { } } - part { +/* part { name, "padding.image.tv"; type, SPACER; scale, 1; @@ -4034,7 +3931,7 @@ group { fixed, 1 1; } } - +*/ part { name, "part.image.tv"; type, IMAGE; @@ -4043,12 +3940,13 @@ group { state, "default" 0.0; min, 96 96; max, 96 96; - rel1 { - to, "padding.image.tv"; - relative, 0.5 1.0; + rel1 { + to, "part.text.content";//padding.image.tv"; + relative, 0.0 0.0; } - rel2.to, "padding.image.tv"; - rel2.relative, 0.5 1.0; + rel2.to, "part.text.content";//padding.image.tv"; + rel2.relative, 1.0 0.7; + align, 0.3 1; fixed, 1 1; visible, 1; image.normal, IC_SETTINGS_NETWORK_TV_PNG; @@ -4279,16 +4177,16 @@ group { name, "padding.done.btn"; type, SPACER; scale, 1; - description { - state, "default" 0.0; - min, 0 200; + description { + state, "default" 0.0; + min, 0 150; rel1 { - to, "part.text.content"; - relative, 0.5 1.0; + to, "part.image.completed"; + relative, 0.0 1.0; } rel2 { - to, "part.text.content"; - relative, 0.5 1.0; + to, "part.image.completed"; + relative, 0.0 1.0; } align, 0.5 0.0; fixed, 1 1; @@ -4301,8 +4199,8 @@ group { scale, 1; description { state, "default" 0.0; - min, 200 40; - max, 200 40; + min, 200 50; + max, 200 50; rel1 { to, "padding.done.btn"; relative, 0.0 1.0; @@ -4311,7 +4209,7 @@ group { to, "padding.done.btn"; relative, 0.0 1.0; } - align, 0.5 0.0; + align, 0.4 1.0; visible, 1; } } diff --git a/res/widget/popup.edc b/res/widget/popup.edc index a0784b0..ad9cc57 100644 --- a/res/widget/popup.edc +++ b/res/widget/popup.edc @@ -42,6 +42,49 @@ #define GLIDE_EASE_OUT(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0 #define POPUP_DEFAULT_VI_INC 12 +/* default style */ + +#define POPUP_DEFAULT_WIDTH_MIN_INC 860 +#define POPUP_DEFAULT_HEIGHT_MIN_INC 468 +#define POPUP_DEFAULT_BASE_PADDING_LR_INC 70 +#define POPUP_DEFAULT_BASE_PADDING_TOP_NOTITLE_INC 72 +#define POPUP_DEFAULT_TITLE_PADDING_TOP 72 +#define POPUP_DEFAULT_TITLE_PADDING_BOTTOM 52 +#define POPUP_DEFAULT_TITLE_MIN_HEIGHT_INC 48 +#define POPUP_DEFAULT_TITLEBAR_PADDING_TOP 24 +#define POPUP_DEFAULT_TITLEBAR_WIDTH_INC 120 +#define POPUP_DEFAULT_TITLEBAR_LINE_HEIGHT_INC 3 +#define POPUP_DEFAULT_TITLEBAR_SHADOW_HEIGHT_INC 9 +#define POPUP_DEFAULT_ACTION_AREA_MIN_HEIGHT_INC 80 +#define POPUP_DEFAULT_ACTION_AREA_TITLE_PADDING_TOP 74 +#define POPUP_DEFAULT_ACTION_AREA_NOTITLE_PADDING_TOP 74 +#define POPUP_DEFAULT_BUTTON_SIZE_INC 300 80 +#define POPUP_DEFAULT_BUTTON_PADDING_INC 20 80 +#define POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC 70 +#define POPUP_DEFAULT_VI_TOP_INC 12 + +/* function style */ + +#define POPUP_FUNCTION_HEIGHT_MIN_INC 232 +#define POPUP_FUNCTION_TITLE_WIDTH_INC 226 +#define POPUP_FUNCTION_TITLE_HEIGHT_INC 32 +#define POPUP_FUNCTION_TITLE_PADDING_TOP 58 +#define POPUP_FUNCTION_CONTENT_WIDTH_INC 622 +#define POPUP_FUNCTION_CONTENT_HEIGHT_INC 152 +#define POPUP_FUNCTION_PADDING_BOTTOM 18 +#define POPUP_FUNCTION_VI_INC 12 + +/* toast style */ + +#define POPUP_TOAST_PADDING_INC 20 +#define POPUP_TOAST_BASE_MIN_WIDTH_INC 680 +#define POPUP_TOAST_BASE_MIN_HEIGHT_INC 72 +#define POPUP_TOAST_TEXT_MAX_WIDTH_INC 1800-POPUP_TOAST_PADDING_INC*2 +#define POPUP_TOAST_TEXT_MAX_HEIGHT_INC 300-POPUP_TOAST_PADDING_INC*2 + +// NOTIFY + + group { "elm/popup/base/settings"; nomouse; data.item: "hide_finished_signal" "on"; @@ -56,218 +99,996 @@ group { "elm/popup/base/settings"; } } } +/* font style */ + +styles { + style { name: "popup_default_title_style"; + base: "font=Tizen:style=Regular align=center font_size=42 color=#000 color_class=popup/STYLE_POPUP/text_title wrap=mixed ellipsis=1.0"; + tag: "tab" "\t"; + } + style { name: "popup_default_desc_style"; + base: "font=Tizen:style=Regular font_size=30 align=center color=#000 color_class=popup/STYLE_POPUP/text_content wrap=mixed"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "hilight" "+ font_weight=Bold"; + tag: "b" "+ font_weight=Bold"; + tag: "tab" "\t"; + } + style { name: "popup_function_title_style"; + base: "font=Tizen:style=Regular align=right font_size=30 color=#000 color_class=popup/function/text wrap=mixed ellipsis=1.0"; + tag: "tab" "\t"; + } + style { name: "popup_toast_style"; + base: "font=Tizen:style=Regular font_size=28 align=center color=#000 color_class=popup/toast/text wrap=mixed"; + tag: "br" "\n"; + tag: "tab" "\t"; + } + style { name: "popup_item_style"; + base: "font=Tizen:style=Regular font_size=28 align=left color=#000 color_class=popup_item/default/text wrap=mixed"; + tag: "tab" "\t"; + } + style { name: "popup_item_selected_style"; + base: "font=Tizen:style=Regular font_size=28 align=left color=#000 color_class=popup_item/default/text_selected wrap=mixed"; + tag: "tab" "\t"; + } + style { name: "popup_item_disabled_style"; + base: "font=Tizen:style=Regular font_size=28 align=left color=#000 color_class=popup_item/default/text_disabled wrap=mixed"; + tag: "tab" "\t"; + } +} + +/* default style */ + + +// NOTIFY + +group { "elm/notify/center/popup/STYLE_POPUP"; + nomouse; + + data.item: "hide_finished_signal" "on"; -// notify -group { name: "elm/notify/center/popup/style.popup"; - alias: "elm/notify/bottom/popup/style.popup"; parts { - part { name: "base"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC; - max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC; - } - description { state: "landscape" 0.0; - min: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC; - max: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC; - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - rel1.to: "base"; + spacer { "base"; + desc { "default"; + } + } + spacer { "padding_top"; + scale; + desc { "default"; + rel.to: "base"; + rel2.relative: 1.0 0.0; + align: 0.5 0.0; + fixed: 1 1; + min: 0 POPUP_DEFAULT_VI_TOP_INC*2; + } + desc { "end"; + inherit: "default"; + min: 0 0; + } + } + swallow { "elm.swallow.content"; + mouse; + scale; + clip: "clipper"; + desc { "default"; + rel1 { + to_x: "base"; + to_y: "padding_top"; + relative: 0.0 1.0; + } rel2.to: "base"; + fixed: 1 1; + min: POPUP_DEFAULT_WIDTH_MIN_INC POPUP_DEFAULT_HEIGHT_MIN_INC; + } + desc { "end"; + inherit: "default"; } } + rect { "block"; + mouse; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 0 0 0 0; + vis; + } + desc { "end"; + inherit: "default"; + hid; + } + } + rect { "clipper"; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 255 255 255 0; + } + desc { "end"; + inherit: "default"; + color: 255 255 255 255; + } + } + } + + programs { + program { "on_visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "end"; + target: "padding_top"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + } + program { "on_show_animation"; + signal: "elm,state,show,animation"; + source: "elm"; + after: "show_start"; + } + program { "on_show"; + signal: "show"; + source: ""; + after: "show_start"; + } + program { "show_start"; + action: STATE_SET "default"; + target: "padding_top"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_animation"; + } + program { "show_animation"; + action: STATE_SET "end"; + transition: EASE_IN1(0.667); + target: "padding_top"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_finished"; + } + program { "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "end"; + target: "padding_top"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_animation"; + } + program { "hide_animation"; + action: STATE_SET "default"; + transition: EASE_IN1(0.667); + target: "padding_top"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_finished"; + } + program { "hide_finished"; + action: SIGNAL_EMIT "elm,action,hide,finished" "elm"; + } } } -// popup -group { name: "elm/popup/base/style.popup"; - data { - item: "focus_highlight" "on"; - item: "default_orient" "2"; //top, center:1 bottom:2 +group { "elm/notify/direction/popup/STYLE_POPUP"; + nomouse; + + data.item: "hide_finished_signal" "on"; + + parts { + spacer { "base"; + desc { "default"; + } + } + swallow { "elm.swallow.content"; + mouse; + scale; + clip: "clipper"; + desc { "default"; + rel.to: "base"; + fixed: 1 1; + min: POPUP_DEFAULT_WIDTH_MIN_INC POPUP_DEFAULT_HEIGHT_MIN_INC; + } + desc { "end"; + inherit: "default"; + } + } + rect { "block"; + mouse; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 0 0 0 0; + vis; + } + desc { "end"; + inherit: "default"; + hid; + } + } + rect { "clipper"; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 255 255 255 0; + } + desc { "end"; + inherit: "default"; + color: 255 255 255 255; + } + } } - styles { - style { name: "popup_title_style"; - base: "font=Tizen:style=Regular align=center font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#000000 wrap=mixed ellipsis=1.0"; - tag: "br" "\n"; - tag: "tab" "\t"; + + programs { + program { "on_visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "end"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + } + program { "on_show_animation"; + signal: "elm,state,show,animation"; + source: "elm"; + after: "show_start"; + } + program { "on_show"; + signal: "show"; + source: ""; + after: "show_start"; + } + program { "show_start"; + action: STATE_SET "default"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_animation"; + } + program { "show_animation"; + action: STATE_SET "end"; + transition: EASE_IN1(0.667); + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_finished"; + } + program { "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "end"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_animation"; + } + program { "hide_animation"; + action: STATE_SET "default"; + transition: EASE_IN1(0.667); + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_finished"; + } + program { "hide_finished"; + action: SIGNAL_EMIT "elm,action,hide,finished" "elm"; } } +} + +#define NOTIFY_DEFAULT(direction, align_x, align_y) \ +group { "elm/notify/"direction"/popup/STYLE_POPUP"; \ + inherit: "elm/notify/direction/popup/STYLE_POPUP"; \ + nomouse; \ + parts { \ + swallow { "elm.swallow.content"; \ + desc { "default"; \ + align: align_x align_y; \ + } \ + } \ + } \ +} + +NOTIFY_DEFAULT( "top", 0.5, 0.0); /* "elm/notify/top/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "bottom", 0.5, 1.0); /* "elm/notify/bottom/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "left", 0.0, 0.5); /* "elm/notify/left/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "right", 1.0, 0.5); /* "elm/notify/right/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "top_left", 0.0, 0.0); /* "elm/notify/top_left/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "top_right", 1.0, 0.0); /* "elm/notify/top_right/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT( "bottom_left", 0.0, 1.0); /* "elm/notify/bottom_left/popup/STYLE_POPUP" */ +NOTIFY_DEFAULT("bottom_right", 1.0, 1.0); /* "elm/notify/bottom_right/popup/STYLE_POPUP" */ + + +group { "elm/notify/bottom/popup/function"; + nomouse; + + data.item: "hide_finished_signal" "on"; + parts { - part { name: "base"; - scale: 1; - type: SPACER; - description { state: "default" 0.0; - min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC; - max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC; - } - description { state: "landscape" 0.0; - inherit: "default" 0.0; - min: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MIN_INC; - max: POPUP_BASE_DEFAULT_BASE_LANDSCAPE_MAX_INC; + spacer { "base"; + desc { "default"; } } - part { name: "bg"; - scale: 1; - type: RECT; - description { - rel1.to: "base"; - rel2.to: "base"; + spacer { "padding_vi"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 0.0 1.0; + align: 0.5 0.0; + min: 0 POPUP_FUNCTION_VI_INC; + } + desc { "end"; + inherit: "default"; + min: 0 0; } } - part { name: "access.outline"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - fixed: 1 1; + swallow { "elm.swallow.content"; + mouse; + scale; + clip: "clipper"; + desc { "default"; + rel2 { + to_x: "base"; + to_y: "padding_vi"; + } rel1.to: "base"; - rel2.to: "base"; + align: 0.5 1.0; + fixed: 1 1; + } + desc { "end"; + inherit: "default"; + } + } + rect { "block"; + mouse; + desc { "default"; + rel.to: "elm.swallow.content"; color: 0 0 0 0; + vis; + } + desc { "end"; + inherit: "default"; + hid; + } + } + rect { "clipper"; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 255 255 255 0; + } + desc { "end"; + inherit: "default"; + color: 255 255 255 255; + } + } + } + + programs { + program { "on_visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "end"; + target: "padding_vi"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + } + program { "on_show_animation"; + signal: "elm,state,show,animation"; + source: "elm"; + after: "show_start"; + } + program { "on_show"; + signal: "show"; + source: ""; + after: "show_start"; + } + program { "show_start"; + script { + set_state(PART:"padding_vi", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"block", "default", 0.0); + run_program(PROGRAM:"show_animation"); + run_program(PROGRAM:"show_animation2"); } } - part { name: "elm.bg.title"; - type: RECT; - scale: 1; - description { state: "default" 0.0; + program { "show_animation"; + action: STATE_SET "end"; + transition: EASE_IN1(0.334); + target: "padding_vi"; + target: "elm.swallow.content"; + target: "block"; + after: "show_finished"; + } + program { "show_animation2"; + action: STATE_SET "end"; + transition: EASE_IN1(0.167); + target: "clipper"; + } + program { "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "end"; + target: "padding_vi"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_animation"; + } + program { "hide_animation"; + action: STATE_SET "default"; + transition: EASE_IN1(0.167); + target: "padding_vi"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_finished"; + } + program { "hide_finished"; + action: SIGNAL_EMIT "elm,action,hide,finished" "elm"; + } + } +} + +#define NOTIFY_FUNCTION(direction, align_x, align_y) \ +group { "elm/notify/"direction"/popup/function"; \ + alias: "elm/notify/"direction"/popup/toast"; \ + inherit: "elm/notify/"direction"/popup/STYLE_POPUP"; \ + nomouse; \ + parts { \ + swallow { "elm.swallow.content"; \ + desc { "default"; \ + min: 0 0; \ + align: align_x align_y; \ + } \ + } \ + rect { "clipper"; \ + desc { "end"; \ + color: 255 255 255 255; \ + } \ + } \ + } \ +} + +NOTIFY_FUNCTION( "center", 0.5, 0.5); /* "elm/notify/center/popup/function" */ +NOTIFY_FUNCTION( "top", 0.5, 0.0); /* "elm/notify/top/popup/function" */ +//NOTIFY_FUNCTION( "bottom", 0.5, 1.0); /* "elm/notify/bottom/popup/function" */ +NOTIFY_FUNCTION( "left", 0.0, 0.5); /* "elm/notify/left/popup/function" */ +NOTIFY_FUNCTION( "right", 1.0, 0.5); /* "elm/notify/right/popup/function" */ +NOTIFY_FUNCTION( "top_left", 0.0, 0.0); /* "elm/notify/top_left/popup/function" */ +NOTIFY_FUNCTION( "top_right", 1.0, 0.0); /* "elm/notify/top_right/popup/function" */ +NOTIFY_FUNCTION( "bottom_left", 0.0, 1.0); /* "elm/notify/bottom_left/popup/function" */ +NOTIFY_FUNCTION("bottom_right", 1.0, 1.0); /* "elm/notify/bottom_right/popup/function" */ + +group { "elm/notify/center/popup/toast"; + nomouse; + + data.item: "hide_finished_signal" "on"; + + parts { + spacer { "base"; + desc { "default"; + } + } + swallow { "elm.swallow.content"; + mouse; + scale; + clip: "clipper"; + desc { "default"; + rel.to: "base"; fixed: 1 1; + } + desc { "end"; + inherit: "default"; + } + } + rect { "block"; + mouse; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 0 0 0 0; + vis; + } + desc { "end"; + inherit: "default"; + hid; + } + } + rect { "clipper"; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 255 255 255 0; + } + desc { "end"; + inherit: "default"; + color: 255 255 255 255; + } + } + } + + programs { + program { "on_visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "end"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + } + program { "on_show_animation"; + signal: "elm,state,show,animation"; + source: "elm"; + after: "show_start"; + } + program { "on_show"; + signal: "show"; + source: ""; + after: "show_start"; + } + program { "show_start"; + action: STATE_SET "default"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_animation"; + } + program { "show_animation"; + action: STATE_SET "end"; + transition: EASY_EASE(0.334); + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "show_finished"; + } + program { "show_finished"; + action: SIGNAL_EMIT "elm,action,show,finished" ""; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "end"; + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_animation"; + } + program { "hide_animation"; + action: STATE_SET "default"; + transition: EASY_EASE(0.334); + target: "elm.swallow.content"; + target: "clipper"; + target: "block"; + after: "hide_finished"; + } + program { "hide_finished"; + action: SIGNAL_EMIT "elm,action,hide,finished" "elm"; + } + } +} + +group { "elm/notify/block_events/popup/STYLE_POPUP"; + alias: "elm/notify/block_events/default"; + nomouse; + + images { + image: "bg_dimmed.#.png" COMP; + } + + parts { + spacer { "base"; + desc { "default"; + } + } + image { "block_events_color"; + clip: "clipper_block_events_color"; + desc { "default"; + image.normal: "bg_dimmed.#.png"; + rel.to: "base"; + color_class: "popup/STYLE_POPUP/dim"; + } + } + rect { "clipper_block_events_color"; + desc { "default"; + rel.to: "block_events_color"; + color: 0 0 0 0; + } + desc { "show"; + inherit: "default"; color: 255 255 255 255; + } + } + rect { "event"; + mouse; + desc { "default"; + rel.to: "block_events_color"; + color: 0 0 0 0; + hid; + } + desc {"show"; + inherit: "default"; + vis; + } + } + } + + programs { + program { "on_visible"; + signal: "elm,state,visible"; + source: "elm"; + action: STATE_SET "show"; + target: "clipper_block_events_color"; + target: "event"; + } + program { "on_show_animation"; + signal: "elm,state,show,animation"; + source: "elm"; + after: "show_start"; + } + program { "on_show"; + signal: "show"; + source: ""; + after: "show_start"; + } + program { "show_start"; + action: STATE_SET "default"; + target: "clipper_block_events_color"; + target: "event"; + after: "show_animation"; + } + program { "show_animation"; + action: STATE_SET "show"; + transition: EASE_IN1(0.667); + target: "clipper_block_events_color"; + target: "event"; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "default"; + transition: EASE_IN1(0.667); + target: "clipper_block_events_color"; + target: "event"; + } + program { "on_clicked"; + signal: "mouse,clicked,1"; + source: "event"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + } +} + +group { "elm/notify/block_events/popup/function"; + inherit: "elm/notify/block_events/popup/STYLE_POPUP"; + + parts { + rect { "block_events_color"; + desc { "default"; + color: 0 0 0 0; + } + } + } + + program_remove: "show_animation"; + program_remove: "on_hide"; + + programs { + program { "show_animation"; + action: STATE_SET "show"; + transition: EASE_IN1(0.334); + target: "clipper_block_events_color"; + target: "event"; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "default"; + transition: EASE_IN1(0.167); + target: "clipper_block_events_color"; + target: "event"; + } + } +} + + +group { "elm/notify/block_events/popup/toast"; + inherit: "elm/notify/block_events/popup/function"; + + program_remove: "show_animation"; + program_remove: "on_hide"; + + programs { + program { "show_animation"; + action: STATE_SET "show"; + transition: EASY_EASE(0.334); + target: "clipper_block_events_color"; + target: "event"; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + action: STATE_SET "default"; + transition: EASY_EASE(0.334); + target: "clipper_block_events_color"; + target: "event"; + } + } +} + +// POPUP BASE + +group { "elm/popup/base/default"; + nomouse; + + images { + image: "bg_popup.#.png" COMP; + image: "img_popup_bar_line.png" COMP; + image: "img_popup_bar_shadow.png" COMP; + } + + data { + item: "focus_highlight" "on"; + item: "default_orient" "2"; //top, center:1 bottom:2 + item: "popup_outside_pad" "180"; + } + + parts { + spacer { "base"; + scale; + desc { "default"; + min: POPUP_DEFAULT_WIDTH_MIN_INC 0; + } + } + image { "bg"; + mouse; + desc { "default"; + rel.to: "base"; + image.normal: "bg_popup.#.png"; + color_class: "popup/STYLE_POPUP/bg"; + } + } + rect { "access.outline"; + repeat_events: 1; + desc { "default"; + fixed: 1 1; + rel.to: "base"; + color: 0 0 0 0; + } + } + rect { "elm.bg.title"; + scale; + desc { "default"; + rel.to: "base"; + rel2.relative: 1.0 0.0; align: 0.5 0.0; - min: 0 84; + min: 0 POPUP_DEFAULT_BASE_PADDING_TOP_NOTITLE_INC; + fixed: 1 1; + color: 0 0 0 0; + } + desc { "visible"; + inherit: "default" 0.0; + min: 0 (POPUP_DEFAULT_TITLE_PADDING_TOP+POPUP_DEFAULT_TITLE_MIN_HEIGHT_INC+POPUP_DEFAULT_TITLE_PADDING_BOTTOM); + } + } + spacer { "padding_title_top_left"; + scale; + desc { "default"; + rel.to: "elm.bg.title"; + align: 0.0 0.0; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_TITLE_PADDING_TOP; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_TITLE_PADDING_TOP; + fixed: 1 1; + } + } + spacer { "padding_title_bottom_right"; + scale; + desc { "default"; + rel.to: "elm.bg.title"; + align: 1.0 1.0; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_TITLE_PADDING_BOTTOM; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_TITLE_PADDING_BOTTOM; + fixed: 1 1; + } + } + textblock { "elm.text.title"; + scale; + desc { "default"; rel1 { - relative: 0.0 0.0; - to: "base"; - offset: 9 6; + to: "padding_title_top_left"; + relative: 1.0 1.0; } rel2 { - relative: 1.0 0.0; - to: "base"; - offset: -10 6; + to: "padding_title_bottom_right"; + relative: 0.0 0.0; } - visible: 0; + fixed: 1 1; + text.style: "popup_default_title_style"; } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; + } + rect { "access.title"; + repeat_events: 1; + desc { "default"; + rel.to: "elm.bg.title"; + color: 0 0 0 0; } } - part { name: "elm.text.title"; - type: TEXTBLOCK; - scale:1; - description { state: "default" 0.0; + spacer { "padding_title_bar_top"; + scale; + desc { "default"; + rel.to: "elm.text.title"; + rel1.relative: 0.0 1.0; + align: 0.5 0.0; + min: 0 POPUP_DEFAULT_TITLEBAR_PADDING_TOP; + min: 0 POPUP_DEFAULT_TITLEBAR_PADDING_TOP; fixed: 1 1; - text { - style: "popup_title_style"; - size: POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC; - } - rel1.to: "elm.bg.title"; - rel2.to: "elm.bg.title"; } } - part { name: "access.title"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - rel1.to: "elm.bg.title"; - rel2.to: "elm.bg.title"; + image { "title_bar_line"; + scale; + desc { "default"; + image.normal: "img_popup_bar_line.png"; + color_class: "popup/STYLE_POPUP/title_bar_line"; + color: 0 0 0 0; + rel.to: "padding_title_bar_top"; + rel1.relative: 0.0 1.0; + align: 0.5 0.0; + min: POPUP_DEFAULT_TITLEBAR_WIDTH_INC POPUP_DEFAULT_TITLEBAR_LINE_HEIGHT_INC; + max: POPUP_DEFAULT_TITLEBAR_WIDTH_INC POPUP_DEFAULT_TITLEBAR_LINE_HEIGHT_INC; + fixed: 1 1; + } + desc { "visible"; + inherit: "default"; + color: 255 255 255 255; + } + } + image { "title_bar_shadow"; + scale; + desc { "default"; + image.normal: "img_popup_bar_shadow.png"; + color_class: "popup/STYLE_POPUP/title_bar_shadow"; color: 0 0 0 0; + rel.to: "title_bar_line"; + rel1.relative: 0.0 1.0; + align: 0.5 0.0; + min: POPUP_DEFAULT_TITLEBAR_WIDTH_INC POPUP_DEFAULT_TITLEBAR_SHADOW_HEIGHT_INC; + max: POPUP_DEFAULT_TITLEBAR_WIDTH_INC POPUP_DEFAULT_TITLEBAR_SHADOW_HEIGHT_INC; + fixed: 1 1; + } + desc { "visible"; + inherit: "default"; + color: 255 255 255 255; } } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + spacer { "padding_content_left"; + scale; + desc { "default"; + rel.to: "base"; + align: 0.0 0.5; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC 0; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC 0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; - } - description { state: "show_title_area" 0.0; - inherit: "default" 0.0; - rel1 { - relative: 0.0 1.0; - to_x: "base"; - to_y: "elm.bg.title"; - } - rel2.to: "base"; } - description { state: "show_action_area" 0.0; - inherit: "default" 0.0; - rel1.to: "base"; - rel2 { - relative: 1.0 0.0; - to_x: "base"; - to_y: "elm.swallow.action_area.bg"; - } + } + spacer { "padding_content_right"; + scale; + desc { "default"; + rel.to: "base"; + align: 1.0 0.5; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC 0; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC 0; + fixed: 1 1; } - description { state: "show_action_title_area" 0.0; - inherit: "default" 0.0; + } + swallow { "elm.swallow.content"; + mouse; + scale; + desc { "default"; rel1 { - relative: 0.0 1.0; - to_x: "base"; + to_x: "padding_content_left"; to_y: "elm.bg.title"; + relative: 1.0 1.0; } rel2 { - relative: 1.0 0.0; - to_x: "base"; + to_x: "padding_content_right"; to_y: "elm.swallow.action_area.bg"; + relative: 0.0 0.0; } + fixed: 1 0; } } - part { name: "access.body"; - type: RECT; + rect { "access.body"; repeat_events: 1; - description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + desc { "default"; + rel.to: "elm.swallow.content"; color: 0 0 0 0; } } - part { name: "elm.swallow.action_area.bg"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - fixed : 1 1; + rect { "elm.swallow.action_area.bg"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 0.0 1.0; align: 0.5 1.0; - visible: 0; - rel1 { - relative: 0.0 1.0; - to: "base"; - } - rel2.to: "base"; + min: 0 POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC; + fixed : 1 1; + color: 0 0 0 0; + } + desc { "show_action_area"; + inherit: "default" 0.0; + min: 0 (POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC+POPUP_DEFAULT_ACTION_AREA_MIN_HEIGHT_INC+POPUP_DEFAULT_ACTION_AREA_NOTITLE_PADDING_TOP); } - description { state: "visible" 0.0; + desc { "show_action_title_area"; inherit: "default" 0.0; - min: POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC; + min: 0 (POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC+POPUP_DEFAULT_ACTION_AREA_MIN_HEIGHT_INC+POPUP_DEFAULT_ACTION_AREA_TITLE_PADDING_TOP); + } + } + spacer { "padding_action_area_top_left"; + scale; + desc { "default"; + rel.to: "elm.swallow.action_area.bg"; + rel2.relative: 0.0 0.0; + align: 0.0 0.0; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_ACTION_AREA_NOTITLE_PADDING_TOP; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_ACTION_AREA_NOTITLE_PADDING_TOP; + fixed: 1 1; + } + desc { "show_action_title_area"; + inherit: "default"; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_ACTION_AREA_TITLE_PADDING_TOP; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_ACTION_AREA_TITLE_PADDING_TOP; + } + } + spacer { "padding_action_area_bottom_right"; + scale; + desc { "default"; + rel.to: "elm.swallow.action_area.bg"; + rel1.relative: 1.0 1.0; + align: 1.0 1.0; + min: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC; + max: POPUP_DEFAULT_BASE_PADDING_LR_INC POPUP_DEFAULT_BASE_PADDING_BOTTOM_INC; + fixed: 1 1; } } - part { name: "elm.swallow.action_area"; - type: SWALLOW; - scale : 1; - description { state: "default" 0.0; - rel1.to: "elm.swallow.action_area.bg"; - rel2.to: "elm.swallow.action_area.bg"; + swallow { "elm.swallow.action_area"; + mouse; + desc { "default"; + rel1 { + to: "padding_action_area_top_left"; + relative: 1.0 1.0; + } + rel2 { + to: "padding_action_area_bottom_right"; + relative: 0.0 0.0; + } } } } + programs { - program { name: show_title_area; + program { "show_title_area"; signal: "elm,state,title_area,visible"; source: "elm"; script { new st[31]; new Float:vl; get_state(PART:"elm.swallow.action_area.bg", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); - else - set_state(PART:"elm.swallow.content", "show_title_area", 0.0); + if (!strcmp(st, "show_action_area")) { + set_state(PART:"elm.swallow.action_area.bg", "show_action_title_area", 0.0); + set_state(PART:"padding_action_area_top_left", "show_action_title_area", 0.0); + } set_state(PART:"elm.bg.title", "visible", 0.0); + set_state(PART:"title_bar_line", "visible", 0.0); + set_state(PART:"title_bar_shadow", "visible", 0.0); } } - program { name: hide_title_area; + program { "hide_title_area"; signal: "elm,state,title_area,hidden"; source: "elm"; action: STATE_SET "default" 0.0; @@ -275,71 +1096,77 @@ group { name: "elm/popup/base/style.popup"; new st[31]; new Float:vl; get_state(PART:"elm.swallow.action_area.bg", st, 30, vl); - if ((!strcmp(st, "visible")) || (!strcmp(st, "landscape_visible"))) - set_state(PART:"elm.swallow.content", "show_action_area", 0.0); - else - set_state(PART:"elm.swallow.content", "default", 0.0); + if (!strcmp(st, "show_action_title_area")) + set_state(PART:"elm.swallow.action_area.bg", "show_action_area", 0.0); set_state(PART:"elm.bg.title", "default", 0.0); + set_state(PART:"padding_action_area_top_left", "default", 0.0); + set_state(PART:"title_bar_line", "default", 0.0); + set_state(PART:"title_bar_shadow", "default", 0.0); } } - program { name: show_action_area; + program { "show_action_area"; signal: "elm,state,action_area,visible"; source: "elm"; script { new st[31]; new Float:vl; get_state(PART:"elm.bg.title", st, 30, vl); - if ((!strcmp(st, "visible"))) - set_state(PART:"elm.swallow.content", "show_action_title_area", 0.0); + if (!strcmp(st, "visible")) { + set_state(PART:"elm.swallow.action_area.bg", "show_action_title_area", 0.0); + set_state(PART:"padding_action_area_top_left", "show_action_title_area", 0.0); + } else - set_state(PART:"elm.swallow.content", "show_action_area", 0.0); - set_state(PART:"elm.swallow.action_area.bg", "visible", 0.0); + set_state(PART:"elm.swallow.action_area.bg", "show_action_area", 0.0); } } - program { name: hide_action_area; + program { "hide_action_area"; signal: "elm,state,action_area,hidden"; source: "elm"; action: STATE_SET "default" 0.0; script { - new st[31]; - new Float:vl; - get_state(PART:"elm.bg.title", st, 30, vl); - if ((!strcmp(st, "visible"))) - set_state(PART:"elm.swallow.content", "show_title_area", 0.0); - else - set_state(PART:"elm.swallow.content", "default", 0.0); set_state(PART:"elm.swallow.action_area.bg", "default", 0.0); + set_state(PART:"padding_action_area_top_left", "default", 0.0); } } - program { name: "change_to_landscape"; + program { "on_show"; + signal: "show"; + source: ""; + } + program { "on_hide"; + signal: "elm,state,hide"; + source: "elm"; + } + + + program { "change_to_landscape"; action: STATE_SET "landscape" 0.0; target: "base"; after: "orientation_change"; } - program { name: "orientation_change"; + program { "orientation_change"; action: SIGNAL_EMIT "elm,state,orientation,changed" ""; } - program { name: "change_to_portrait"; + program { "change_to_portrait"; action: STATE_SET "default" 0.0; target: "base"; after: "orientation_change"; } - program { name: "landscape_mode"; + program { "landscape_mode"; source: "elm"; signal: "elm,state,orient,90"; after: "change_to_landscape"; } - program { name: "landscape_mode2"; + program { "landscape_mode2"; source: "elm"; signal: "elm,state,orient,270"; after: "change_to_landscape"; } - program { name: "portrait_mode"; + program { "portrait_mode"; source: "elm"; signal: "elm,state,orient,0"; after: "change_to_portrait"; } - program { name: "portrait_mode2"; + program { "portrait_mode2"; source: "elm"; signal: "elm,state,orient,180"; after: "change_to_portrait"; @@ -347,37 +1174,236 @@ group { name: "elm/popup/base/style.popup"; } } +group { "elm/popup/base/function"; + nomouse; + + images { + image: "bg_gradient_dimmed.#.png" COMP; + } + + data { + item: "focus_highlight" "on"; + item: "default_orient" "2"; + } + + parts { + spacer { "base"; + scale; + desc { "default"; + min: 0 POPUP_FUNCTION_HEIGHT_MIN_INC; + } + } + image { "bg"; + desc { "default"; + rel.to: "base"; + image.normal: "bg_gradient_dimmed.#.png"; + color_class: "popup/function/dim"; + } + } + rect { "access.outline"; + repeat_events: 1; + desc { "default"; + fixed: 1 1; + rel.to: "base"; + color: 0 0 0 0; + } + } + spacer { "padding_bottom"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + min: 0 POPUP_FUNCTION_PADDING_BOTTOM; + max: 0 POPUP_FUNCTION_PADDING_BOTTOM; + fixed: 1 1; + } + } + spacer { "base_area"; + scale; + desc { "default"; + rel.to_x: "base"; + rel.to_y: "padding_bottom"; + rel2.relative: 1.0 0.0; + align: 0.5 1.0; + min: POPUP_FUNCTION_TITLE_WIDTH_INC+POPUP_FUNCTION_CONTENT_WIDTH_INC POPUP_FUNCTION_CONTENT_HEIGHT_INC; + max: POPUP_FUNCTION_TITLE_WIDTH_INC+POPUP_FUNCTION_CONTENT_WIDTH_INC POPUP_FUNCTION_CONTENT_HEIGHT_INC; + fixed: 1 1; + } + } + spacer { "title_area"; + scale; + desc { "default"; + rel.to: "base_area"; + align: 0.0 0.5; + min: POPUP_FUNCTION_TITLE_WIDTH_INC 0; + max: POPUP_FUNCTION_TITLE_WIDTH_INC -1; + fixed: 1 1; + } + } + spacer { "padding_title_top"; + scale; + desc { "default"; + rel.to: "title_area"; + rel2.relative: 1.0 0.0; + align: 0.5 0.0; + min: 0 POPUP_FUNCTION_TITLE_PADDING_TOP; + max: 0 POPUP_FUNCTION_TITLE_PADDING_TOP; + fixed: 1 1; + } + } + spacer { "elm.bg.title"; + scale; + desc { "default"; + rel1 { + to_x: "title_area"; + to_y: "padding_title_top"; + relative: 0.0 1.0; + } + rel2 { + to_x: "title_area"; + to_y: "padding_title_top"; + relative: 1.0 1.0; + } + align: 1.0 0.0; + min: POPUP_FUNCTION_TITLE_WIDTH_INC POPUP_FUNCTION_TITLE_HEIGHT_INC; + fixed: 1 1; + } + } + textblock { "elm.text.title"; + scale; + desc { "default"; + rel.to: "elm.bg.title"; + fixed: 1 1; + text.style: "popup_function_title_style"; + } + } + rect { "access.title"; + repeat_events: 1; + desc { "default"; + rel.to: "elm.bg.title"; + color: 0 0 0 0; + } + } + swallow { "elm.swallow.content"; + mouse; + scale; + desc { "default"; + rel1 { + to_x: "title_area"; + to_y: "base_area"; + relative: 1.0 0.0; + } + rel2.to: "base_area"; + fixed: 1 1; + } + } + rect { "access.body"; + repeat_events: 1; + desc { "default"; + rel.to: "elm.swallow.content"; + color: 0 0 0 0; + } + } + } +} + +group { "elm/popup/base/toast"; + nomouse; + + images { + image: "bg_toast.#.png" COMP; + } + + data { + item: "focus_highlight" "on"; + item: "default_orient" "1"; //top, center:1 bottom:2 + } + + parts { + spacer { "base"; + scale; + desc { "default"; + min: POPUP_TOAST_BASE_MIN_WIDTH_INC POPUP_TOAST_BASE_MIN_HEIGHT_INC; + } + } + image { "bg"; + desc { "default"; + rel.to: "base"; + image.normal: "bg_toast.#.png"; + color_class: "popup/toast/bg"; + } + } + spacer { "padding_top_left"; + scale; + desc { "default"; + rel.to: "base"; + rel2.relative: 0.0 0.0; + align: 0.0 0.0; + min: POPUP_TOAST_PADDING_INC POPUP_TOAST_PADDING_INC; + max: POPUP_TOAST_PADDING_INC POPUP_TOAST_PADDING_INC; + fixed: 1 1; + } + } + spacer { "padding_bottom_right"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 1.0 1.0; + align: 1.0 1.0; + min: POPUP_TOAST_PADDING_INC POPUP_TOAST_PADDING_INC; + max: POPUP_TOAST_PADDING_INC POPUP_TOAST_PADDING_INC; + fixed: 1 1; + } + } + swallow { "elm.swallow.content"; + desc { "default"; + rel1.to: "padding_top_left"; + rel1.relative: 1.0 1.0; + rel2.to: "padding_bottom_right"; + rel2.relative: 0.0 0.0; + } + } + } +} + // content -group { name: "elm/popup/content/style.popup"; +group { "elm/popup/content/popup/STYLE_POPUP"; parts{ - part { name:"elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content"; + desc { "default"; + min: (POPUP_DEFAULT_WIDTH_MIN_INC-POPUP_DEFAULT_BASE_PADDING_LR_INC*2) 0; } } } } -// label -group { name: "elm/label/base/popup/style.popup"; - styles { - style { name: "textblock_style"; - base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color=#000000 wrap=mixed"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "hilight" "+ font_weight=Bold"; - tag: "b" "+ font_weight=Bold"; - tag: "tab" "\t"; +group { "elm/popup/content/popup/function"; + parts{ + swallow { "elm.swallow.content"; + desc { "default"; + } + } + } +} + +group { "elm/popup/content/popup/toast"; + parts{ + swallow { "elm.swallow.content"; + desc { "default"; + } } } +} + +// label +group { "elm/label/base/popup/STYLE_POPUP"; parts { - part { name: "elm.text"; - type: TEXTBLOCK; - scale: 1; - description { state: "default" 0.0; + textblock { "elm.text"; + scale; + desc { "default"; text { - style: "textblock_style"; + style: "popup_default_desc_style"; min: 0 1; } } @@ -385,30 +1411,42 @@ group { name: "elm/label/base/popup/style.popup"; } } +group { "elm/label/base/popup/toast"; + parts { + textblock { "elm.text"; + scale; + desc { "default"; + min: POPUP_TOAST_BASE_MIN_WIDTH_INC-POPUP_TOAST_PADDING_INC*2 POPUP_TOAST_BASE_MIN_HEIGHT_INC-POPUP_TOAST_PADDING_INC*2; + max: POPUP_TOAST_TEXT_MAX_WIDTH_INC POPUP_TOAST_TEXT_MAX_HEIGHT_INC; + text { + style: "popup_toast_style"; + min: 1 1; + } + } + } + } +} + // button -group { name: "elm/popup/buttons1/popup/style.popup"; - data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT; +group { "elm/popup/buttons1/popup/STYLE_POPUP"; parts{ - part{ name:"elm.swallow.content.button1"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content.button1"; + scale; + desc { "default"; fixed: 1 1; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; } } } } -group { name: "elm/popup/buttons2/popup/style.popup"; - data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT; +group { "elm/popup/buttons2/popup/STYLE_POPUP"; parts{ - part { name:"elm.swallow.content.button1"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content.button1"; + scale; + desc { state: "default" 0.0; fixed: 0 1; rel1 { relative: 0.0 0.5; @@ -419,23 +1457,21 @@ group { name: "elm/popup/buttons2/popup/style.popup"; to: "pad"; } align: 1.0 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; } } - part { name: "pad"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; + spacer { "pad"; + scale; + desc { "default"; fixed: 1 1; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - min: POPUP_BUTTON_PADDING_SIZE; + min: POPUP_DEFAULT_BUTTON_PADDING_INC; } } - part{ name:"elm.swallow.content.button2"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content.button2"; + scale; + desc { "default"; fixed: 0 1; rel1 { relative: 1.0 0.5; @@ -446,19 +1482,17 @@ group { name: "elm/popup/buttons2/popup/style.popup"; to: "pad"; } align: 0.0 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; } } } } -group { name: "elm/popup/buttons3/popup/style.popup"; - data.item: "action_area_height" POPUP_BUTTON_DEFAULT_ACTION_AREA_HEIGHT; - parts{ - part { name:"elm.swallow.content.button1"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; +group { "elm/popup/buttons3/popup/STYLE_POPUP"; + parts { + swallow { "elm.swallow.content.button1"; + scale; + desc { "default"; fixed: 1 1; rel1 { relative: 0.0 0.5; @@ -469,13 +1503,12 @@ group { name: "elm/popup/buttons3/popup/style.popup"; to: "pad.left"; } align: 1.0 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; } } - part { name: "pad.left"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; + spacer { "pad.left"; + scale; + desc { "default"; fixed: 1 1; rel1 { relative: 0.0 0.5; @@ -486,23 +1519,21 @@ group { name: "elm/popup/buttons3/popup/style.popup"; to: "elm.swallow.content.button2"; } align: 1.0 0.5; - min: POPUP_BUTTON_PADDING_SIZE; + min: POPUP_DEFAULT_BUTTON_PADDING_INC; } } - part{ name:"elm.swallow.content.button2"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content.button2"; + scale; + desc { "default"; fixed: 1 1; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; } } - part { name: "pad.right"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; + spacer { "pad.right"; + scale; + desc { "default"; fixed: 1 1; rel1 { relative: 1.0 0.5; @@ -513,13 +1544,12 @@ group { name: "elm/popup/buttons3/popup/style.popup"; to: "elm.swallow.content.button2"; } align: 0.0 0.5; - min: POPUP_BUTTON_PADDING_SIZE; + min: POPUP_DEFAULT_BUTTON_PADDING_INC; } } - part{ name:"elm.swallow.content.button3"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; + swallow { "elm.swallow.content.button3"; + scale; + desc { "default"; fixed: 1 1; rel1 { relative: 1.0 0.5; @@ -530,8 +1560,215 @@ group { name: "elm/popup/buttons3/popup/style.popup"; to: "pad.right"; } align: 0.0 0.5; - min: POPUP_BUTTON_MIN_SIZE; + min: POPUP_DEFAULT_BUTTON_SIZE_INC; + } + } + } +} + +group { "elm/popup/item/popup/STYLE_POPUP"; + + images { + image: "bg_list.#.png" COMP; + } + + parts { + spacer { "base"; + scale; + desc { "default"; + min: 670 114; + } + } + image { "bg"; + desc { "default"; + rel.to: "base"; + image.normal: "bg_list.#.png"; + color_class: "popup_item/default/bg"; + } + desc { "clicked"; + inherit: "default"; + color_class: "popup_item/default/bg_selected"; + } + desc { "disabled"; + inherit: "default"; + color_class: "popup_item/default/bg_disabled"; + } + } + spacer { "padding_left"; + scale; + desc { "default"; + rel.to: "base"; + rel2.relative: 0.0 1.0; + align: 0.0 0.5; + min: 42 0; + fixed: 1 1; + } + } + spacer { "padding_right"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 1.0 0.0; + align: 1.0 0.5; + min: 42 0; + fixed: 1 1; + } + } + spacer { "padding_text_top"; + scale; + desc { "default"; + rel.to: "base"; + rel2.relative: 1.0 0.0; + align: 0.5 0.0; + min: 0 44; + fixed: 1 1; + } + } + spacer { "padding_text_bottom"; + scale; + desc { "default"; + rel.to: "base"; + rel1.relative: 0.0 1.0; + align: 0.5 1.0; + min: 0 38; + fixed: 1 1; + } + } + swallow { "elm.swallow.content"; + desc { "default"; + rel1 { + to_x: "padding_left"; + to_y: "base"; + relative: 1.0 0.5; + } + rel2 { + to_x: "padding_left"; + to_y: "base"; + relative: 1.0 0.5; + } + align: 0.0 0.5; + min: 38 38; + } + } + spacer { "padding_icon_right"; + scale; + desc { "default"; + rel.to: "elm.swallow.content"; + rel1.relative: 1.0 0.5; + rel2.relative: 1.0 0.5; + align: 0.0 0.5; + min: 32 0; + fixed: 1 1; + } + } + spacer { "elm.bg.text"; + desc { "default"; + rel1 { + to_x: "padding_left"; + to_y: "padding_text_top"; + relative: 1.0 1.0; + } + rel2 { + to_x: "padding_right"; + to_y: "padding_text_bottom"; + relative: 0.0 0.0; + } + align: 0.0 0.5; + } + desc { "visible_icon"; + inherit: "default"; + rel1.to_x: "padding_icon_right"; + } + } + textblock { "elm.text"; + desc { "default"; + rel.to: "elm.bg.text"; + text.style: "popup_item_style"; + text.min: 0 1; + } + desc { "clicked"; + inherit: "default"; + text.style: "popup_item_selected_style"; + } + desc { "disabled"; + inherit: "default"; + text.style: "popup_item_disabled_style"; + } + } + rect { "event"; + mouse; + norepeat; + desc { "default"; + rel.to: "base"; + color: 0 0 0 0; + } + } + } + + script { + public is_disabled = 0; + } + + programs { + program { "on_clicked"; + signal: "mouse,clicked,1"; + source: "event"; + script { + if (get_int(is_disabled) == 0) { + emit("elm,action,click", ""); + } + } + } + program { "visible_icon"; + signal: "elm,state,item,icon,visible"; + source: "elm"; + action: STATE_SET "visible_icon"; + target: "elm.bg.text"; + } + program { "hidden_icon"; + signal: "elm,state,item,icon,hidden"; + source: "elm"; + action: STATE_SET "default"; + target: "elm.bg.text"; + } + program { "on_pressed"; + signal: "mouse,down,1"; + source: "event"; + script { + if (get_int(is_disabled) == 0) { + set_state(PART:"bg", "clicked", 0.0); + set_state(PART:"elm.text", "clicked", 0.0); + } + } + } + program { "on_unpressed"; + signal: "mouse,up,1"; + source: "event"; + script { + if (get_int(is_disabled) == 0) { + set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); + } + } + } + program { "on_disabled"; + signal: "elm,state,item,disabled"; + source: "elm"; + script { + set_int(is_disabled, 1); + set_state(PART:"bg", "disabled", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { "on_enabled"; + signal: "elm,state,item,enabled"; + source: "elm"; + script { + set_int(is_disabled, 0); + set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); } } } +} diff --git a/src/data/system/data_wired.c b/src/data/system/data_wired.c index d58f76c..bab2903 100755 --- a/src/data/system/data_wired.c +++ b/src/data/system/data_wired.c @@ -158,6 +158,7 @@ bool update_ethernet_profile_manual(struct _connection_data *data) profile = data->profile; conn = data->conn; + _DBG("DNS Address : [%s]", data->wired_dns); /* Set network type as STATIC */ rv = connection_profile_set_ip_config_type(profile, @@ -166,6 +167,13 @@ bool update_ethernet_profile_manual(struct _connection_data *data) _ERR("Failed to update profile [%d]", rv); return false; } + /* Set network type as STATIC */ + rv = connection_profile_set_dns_config_type(profile, + CONNECTION_ADDRESS_FAMILY_IPV4, CONNECTION_DNS_CONFIG_TYPE_STATIC); + if (rv != CONNECTION_ERROR_NONE) { + _ERR("Failed to update profile [%d]", rv); + return false; + } /* Set IP address */ address = data->wired_ip_address; diff --git a/src/grid/grid_wireless.c b/src/grid/grid_wireless.c index 8f56f4b..b5aca8a 100644 --- a/src/grid/grid_wireless.c +++ b/src/grid/grid_wireless.c @@ -23,7 +23,7 @@ #include "grid/grid_wireless.h" #include "layout/network.h" -#define WIFI_LIST_ITEM_X 300 +#define WIFI_LIST_ITEM_X 275 #define WIFI_LIST_ITEM_Y 35 //#define WIFI_LIST_ITEM_X ((488 + 26) / 2) //#define WIFI_LIST_ITEM_Y ((134 + 26) / 2) diff --git a/src/view/network/view_wireless.c b/src/view/network/view_wireless.c index f9b0d32..63b0fa8 100644 --- a/src/view/network/view_wireless.c +++ b/src/view/network/view_wireless.c @@ -131,7 +131,7 @@ static Evas_Object *_create(Evas_Object *win, void *data) elm_object_part_text_set(ly, "part.text.content1", "No network Connection."); elm_object_part_text_set(ly, "part.text.content2", "Please check your network."); - elm_object_part_text_set(ly, "part.text.content3", "Do you want to retry searching network."); + elm_object_part_text_set(ly, "part.text.content3", "Do you want to retry searching network ?"); //elm_object_content_set(_content_network_popup, ly); diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index 357dd93..c7ccdce 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -243,7 +243,7 @@ static void _set_result(struct _priv *priv, int id) } /* Store updated profile info */ - if (priv->ip_menu == 0) + if (priv->ip_menu == 0 && priv->dns_menu == 0) priv->conn->network_type = WIRED_TYPE_AUTOMATIC; else priv->conn->network_type = WIRED_TYPE_MANUAL; @@ -260,6 +260,7 @@ static void _set_result(struct _priv *priv, int id) /* TODO: Update result data from user input here */ _update_profile_from_input_data(priv); + _DBG("DNS Address : [%s]", priv->conn->wired_dns); break; }