From: sumanth Date: Tue, 13 Sep 2011 19:19:42 +0000 (+0900) Subject: [datefield.edc] Separator text parts are added. Review comments are corrected. Datefi... X-Git-Tag: 2.0_alpha~549 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c26e44fb2eaa25a9bb2c551eb9a93d32aa5454cd;p=framework%2Fuifw%2Fefl-theme-tizen.git [datefield.edc] Separator text parts are added. Review comments are corrected. Datefield widget is redesigned with ICU integration. Change-Id: I5aa9fb88994fe8d5cd89b9170bf77c469f031ec6 --- diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc index 4d9bb71..0544428 100644 --- a/themes/groups/ctxpopup.edc +++ b/themes/groups/ctxpopup.edc @@ -2884,8 +2884,10 @@ group { #define CTXPOPUP_TP_FONT_SIZE 24 /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/base/extended/timepicker"; - alias:"elm/ctxpopup/base/extended/timepicker/default"; + name: "elm/ctxpopup/base/datefield/default"; + alias: "elm/ctxpopup/base/datefield/calendar"; + alias: "elm/ctxpopup/base/datefield/clk_default"; + alias: "elm/ctxpopup/base/extended/timepicker"; parts { part { name: "ctxpopup_frame"; @@ -3054,8 +3056,10 @@ group { } } /////////////////////////////////////////////////////////////////////////////// -group { name: "elm/ctxpopup/arrow/extended/timepicker"; - alias: "elm/ctxpopup/arrow/extended/timepicker/default"; +group { name: "elm/ctxpopup/arrow/datefield/default"; + alias: "elm/ctxpopup/arrow/datefield/calendar"; + alias: "elm/ctxpopup/arrow/datefield/clk_default"; + alias: "elm/ctxpopup/arrow/extended/timepicker"; images { image: "timepicker_left_arrow.png" COMP; image: "timepicker_right_arrow.png" COMP; @@ -3150,8 +3154,10 @@ group { name: "elm/ctxpopup/arrow/extended/timepicker"; } /////////////////////////////////////////////////////////////////////////////// group { - name: "elm/ctxpopup/text_style_item/extended/timepicker"; - alias: "elm/ctxpopup/text_style_item/extended/timepicker/default"; + name: "elm/ctxpopup/text_style_item/datefield/default"; + alias: "elm/ctxpopup/text_style_item/datefield/calendar"; + alias: "elm/ctxpopup/text_style_item/datefield/clk_default"; + alias: "elm/ctxpopup/text_style_item/extended/timepicker"; parts { part { name: "left_padding"; diff --git a/themes/groups/datefield.edc b/themes/groups/datefield.edc index 81e9a41..d425628 100644 --- a/themes/groups/datefield.edc +++ b/themes/groups/datefield.edc @@ -22,22 +22,201 @@ */ images { - image: "00_picker_panel_bg.png" COMP; - image: "00_timepicker_field_bg.png" COMP; - image: "00_timepicker_field_bg_focus.png" COMP; - image: "00_timepicker_colon.png" COMP; - image: "00_timepicker_number_bg.png" COMP; - image: "00_timepicker_tail.png" COMP; + image: "00_button_01_normal.png" COMP; } -/////// time and date mode //////// -group { - name: "elm/datefield/dateandtime/default"; - alias: "elm/datefield/base/default"; +#define ITEM(_pos,_after) \ + part {\ + name: "item"#_pos".bg";\ + scale: 1;\ + mouse_events: 0;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + fixed: 1 1;\ + rel1 { to: "item"#_pos; relative: 0.0 0.0; }\ + rel2 { to: "item"#_pos; relative: 1.0 1.0; }\ + image {\ + normal: "00_button_01_normal.png";\ + border: 3 3 3 3;\ + border_scale: 1;\ + }\ + }\ + description { state: "visible" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATEFIELD_ITEM_BG_SIZE_INC;\ + max: DATEFIELD_ITEM_BG_SIZE_INC;\ + }\ + }\ + part {\ + name: "item"#_pos; \ + type: TEXT; \ + scale: 1;\ + mouse_events: 0;\ + clip_to: "clipper";\ + description { state: "default" 0.0; \ + visible: 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 { relative: 1.0 0.0; to: "separator"#_pos; }\ + rel2 { relative: 1.0 1.0; to: "separator"#_pos; }\ + color: DATEFIELD_TEXT_NORMAL_COLOR_INC;\ + text {\ + font: "SLP:style=Roman";\ + size: DATEFIELD_TEXT_FONT_SIZE_INC;\ + min: 1 0;\ + align: 0.5 0.5;\ + }\ + }\ + description { state: "visible" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATEFIELD_ITEM_MIN_SIZE_INC;\ + }\ + description { state: "focused" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: DATEFIELD_ITEM_MIN_SIZE_INC;\ + color: DATEFIELD_TEXT_SELECTED_COLOR_INC;\ + }\ + }\ + part {\ + name: "item"#_pos".over";\ + type: RECT;\ + scale: 1;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + fixed: 1 1;\ + rel1 { relative: 0.5 0.0; to: "separator"#_pos; }\ + rel2 { relative: 0.5 1.0; to: "separator"#_pos; }\ + align: 0.5 0.5;\ + color: 0 0 0 0;\ + }\ + description { state: "visible" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + rel1 { relative: 0.6 0.0; to: "separator"#_pos; }\ + rel2 { relative: 0.4 1.0; to: "separator"#_after; }\ + }\ + }\ + programs{\ + program {\ + name: "item_"#_pos"focused";\ + signal: "item"#_pos",focus,in";\ + source: "elm";\ + action: STATE_SET "focused" 0.0;\ + target: "item"#_pos;\ + }\ + program {\ + name: "item_"#_pos"unfocused";\ + signal: "item"#_pos",focus,out";\ + source: "elm";\ + action: STATE_SET "visible" 0.0;\ + target: "item"#_pos;\ + }\ + program {\ + name: "item_"#_pos"enabled";\ + signal: "item"#_pos",enable";\ + source: "elm";\ + action: STATE_SET "visible" 0.0;\ + target: "item"#_pos;\ + target: "item"#_pos".over";\ + }\ + program {\ + name: "item_"#_pos"disabled";\ + signal: "item"#_pos",disable";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "item"#_pos;\ + target: "item"#_pos".over";\ + target: "item"#_pos".bg";\ + }\ + program {\ + name: "item_"#_pos"isampm";\ + signal: "item"#_pos",style,ampm";\ + source: "elm";\ + action: STATE_SET "visible" 0.0;\ + target: "item"#_pos".bg";\ + after: "separator"#_pos"expanded"; \ + }\ + program {\ + name: "item_"#_pos"isnotampm";\ + signal: "item"#_pos",style,default";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "item"#_pos".bg";\ + after: "separator"#_pos"normal"; \ + }\ + program {\ + name: "separator"#_pos"expanded";\ + action: STATE_SET "visible_expanded" 0.0;\ + target: "separator"#_pos;\ + }\ + program {\ + name: "separator"#_pos"normal";\ + action: STATE_SET "visible" 0.0;\ + target: "separator"#_pos;\ + }\ + } + +#define SEPARATOR(_after,_pos, minw, extminw ) \ + part {\ + name: "separator"#_pos; \ + type: TEXT;\ + scale: 1;\ + description {\ + state: "default" 0.0;\ + visible: 0;\ + min: 0 0;\ + align: 0.0 0.5;\ + fixed: 1 0;\ + rel1 { relative: 1.0 0.0; to: "item"#_after; }\ + rel2 { relative: 1.0 1.0; to: "item"#_after; }\ + color: DATEFIELD_SEPARATOR_TEXT_COLOR_INC;\ + text {\ + font: "SLP:style=Roman";\ + size: DATEFIELD_TEXT_FONT_SIZE_INC;\ + min: 1 0;\ + align: 0.2 0.5;\ + }\ + }\ + description { state: "visible" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: minw DATEFIELD_SEPARATOR_MIN_HEIGHT_INC;\ + }\ + description { state: "visible_expanded" 0.0;\ + inherit: "default" 0.0;\ + visible: 1;\ + min: extminw DATEFIELD_SEPARATOR_MIN_HEIGHT_INC;\ + }\ + }\ + programs {\ + program {\ + name: "separator"#_pos",enabled";\ + signal: "item"#_after",enable";\ + source: "elm";\ + action: STATE_SET "visible" 0.0;\ + target: "separator"#_pos;\ + }\ + program {\ + name: "separator"#_pos",disabled";\ + signal: "item"#_after",disable";\ + source: "elm";\ + action: STATE_SET "default" 0.0;\ + target: "separator"#_pos;\ + }\ + } + +group { + name: "elm/datefield/base/default"; parts { part { - name: "elm.rect.bg"; + name: "bg"; type: RECT; scale: 1; description { @@ -48,1942 +227,80 @@ group { } } part { - name: "elm.rect.date"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: DATEFIELD_DATE_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.bg"; } - } - } - part { - name: "elm.rect.time"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: DATEFIELD_TIME_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.time.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.time.pad"; } - } - } - part { - name: "elm.rect.date.left.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 10 DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "elm.rect.date"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.date"; } - } - } - part { - name: "elm.rect.date.right.pad"; + name: "separator0"; type: RECT; scale: 1; description { state: "default" 0.0; visible: 0; - min: 10 DATEFIELD_HEIGHT_INC; - align: 1.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.time"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time"; } - } - } - part { - name: "elm.text.date.year"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.date.month"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.date.day"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.rect.date.year.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_YEAR_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.month.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_MONTH_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.day.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_DAY_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.padding1"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - } - part { - name: "elm.rect.date.padding2"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; + min: DATEFIELD_SEPARATOR_MIN_WIDTH_INC DATEFIELD_SEPARATOR_MIN_HEIGHT_INC; align: 0.0 0.5; fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } + rel1 { relative: 0.0 0.0; to: "bg"; } + rel2 { relative: 0.0 1.0; to: "bg"; } } - description { - state: "yymmdd" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } } - description { - state: "mmyydd" 0.0; + description { state: "visible_expanded" 0.0; inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } } } + SEPARATOR(0,1, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC) + ITEM(0,1) + SEPARATOR(1,2, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC) + ITEM(1,2) + SEPARATOR(2,3, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC) + ITEM(2,3) + SEPARATOR(3,4, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC) + ITEM(3,4) + SEPARATOR(4,5, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_MIN_WIDTH_INC) + ITEM(4,5) + SEPARATOR(5,6, DATEFIELD_SEPARATOR_MIN_WIDTH_INC, DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC) + ITEM(5,6) part { - name: "elm.rect.date.time.pad"; + name: "clipper"; type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 44 0; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date"; } - } - } - part { - name: "elm.image.colon"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - min: DATEFIELD_TIME_COLON_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.time.hour.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.hour.over"; } - image { - normal: "00_timepicker_colon.png"; - border: 0 0 6 6; - border_scale: 1; - } - } - } - part { - name: "elm.text.time.hour"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.time.hour.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.hour.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.time.min"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.time.min.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.min.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } + description { state: "default" 0.0; + rel1 { relative: 0.0 0.0; to: "separator0"; } + rel2 { relative: 1.0 1.0; to: "separator6"; } + color: 255 255 255 255; } - description { state: "focused" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.rect.time.hour.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - min: DATEFIELD_HOUR_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "elm.rect.time"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.time"; } + color: 255 255 255 127; } } part { - name: "elm.rect.time.min.over"; + name: "disabler"; type: RECT; - scale: 1; - description { - state: "default" 0.0; + description { state: "default" 0.0; color: 0 0 0 0; - min: DATEFIELD_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.image.colon"; } - rel2 { relative: 1.0 1.0; to: "elm.image.colon"; } - } - } - part { - name: "elm.rect.ampm.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; visible: 0; - min: 30 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.time.min.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.min.over"; } - } - description { - state: "noampm" 0.0; - inherit: "default" 0.0; - min: 0 0; - } - } - part { - name: "elm.rect.ampm"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.ampm.pad";} - rel2 { relative: 1.0 1.0; to: "elm.rect.ampm.pad";} - } - description { - state: "noampm" 0.0; - inherit: "default" 0.0; - min: 0 0; - } - } - part { - name: "elm.swallow.time.ampm"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - fixed: 0 1; - rel1 { relative: 0.0 0.5; to: "elm.rect.ampm"; } - rel2 { relative: 1.0 0.5; to: "elm.rect.ampm"; } } - description { - state: "noampm" 0.0; + description { state: "visible" 0.0; inherit: "default" 0.0; - visible: 0; + visible: 1; } } } programs { program { - name: "format_yyddmm"; - signal: "elm,state,format,yyddmm"; - source: "elm"; - action: STATE_SET "yyddmm" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_yymmdd"; - signal: "elm,state,format,yymmdd"; + name: "disble_datefield"; + signal: "elm,state,disabled"; source: "elm"; - action: STATE_SET "yymmdd" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; + action: STATE_SET "visible" 0.0; + target: "disabler"; + target: "clipper"; } program { - name: "format_mmyydd"; - signal: "elm,state,format,mmyydd"; + name: "enable_datefield"; + signal: "elm,state,enabled"; source: "elm"; - action: STATE_SET "mmyydd" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_ddyymm"; - signal: "elm,state,format,ddyymm"; - source: "elm"; - action: STATE_SET "ddyymm" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_mmddyy"; - signal: "elm,state,format,mmddyy"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_ddmmyy"; - signal: "elm,state,format,ddmmyy"; - source: "elm"; - action: STATE_SET "ddmmyy" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "24h_mode"; - signal: "elm,state,mode,24h"; - source: "elm"; - action: STATE_SET "noampm" 0.0; - target: "elm.rect.ampm.pad"; - target: "elm.rect.ampm"; - target: "elm.swallow.time.ampm"; - } - program { - name: "12h_mode"; - signal: "elm,state,mode,12h"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.rect.ampm.pad"; - target: "elm.rect.ampm"; - target: "elm.swallow.time.ampm"; - } - program { - name: "day_focused"; - signal: "elm,state,day,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.day"; - } - program { - name: "day_unfocused"; - signal: "elm,state,day,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.day"; - } - program { - name: "month_focused"; - signal: "elm,state,month,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.month"; - } - program { - name: "month_unfocused"; - signal: "elm,state,month,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.month"; - } - program { - name: "year_focused"; - signal: "elm,state,year,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.year"; - } - program { - name: "year_unfocused"; - signal: "elm,state,year,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.year"; - } - program { - name: "hour_focused"; - signal: "elm,state,hour,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.time.hour"; - } - program { - name: "min_focused"; - signal: "elm,state,min,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.time.min"; - } - program { - name: "hour_unfocused"; - signal: "elm,state,hour,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.time.hour"; - } - program { - name: "min_unfocused"; - signal: "elm,state,min,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.time.min"; - } - } -} - -//////////// time mode ///////////// -group { - name: "elm/datefield/time/default"; - - parts { - part { - name: "elm.rect.bg"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "elm.rect.time"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - align: 0.5 0.5; - min: DATEFIELD_TIME_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - rel1 { relative: 0.0 0.0; to: "elm.rect.bg";} - rel2 { relative: 1.0 1.0; to: "elm.rect.bg";} - } - } - part { - name: "elm.rect.left.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.5; - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "elm.rect.time"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.time"; } - } - } - part { - name: "elm.image.colon"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - min: DATEFIELD_TIME_COLON_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.time.hour.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.hour.over"; } - image { - normal: "00_timepicker_colon.png"; - border: 0 0 6 6; - border_scale: 1; - } - } - } - part { - name: "elm.text.time.hour"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.time.hour.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.hour.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.time.min"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.time.min.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.min.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - align: 0.5 0.5; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.rect.time.hour.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - min: DATEFIELD_HOUR_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.left.pad"; } - } - } - part { - name: "elm.rect.time.min.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0;; - min: DATEFIELD_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.image.colon"; } - rel2 { relative: 1.0 1.0; to: "elm.image.colon"; } - } - } - part { - name: "elm.rect.ampm.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 30 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - align: 0.0 0.5; - rel1 { relative: 1.0 0.0; to: "elm.rect.time.min.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.time.min.over"; } - } - description { - state: "noampm" 0.0; - inherit: "default" 0.0; - min: 0 0; - } - } - part { - name: "elm.rect.ampm"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.ampm.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.ampm.pad"; } - } - description { - state: "noampm" 0.0; - inherit: "default" 0.0; - min: 0 0; - } - } - part { - name: "elm.swallow.time.ampm"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - fixed: 1 1; - min: DATEFIELD_AMPM_WIDTH_INC DATEFIELD_HEIGHT_INC; - rel1 { relative: 0.5 0.5; to: "elm.rect.ampm"; } - rel2 { relative: 0.5 0.5; to: "elm.rect.ampm"; } - } - description { - state: "noampm" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { - name: "elm.rect.right.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - align: 0.0 0.5; - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - color: 0 0 255 255; - rel1 { relative: 1.0 0.0; to: "elm.rect.ampm"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.ampm"; } - } - } - } - programs { - program { - name: "24h_mode"; - signal: "elm,state,mode,24h"; - source: "elm"; - action: STATE_SET "noampm" 0.0; - target: "elm.rect.ampm.pad"; - target: "elm.rect.ampm"; - target: "elm.swallow.time.ampm"; - } - program { - name: "12h_mode"; - signal: "elm,state,mode,12h"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.rect.ampm.pad"; - target: "elm.rect.ampm"; - target: "elm.swallow.time.ampm"; - } - program { - name: "hour_focused"; - signal: "elm,state,hour,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.time.hour"; - } - program { - name: "min_focused"; - signal: "elm,state,min,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.time.min"; - } - program { - name: "hour_unfocused"; - signal: "elm,state,hour,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.time.hour"; - } - program { - name: "min_unfocused"; - signal: "elm,state,min,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.time.min"; - } - } -} - -/////////// date mode //////////// -group { - name: "elm/datefield/date/default"; - - parts { - part { - name: "elm.rect.bg"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "elm.rect.date"; - type: IMAGE; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: DATEFIELD_DATE_MIN_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.bg"; } - } - } - part { - name: "elm.rect.date.left.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - rel1 { relative: 0.0 0.0; to: "elm.rect.date"; } - rel2 { relative: 0.0 1.0; to: "elm.rect.date"; } - } - } - part { - name: "elm.text.date.year"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.date.month"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.text.date.day"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - max: 1 0; - } - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { - name: "elm.rect.date.year.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_YEAR_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.month.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_MONTH_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.day.over"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - color: 0 0 0 0; - min: DATEFIELD_DAY_WIDTH_INC DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.left.pad"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.left.pad"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding1"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding1"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.padding2"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.padding2"; } - } - } - part { - name: "elm.rect.date.padding1"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - } - part { - name: "elm.rect.date.padding2"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; //mmddyy - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - align: 0.0 0.5; - fixed: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "ddmmyy" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - description { - state: "ddyymm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - description { - state: "yyddmm" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.day.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.day.over"; } - } - description { - state: "yymmdd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.month.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.month.over"; } - } - description { - state: "mmyydd" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date.year.over"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date.year.over"; } - } - } - part { - name: "elm.rect.date.right.pad"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - min: 20 DATEFIELD_HEIGHT_INC; - fixed: 1 0; - align: 1 0; - rel1 { relative: 1.0 0.0; to: "elm.rect.date"; } - rel2 { relative: 1.0 1.0; to: "elm.rect.date"; } - } - } - } - programs { - program { - name: "format_yyddmm"; - signal: "elm,state,format,yyddmm"; - source: "elm"; - action: STATE_SET "yyddmm" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_yymmdd"; - signal: "elm,state,format,yymmdd"; - source: "elm"; - action: STATE_SET "yymmdd" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_mmyydd"; - signal: "elm,state,format,mmyydd"; - source: "elm"; - action: STATE_SET "mmyydd" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_ddyymm"; - signal: "elm,state,format,ddyymm"; - source: "elm"; - action: STATE_SET "ddyymm" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_mmddyy"; - signal: "elm,state,format,mmddyy"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "format_ddmmyy"; - signal: "elm,state,format,ddmmyy"; - source: "elm"; - action: STATE_SET "ddmmyy" 0.0; - target: "elm.rect.date.year.over"; - target: "elm.rect.date.month.over"; - target: "elm.rect.date.day.over"; - target: "elm.rect.date.padding1"; - target: "elm.rect.date.padding2"; - } - program { - name: "day_focused"; - signal: "elm,state,day,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.day"; - } - program { - name: "day_unfocused"; - signal: "elm,state,day,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.day"; - } - program { - name: "month_focused"; - signal: "elm,state,month,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.month"; - } - program { - name: "month_unfocused"; - signal: "elm,state,month,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.month"; - } - program { - name: "year_focused"; - signal: "elm,state,year,focus,in"; - source: "elm"; - action: STATE_SET "focused" 0.0; - target: "elm.text.date.year"; - } - program { - name: "year_unfocused"; - signal: "elm,state,year,focus,out"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text.date.year"; - } - } -} - -///// datefield entry /////// -group { - name: "elm/entry/base-single/datefield"; - alias: "elm/entry/base-single/datefield/default"; - data.item: "default_font_size" "40"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; - styles - { - style { - name: "datefield_textblock_style"; - base: "font=SLP:style=Roman font_size=30 align=0.5 color=#000000 wrap=none"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "link" "+ color=#800 underline=on underline_color=#8008"; - tag: "hilight" "+ font=SLP:style=Bold"; - } - style { - name: "datefield_textblock_focus_style"; - base: "font=SLP:style=Roman font_size=30 align=0.5 color=#dd8615 wrap=none"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "link" "+ color=#800 underline=on underline_color=#8008"; - tag: "hilight" "+ font=SLP:style=Bold"; - } - } - parts { - part { - name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 1; - scale: 1; - entry_mode: EDITABLE; - multiline: 0; - description { - state: "default" 0.0; - text { - style: "datefield_textblock_style"; - min: 1 1; - max: 0 1; - } - } - description { - state: "focus" 0.0; - text { - style: "datefield_textblock_focus_style"; - min: 1 1; - max: 0 1; - } - } - } - } - programs { - program { - name: "focus"; - signal: "load"; - source: ""; - action: FOCUS_SET; - target: "elm.text"; - } - program { - name: "focus_in"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focus" 0.0; - target: "elm.text"; - } - program { - name: "focus_out"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - } -} - -group { - name: "elm/entry/base-single/datefield/hybrid"; - alias: "elm/entry/base-single/datefield/hybrid/default"; - data.item: "default_font_size" "32"; - data.item: "min_font_size" "8"; - data.item: "max_font_size" "60"; - styles - { - style { - name: "datefield_hybrid_textblock_style"; - base: "font=SLP:style=Roman font_size=30 align=0.5 color=#000000 wrap=none"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "link" "+ color=#800 underline=on underline_color=#8008"; - tag: "hilight" "+ font=SLP:style=Bold"; - } - style { - name: "datefield_hybrid_textblock_focus_style"; - base: "font=SLP:style=Roman font_size=30 align=0.5 color=#dd8615 wrap=none"; - tag: "br" "\n"; - tag: "ps" "ps"; - tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "link" "+ color=#800 underline=on underline_color=#8008"; - tag: "hilight" "+ font=SLP:style=Bold"; - } - } - parts { - part { - name: "elm.text"; - type: TEXTBLOCK; - mouse_events: 1; - scale: 1; - entry_mode: EDITABLE; - multiline: 0; - description { - state: "default" 0.0; - text { - style: "datefield_hybrid_textblock_style"; - min: 1 1; - max: 0 1; - } - } - description { - state: "focus" 0.0; - text { - style: "datefield_hybrid_textblock_focus_style"; - min: 1 1; - max: 0 1; - } - } - } - } - programs { - program { - name: "focus"; - signal: "load"; - source: ""; - action: FOCUS_SET; - target: "elm.text"; - } - program { - name: "focus_in"; - signal: "elm,action,focus"; - source: "elm"; - action: STATE_SET "focus" 0.0; - target: "elm.text"; - } - program { - name: "focus_out"; - signal: "elm,action,unfocus"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; + action: STATE_SET "default" 0.0; + target: "disabler"; + target: "clipper"; } } -} +}//end group -/////////////////////////////////////////////////////////////////////////////////////// - group { name: "elm/button/base/datefield.ampm/default"; - images { - image: "00_button_01_normal.png" COMP; - } - script { - public button_state = 0; //0:enabled, 1: disabled - } - parts { - part { name: "button_image"; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - min: 16 DATEFIELD_HEIGHT_INC; - image { - normal: "00_button_01_normal.png"; - border: 2 2 10 10; - border_scale: 1; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "00_button_01_normal.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - image.normal: "00_button_01_normal.png"; - } - } - part { - name: "padding_left"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 0.0 1.0; - min: 5 5; - fixed: 1 0; - visible: 0; - } - } - part { - name: "padding_right"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 1.0 0.0; - rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; - min: 5 5; - fixed: 1 0; - visible: 0; - } - } - part { - name: "padding_top"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 0.0; - min: 5 5; - fixed: 0 1; - visible: 0; - } - } - part { - name: "padding_bottom"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - align: 1.0 1.0; - rel1.relative: 0.0 1.0; - rel2.relative: 1.0 1.0; - min: 5 5; - fixed: 0 1; - visible: 0; - } - } - part { - name: "padding_icon_text"; - type: RECT; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; //when only icon or no icon is there - align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to: "elm.swallow.content"; } - rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; } - fixed: 1 0; - min: 0 0; - visible: 0; - } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - } - description { state: "visible" 0.0; //when icon is visible - align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to: "elm.swallow.content"; } - rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; } - fixed: 1 0; - min: 5 0; - visible: 0; - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - align: 0.0 0.5; - rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } - rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; } - fixed: 1 0; - } - description { state: "visible" 0.0; - fixed: 1 0; - visible: 1; - align: 0.0 0.5; - rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } - rel2 {relative: 1.0 0.0; to_x: "padding_left"; to_y: "padding_bottom"; } - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - description { state: "icononly" 0.0;; - visible: 1; - min: 40 40; - rel1 {relative: 1.0 1.0; to_x: "padding_left"; to_y: "padding_top"; } - rel2 {relative: 0.0 0.0; to_x: "padding_right"; to_y: "padding_bottom"; } - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - } - part { name: "elm.text"; - type: TEXT; - //effect: SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_top"; } - rel2 { relative: 0.0 0.0; to_x: "padding_right"; to_y:"padding_bottom"; } - color: DATEFIELD_TEXT_NORMAL_COLOR_INC; - color2: 255 255 255 255; - text { - font: "SLP:style=Roman"; - size: DATEFIELD_TEXT_SIZE_INC; - min: 0 0; - max: 1 0; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - min: 64 30; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - min: 0 0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; - } - description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; - visible: 1; - min: 64 30; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - visible: 1; - min: 0 0; - color: DATEFIELD_TEXT_SELECTED_COLOR_INC; - } - } - part { name: "over2"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - color: 0 0 0 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "over3"; - type: RECT; - mouse_events: 1; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "button_click"; - signal: "mouse,down,1"; - source: "over2"; - action: SIGNAL_EMIT "elm,action,press" ""; - after: "button_click_anim"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - after: "text_clicked"; - } - program { name: "text_clicked"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "clicked", 0.0); - } - } - program { name: "button_unpress"; - action: SIGNAL_EMIT "elm,action,unpress" ""; - } - program { name: "button_mouseout_clicked"; - signal: "mouse,up,1"; - source: "over3"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.content", st, 30, vl); - if (strcmp(st, "icononly")) - { - emit("elm,action,default,text,set", ""); - set_state(PART:"elm.text", "visible", 0.0); - } - if(get_int(button_state) !=1) - set_state(PART:"button_image", "default", 0.0); - } - after: button_unpress; - } - program { name: "button_click2"; - signal: "mouse,down,1"; - source: "over3"; - action: STATE_SET "clicked" 0.0; - target: "over3"; - } - program { name: "button_unclick2"; - signal: "mouse,clicked,1"; - source: "over3"; - action: STATE_SET "default" 0.0; - target: "over3"; - } - program { name: "button_unclick3"; - signal: "mouse,clicked,1"; - source: "over2"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { name: "text_show"; - signal: "elm,state,text,visible"; - source: "elm"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.swallow.content", st, 30, vl); - if (!strcmp(st, "icononly")) - { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"padding_icon_text", "visible", 0.0); - } - if(get_int(button_state) !=1) - set_state(PART:"elm.text", "visible", 0.0); - else - set_state(PART:"elm.text", "disabled_visible", 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.content", st, 30, vl); - if (!strcmp(st, "visible")) - { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"padding_icon_text", "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 (!strcmp(st, "visible")) - { - set_state(PART:"elm.swallow.content", "visible", 0.0); - set_state(PART:"padding_icon_text", "visible", 0.0); - } - else - { - set_state(PART:"elm.swallow.content", "icononly", 0.0); - set_state(PART:"padding_icon_text", "icononly", 0.0); - } - } - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "over2"; - target: "disabler"; - after: "disable_text"; - } - program { name: "disable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"elm.text", "disabled_visible", 0.0); - else - set_state(PART:"elm.text", "disabled", 0.0); - set_int(button_state, 1); - } - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "over2"; - target: "disabler"; - after: "enable_text"; - } - program { name: "enable_text"; - script { - new st[31]; - new Float:vl; - get_state(PART:"elm.text", st, 30, vl); - if (!strcmp(st, "disabled_visible")) - set_state(PART:"elm.text", "visible", 0.0); - else - set_state(PART:"elm.text", "default", 0.0); - set_int(button_state, 0); - } - } - program { name: "focused"; - //signal: "elm,action,focus"; - //source: "elm"; - action: STATE_SET "focused" 0.0; - target: "button_image"; - target: "elm.text"; - } - program { name: "unfocused"; - //signal: "elm,action,unfocus"; - //source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_image"; - after: "unfocus_text"; - } - program { name: "unfocus_text"; - action: STATE_SET "visible" 0.0; - target: "elm.text"; - } - } - } diff --git a/themes/groups/diskselector.edc b/themes/groups/diskselector.edc index 1ffff6a..297fbd1 100644 --- a/themes/groups/diskselector.edc +++ b/themes/groups/diskselector.edc @@ -26,124 +26,121 @@ // diskselector // /////////////////////////////////////////////////////////////////////////////////////// -group { name: "elm/diskselector/base/extended/timepicker"; +group { name: "elm/diskselector/base/datefield/default"; + alias: "elm/diskselector/base/datefield/calendar"; + alias: "elm/diskselector/base/datefield/clk_default"; + alias: "elm/diskselector/base/extended/timepicker"; - parts { - part { name: "bg"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - } - } + parts { + part { name: "bg"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + } + } + } } -group { name: "elm/diskselector/item/extended/timepicker"; +group { name: "elm/diskselector/item/datefield/default"; + alias: "elm/diskselector/item/datefield/calendar"; + alias: "elm/diskselector/item/datefield/clk_default"; + alias: "elm/diskselector/item/extended/timepicker"; - data { - item: "len_threshold" "14"; - item: "display_item_num" "8"; - item: "min_height" "66"; - } + data { + item: "len_threshold" "14"; + item: "min_height" DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC; + } - parts { - part { - name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - min: 40 66; - max: 40 66; - fixed: 1 1; - align: 0 0; - color: DISKSELECTOR_TP_FONT_COLOR_INC; - visible: 1; - text { - font: FONT_ROM; - size: 24; - fit: 1 0; - size_range: 10 24; - min: 0 1; - } - } + parts { + part { + name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { + state: "default" 0.0; + min: DISKSELECTOR_DF_ITEM_MIN_SIZE_INC; + fixed: 1 1; + align: 0 0; + color: DISKSELECTOR_DF_FONT_COLOR_INC; + visible: 1; + text { + font: FONT_ROM; + size: DISKSELECTOR_DF_FONT_SIZE_INC; + min: 1 1; + } + } + description { + state: "selected" 0.0; + min: DISKSELECTOR_DF_ITEM_MIN_SIZE_INC; + fixed: 1 1; + align: 0 0; + color: 255 255 255 255; + visible: 1; + text { + font: FONT_ROM; + size: DISKSELECTOR_DF_FONT_SIZE_INC; + min: 1 1; + } + } + description { state: "show" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "default_small" 0.0; + inherit: "default" 0.0; + visible: 1; + text.size: 10; + } + description { state: "left_side" 0.0; + inherit: "default" 0.0; + visible: 1; + } + description { state: "right_side" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } - description { - state: "selected" 0.0; - min: 40 66; - max: 40 66; - fixed: 1 1; - align: 0 0; - color: 255 255 255 255; - visible: 1; - text { - font: FONT_ROM; - size: 24; - fit: 1 0; - size_range: 10 24; - min: 0 1; - } - } + part { + name: "over1"; + mouse_events: 1; + repeat_events: 1; + ignore_flags: ON_HOLD; + description { + state: "default" 0.0; + } + } + } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "default_small" 0.0; - inherit: "default" 0.0; - visible: 1; - text.size: 10; - } - description { state: "left_side" 0.0; - inherit: "default" 0.0; - visible: 1; - } - description { state: "right_side" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - - part { - name: "over1"; - mouse_events: 1; - repeat_events: 1; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; - } - } - } - - programs { - program { - name: "elm,state,selected"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "elm.text"; - } - program { - name: "elm,state,default"; - signal: "elm,state,default"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { - name: "item_click"; - signal: "mouse,clicked,1"; - source: "over1"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - } + programs { + program { + name: "elm,state,selected"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "elm.text"; + } + program { + name: "elm,state,default"; + signal: "elm,state,default"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.text"; + } + program { + name: "item_click"; + signal: "mouse,clicked,1"; + source: "over1"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + } } diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc index 52e3a3c..8899bcc 100644 --- a/themes/inc/nbeat-black-inc.edc +++ b/themes/inc/nbeat-black-inc.edc @@ -70,7 +70,10 @@ #define CTXPOPUP_SEPARATOR_COLOR_INC 71 82 87 255 #define CTXPOPUP_TP_BG_COLOR_INC 42 109 140 255 -#define DISKSELECTOR_TP_FONT_COLOR_INC 105 151 173 255 +#define DISKSELECTOR_DF_FONT_COLOR_INC 105 151 173 255 +#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC 40 66; +#define DISKSELECTOR_DF_FONT_SIZE_INC 24 +#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC "66" #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#FFFFFF" @@ -659,19 +662,15 @@ #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#f4f4f4" -#define DATEFIELD_HEIGHT_INC 40 -#define DATEFIELD_TEXT_NORMAL_COLOR_INC 255 255 255 255 -#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 -#define DATEFIELD_DATE_MIN_WIDTH_INC 224 -#define DATEFIELD_TIME_MIN_WIDTH_INC 188 -#define DATEFIELD_TEXT_SIZE_INC 30 -#define DATEFIELD_YEAR_WIDTH_INC 80 -#define DATEFIELD_MONTH_WIDTH_INC 64 -#define DATEFIELD_DAY_WIDTH_INC 40 -#define DATEFIELD_TIME_COLON_WIDTH_INC 20 -#define DATEFIELD_HOUR_WIDTH_INC 40 -#define DATEFIELD_MIN_WIDTH_INC 40 -#define DATEFIELD_AMPM_WIDTH_INC 64 +#define DATEFIELD_ITEM_MIN_SIZE_INC 40 40 +#define DATEFIELD_ITEM_BG_SIZE_INC 50 40 +#define DATEFIELD_SEPARATOR_MIN_HEIGHT_INC 40 +#define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 24 +#define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 40 +#define DATEFIELD_TEXT_FONT_SIZE_INC 24 +#define DATEFIELD_TEXT_NORMAL_COLOR_INC 255 255 255 255 +#define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 150 150 150 255 +#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 #define COLORSELECTOR_MIN_W_INC 470 #define COLORSELECTOR_MIN_H_INC 210 diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc index c56c314..2455a0d 100644 --- a/themes/inc/nbeat-hd-inc.edc +++ b/themes/inc/nbeat-hd-inc.edc @@ -72,7 +72,10 @@ #define CTXPOPUP_SEPARATOR_COLOR_INC 199 199 199 255 #define CTXPOPUP_TP_BG_COLOR_INC 221 134 21 255 -#define DISKSELECTOR_TP_FONT_COLOR_INC 231 171 92 255 +#define DISKSELECTOR_DF_FONT_COLOR_INC 231 171 92 255 +#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC 64 80; +#define DISKSELECTOR_DF_FONT_SIZE_INC 32 +#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC "80" #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000" @@ -688,19 +691,15 @@ #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#f4f4f4" -#define DATEFIELD_HEIGHT_INC 62 -#define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 -#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 -#define DATEFIELD_DATE_MIN_WIDTH_INC 346 -#define DATEFIELD_TIME_MIN_WIDTH_INC 306 -#define DATEFIELD_TEXT_SIZE_INC 45 -#define DATEFIELD_YEAR_WIDTH_INC 120 -#define DATEFIELD_MONTH_WIDTH_INC 96 -#define DATEFIELD_DAY_WIDTH_INC 64 -#define DATEFIELD_TIME_COLON_WIDTH_INC 30 -#define DATEFIELD_HOUR_WIDTH_INC 64 -#define DATEFIELD_MIN_WIDTH_INC 64 -#define DATEFIELD_AMPM_WIDTH_INC 100 +#define DATEFIELD_ITEM_MIN_SIZE_INC 70 70 +#define DATEFIELD_ITEM_BG_SIZE_INC 80 70 +#define DATEFIELD_SEPARATOR_MIN_HEIGHT_INC 70 +#define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 40 +#define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 65 +#define DATEFIELD_TEXT_FONT_SIZE_INC 36 +#define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 +#define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 100 100 100 255 +#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 #define COLORSELECTOR_MIN_W_INC 704 #define COLORSELECTOR_MIN_H_INC 336 diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc index 3026c9e..634201a 100644 --- a/themes/inc/nbeat-inc.edc +++ b/themes/inc/nbeat-inc.edc @@ -70,7 +70,10 @@ #define CTXPOPUP_SEPARATOR_COLOR_INC 199 199 199 255 #define CTXPOPUP_TP_BG_COLOR_INC 221 134 21 255 -#define DISKSELECTOR_TP_FONT_COLOR_INC 231 171 92 255 +#define DISKSELECTOR_DF_FONT_COLOR_INC 231 171 92 255 +#define DISKSELECTOR_DF_ITEM_MIN_SIZE_INC 40 66; +#define DISKSELECTOR_DF_FONT_SIZE_INC 24 +#define DISKSELECTOR_DF_DATA_MIN_HEIGHT_INC "66" #define LABEL_TEXT_BLOCK_STYLE_COLOR_INC "#000000" @@ -682,19 +685,15 @@ #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#f4f4f4" -#define DATEFIELD_HEIGHT_INC 40 -#define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 -#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 -#define DATEFIELD_DATE_MIN_WIDTH_INC 224 -#define DATEFIELD_TIME_MIN_WIDTH_INC 188 -#define DATEFIELD_TEXT_SIZE_INC 30 -#define DATEFIELD_YEAR_WIDTH_INC 80 -#define DATEFIELD_MONTH_WIDTH_INC 64 -#define DATEFIELD_DAY_WIDTH_INC 40 -#define DATEFIELD_TIME_COLON_WIDTH_INC 20 -#define DATEFIELD_HOUR_WIDTH_INC 40 -#define DATEFIELD_MIN_WIDTH_INC 40 -#define DATEFIELD_AMPM_WIDTH_INC 64 +#define DATEFIELD_ITEM_MIN_SIZE_INC 40 40 +#define DATEFIELD_ITEM_BG_SIZE_INC 50 40 +#define DATEFIELD_SEPARATOR_MIN_HEIGHT_INC 40 +#define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 24 +#define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 40 +#define DATEFIELD_TEXT_FONT_SIZE_INC 24 +#define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 +#define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 100 100 100 255 +#define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 #define COLORSELECTOR_MIN_W_INC 470 #define COLORSELECTOR_MIN_H_INC 210