From: sumanth Date: Tue, 10 Sep 2013 23:32:33 +0000 (+0530) Subject: [elm_datetime]Unused datetime styles are deleted. X-Git-Tag: 2.2.1_release~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5bb1d67f962b96bcaf5d3ce7f4a060f96263367;p=framework%2Fuifw%2Fefl-theme-tizen.git [elm_datetime]Unused datetime styles are deleted. Change-Id: Iacb28ea54dd8ea0df8742a6be6e007d545f8c9cd --- diff --git a/themes/images/HD/dark/Controls/00_picker_button_bg.png b/themes/images/HD/dark/Controls/00_picker_button_bg.png deleted file mode 100755 index 09dcb72..0000000 Binary files a/themes/images/HD/dark/Controls/00_picker_button_bg.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png b/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png deleted file mode 100755 index 4009d35..0000000 Binary files a/themes/images/HD/dark/Controls/00_picker_button_bg_focus.png and /dev/null differ diff --git a/themes/images/HD/dark/Controls/00_picker_button_bg_press.png b/themes/images/HD/dark/Controls/00_picker_button_bg_press.png deleted file mode 100755 index 1f7e245..0000000 Binary files a/themes/images/HD/dark/Controls/00_picker_button_bg_press.png and /dev/null differ diff --git a/themes/images/HD/light/Controls/00_picker_button_bg.png b/themes/images/HD/light/Controls/00_picker_button_bg.png deleted file mode 100755 index 09dcb72..0000000 Binary files a/themes/images/HD/light/Controls/00_picker_button_bg.png and /dev/null differ diff --git a/themes/images/HD/light/Controls/00_picker_button_bg_focus.png b/themes/images/HD/light/Controls/00_picker_button_bg_focus.png deleted file mode 100755 index 4009d35..0000000 Binary files a/themes/images/HD/light/Controls/00_picker_button_bg_focus.png and /dev/null differ diff --git a/themes/images/HD/light/Controls/00_picker_button_bg_press.png b/themes/images/HD/light/Controls/00_picker_button_bg_press.png deleted file mode 100755 index 1f7e245..0000000 Binary files a/themes/images/HD/light/Controls/00_picker_button_bg_press.png and /dev/null differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 51aba02..9113960 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -1106,12 +1106,10 @@ #define DATETIME_SEPARATOR_TEXT_COLOR_INC 250 250 250 255 #define DATETIME_TEXT_SELECTED_COLOR_INC 255 255 255 255 #define DATETIME_BG_IMAGE_BORDER_INC 13 13 15 15 -#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 #define DATETIME_PICKER_BG_PADDING_SIZE_INC 12 0 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC 250 250 250 255 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC 250 250 250 255 -#define DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC 8 8 21 22 #define DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC 104 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC 69 #define DATETIME_LABEL_DATE_FIELD_HEIGHT_INC 48 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index fe881e7..7d24ae0 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1107,12 +1107,10 @@ #define DATETIME_SEPARATOR_TEXT_COLOR_INC 40 40 40 255 #define DATETIME_TEXT_SELECTED_COLOR_INC 250 250 250 255 #define DATETIME_BG_IMAGE_BORDER_INC 13 13 15 15 -#define DATETIME_LEFT_PADDING_SIZE_INC 27 112 #define DATETIME_PICKER_BG_PADDING_SIZE_INC 12 0 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC 40 40 40 255 #define DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC 250 250 250 255 -#define DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC 8 8 21 22 #define DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC 104 #define DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC 69 #define DATETIME_LABEL_DATE_FIELD_HEIGHT_INC 48 diff --git a/themes/widgets/datetime.edc b/themes/widgets/datetime.edc index 02cf76c..76ce985 100644 --- a/themes/widgets/datetime.edc +++ b/themes/widgets/datetime.edc @@ -1113,268 +1113,6 @@ group { name: "elm/datetime/base/default"; group { name: "elm/datetime/base/pickerstyle"; } -#define DATETIME_FIELD_STYLE1(_pos, _after) \ - part {\ - name: "field"#_pos; \ - type: SWALLOW; \ - scale: 1;\ - clip_to: "clipper";\ - repeat_events: 1;\ - description { state: "default" 0.0; \ - visible: 0;\ - min: 0 0;\ - align: 0.0 0.5;\ - fixed: 1 1;\ - rel1 {\ - relative: 1.0 0.0;\ - to: "separator"#_after;\ - }\ - rel2 {\ - relative: 1.0 1.0;\ - to: "separator"#_after;\ - }\ - }\ - description { state: "enable" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - min: DATETIME_FIELD_MIN_SIZE_INC;\ - }\ - }\ - programs{\ - program {\ - name: "field_"#_pos"enabled";\ - signal: "field"#_pos",enable";\ - source: "elm";\ - action: STATE_SET "enable" 0.0;\ - target: "field"#_pos;\ - }\ - program {\ - name: "field_"#_pos"disabled";\ - signal: "field"#_pos",disable";\ - source: "elm";\ - action: STATE_SET "default" 0.0;\ - target: "field"#_pos;\ - }\ - } - -#define DATETIME_SEPARATOR_STYLE1(_pos) \ - part {\ - name: "separator"#_pos; \ - type: TEXT;\ - scale: 1;\ - clip_to: "clipper";\ - repeat_events: 1;\ - description {\ - state: "default" 0.0;\ - visible: 0;\ - min: DATETIME_SEPARATOR_MIN_SIZE_INC;\ - max: DATETIME_SEPARATOR_MIN_SIZE_INC;\ - align: 0.0 0.5;\ - fixed: 1 1;\ - rel1 {\ - relative: 1.0 0.0;\ - to: "field"#_pos;\ - }\ - rel2 {\ - relative: 1.0 1.0;\ - to: "field"#_pos;\ - }\ - color: DATETIME_SEPARATOR_TEXT_COLOR_INC;\ - text {\ - font: "Tizen:style=Regular";\ - size: DATETIME_SEPARATOR_TEXT_FONT_SIZE_INC;\ - min: 1 0; \ - text_class: "tizen";\ - }\ - }\ - description { state: "enable" 0.0;\ - inherit: "default" 0.0;\ - visible: 1;\ - }\ - description { state: "hide" 0.0;\ - inherit: "default" 0.0;\ - min: 0 0;\ - max: 0 0;\ - }\ - }\ - programs {\ - program {\ - name: "separator"#_pos",enabled";\ - signal: "field"#_pos",separator,enable";\ - source: "elm";\ - action: STATE_SET "enable" 0.0;\ - target: "separator"#_pos;\ - }\ - program {\ - name: "separator"#_pos",disabled";\ - signal: "field"#_pos",separator,disable";\ - source: "elm";\ - script {\ - new st[31];\ - new Float:vl;\ - get_state(PART:"separator"#_pos, st, 30, vl);\ - if (strcmp(st, "hide")) \ - {\ - set_state(PART:"separator"#_pos, "default", 0.0);\ - }\ - }\ - }\ - program {\ - name: "separator"#_pos",hide";\ - signal: "field"#_pos",disable";\ - source: "elm";\ - action: STATE_SET "hide" 0.0;\ - target: "separator"#_pos;\ - }\ - } - - -group { name: "elm/datetime/base/style1"; - parts { - part { - name: "bg"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - part { - name: "left.padding"; - type: RECT; - scale: 1; - clip_to: "clipper"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - min: DATETIME_LEFT_PADDING_SIZE_INC; - max: DATETIME_LEFT_PADDING_SIZE_INC; - align: 0.0 0.5; - fixed: 1 1; - rel1.to: "bg"; - rel2 { - relative: 0.0 1.0; - to: "bg"; - } - } - } - part { - name: "field0"; - type: SWALLOW; - scale: 1; - clip_to: "clipper"; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 0; - min: 0 0; - align: 0.0 0.5; - fixed: 1 0; - rel1 { - relative: 0.5 0.0; - to_x: "left.padding"; - } - rel2 { - relative: 0.5 1.0; - to_x: "left.padding"; - } - } - description { state: "enable" 0.0; - inherit: "default" 0.0; - visible: 1; - min: DATETIME_FIELD_MIN_SIZE_INC; - } - } - DATETIME_SEPARATOR_STYLE1(0) - DATETIME_FIELD_STYLE1(1, 0) - DATETIME_SEPARATOR_STYLE1(1) - DATETIME_FIELD_STYLE1(2, 1) - DATETIME_SEPARATOR_STYLE1(2) - DATETIME_FIELD_STYLE1(3, 2) - DATETIME_SEPARATOR_STYLE1(3) - DATETIME_FIELD_STYLE1(4, 3) - DATETIME_SEPARATOR_STYLE1(4) - DATETIME_FIELD_STYLE1(5, 4) - DATETIME_SEPARATOR_STYLE1(5) - part { - name: "right.padding"; - type: RECT; - scale: 1; - clip_to: "clipper"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - min: DATETIME_LEFT_PADDING_SIZE_INC; - max: DATETIME_LEFT_PADDING_SIZE_INC; - align: 1.0 0.5; - fixed: 1 1; - rel2 { - relative: 1.0 0.0; - to: "bg"; - } - rel2.to: "bg"; - } - } - part { - name: "clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 255; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 102; - } - } - part { - name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { - name: "disble_datetime"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "disabler"; - target: "clipper"; - } - program { - name: "enable_datetime"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disabler"; - target: "clipper"; - } - program { - name: "field0,enabled"; - signal: "field0,enable"; - source: "elm"; - action: STATE_SET "enable" 0.0; - target: "field0"; - } - program { - name: "field0,disabled"; - signal: "field0,disable"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "field0"; - } - } -} group { name: "elm/spinner/base/default"; alias: "elm/spinner/base/datetime_popup"; alias: "elm/spinner/base/datetime_popup/year"; diff --git a/themes/widgets/label.edc b/themes/widgets/label.edc index a6869ac..4eca135 100644 --- a/themes/widgets/label.edc +++ b/themes/widgets/label.edc @@ -1171,152 +1171,6 @@ base: "font=Tizen:style=Medium font_size="LABEL_FONT_SIZE_INC" color="LABEL_TEXT } } - group { name: "elm/label/base/datetime/year/style1"; - alias: "elm/label/base/datetime/month/style1"; - images { - image: "00_picker_button_bg.png" COMP; - image: "00_picker_button_bg_press.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - min: DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - } - } - part { name: "label.text.clip"; - type: RECT; - description { state: "default" 0.0; - } - } - part { name: "bg.img"; - scale: 1; - clip_to: "label.text.clip"; - description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - to_x: "elm.text"; - } - rel2 { - relative: 1.0 1.0; - to_x: "elm.text"; - } - image { - normal: "00_picker_button_bg.png"; - border: DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC; - border_scale: 1; - } - fixed: 1 1; - min: DATETIME_LABEL_DATE_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - image { - normal: "00_picker_button_bg_press.png"; - border: DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC; - border_scale: 1; - } - } - } - part { name: "elm.text"; - type: TEXT; - scale: 1; - clip_to: "label.text.clip"; - description { state: "default" 0.0; - color: DATETIME_LABEL_TEXT_BLOCK_STYLE_COLOR_INC; - text { - font: "Tizen:style=Regular"; - size: DATETIME_TEXT_FONT_SIZE_INC; - text_class: "tizen"; - min: 1 0; - max: 1 1; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: DATETIME_LABEL_TEXT_BLOCK_STYLE_SELECTED_COLOR_INC; - text { - font: "Tizen:style=Bold"; - size: DATETIME_TEXT_FONT_SIZE_INC; - text_class: "tizen"; - min: 1 0; - max: 1 1; - } - } - } - } - programs { - program { name: "label_select"; - signal: "elm,state,select"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "elm.text"; - target: "bg.img"; - after: "play_sound"; - } - program { name: "play_sound"; - action: PLAY_SAMPLE "touch_sound" 1.0; - } - program { name: "label_unselect"; - signal: "elm,state,unselect"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - target: "bg.img"; - } - } - } - - group { name: "elm/label/base/datetime/hour/style1"; - alias: "elm/label/base/datetime/minute/style1"; - alias: "elm/label/base/datetime/date/style1"; - inherit: "elm/label/base/datetime/year/style1"; - parts { - part { name: "bg"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - min: DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC;; - } - } - part { name: "bg.img"; - scale: 1; - clip_to: "label.text.clip"; - description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - to_x: "elm.text"; - } - rel2 { - relative: 1.0 1.0; - to_x: "elm.text"; - } - image { - normal: "00_picker_button_bg.png"; - border: DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC; - border_scale: 1; - } - fixed: 1 1; - min: DATETIME_LABEL_TIME_FIELD_MIN_WIDTH_INC DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - max: -1 DATETIME_LABEL_DATE_FIELD_HEIGHT_INC; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - image { - normal: "00_picker_button_bg_press.png"; - border: DATETIME_LABEL_DATE_FIELD_BG_IMAGE_BORDER_INC; - border_scale: 1; - } - } - } - } - } group { name: "elm/label/base/datetime"; alias: "elm/label/base/datetime/year/default"; alias: "elm/label/base/datetime/month/default";