From: Jung Chanwook Date: Fri, 10 May 2013 07:59:32 +0000 (+0900) Subject: [Refactoring] remove toolbar progress style and images X-Git-Tag: submit/tizen_2.2/20130714.144922~288 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1751241c3f57b9f49090a68a1b31f25cfe5c317;p=framework%2Fuifw%2Fefl-theme-tizen.git [Refactoring] remove toolbar progress style and images --- diff --git a/themes/images/tizen-hd/Others/00_toolbar_progress_bar.png b/themes/images/tizen-hd/Others/00_toolbar_progress_bar.png deleted file mode 100644 index c93a19a..0000000 Binary files a/themes/images/tizen-hd/Others/00_toolbar_progress_bar.png and /dev/null differ diff --git a/themes/images/tizen-hd/Others/00_toolbar_progress_bg.png b/themes/images/tizen-hd/Others/00_toolbar_progress_bg.png deleted file mode 100644 index 3b067f0..0000000 Binary files a/themes/images/tizen-hd/Others/00_toolbar_progress_bg.png and /dev/null differ diff --git a/themes/widgets/progressbar.edc b/themes/widgets/progressbar.edc index 14a7337..f2c96a3 100644 --- a/themes/widgets/progressbar.edc +++ b/themes/widgets/progressbar.edc @@ -1798,415 +1798,6 @@ } } } - group { name: "elm/progressbar/horizontal/toolbar_progress"; - images { - image: "00_toolbar_progress_bg.png" COMP; - image: "00_toolbar_progress_bar.png" COMP; - } - parts { - part { name: "access"; - type: RECT; - description { state: "default" 0.0; - fixed: 1 1; - color: 0 0 0 0; - } - } - part { name: "elm.padding.left"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 0; - fixed: 1 0; - rel1 { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - } - color: 0 0 0 0; - align: 0.0 0.0; - } - } - part { name: "elm.padding.right"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 0; - fixed: 1 0; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - relative: 1.0 1.0; - offset: 0 0; - } - color: 0 0 0 0; - align: 1.0 0.0; - } - } - part { name: "elm.background.progressbar"; - mouse_events: 0; - scale: 1; - type: RECT; - description { - state: "default" 0.0; - rel1 { - to_x: "elm.padding.left"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to_x: "elm.padding.right"; - relative: 0.0 1.0; - offset: 0 0; - } - } - } - part { name: "elm.swallow.bar"; - mouse_events: 0; - scale: 1; - type: SWALLOW; - description { - min: 48 14; - max: 99999 14; - state: "default" 0.0; - rel1 { - to: "elm.background.progressbar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.background.progressbar"; - relative: 1.0 1.0; - } - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - visible: 0; - align: 0.0 0.5; - rel1 { - offset: 0 0; - to_y: "elm.background.progressbar"; - } - rel2 { - offset: 0 -1; - relative: 0.0 1.0; - to_y: "elm.background.progressbar"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - rel2.offset: 4 -1; - } - } - part { name: "elm.text"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - fixed: 1 1; - align: 0.0 0.5; - rel1.to_x: "elm.swallow.content"; - rel1.relative: 1.0 0.0; - rel1.offset: -1 4; - rel2.to_x: "elm.swallow.content"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -5; - color: PROGRESSBAR_LIST_TITLE_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC; - text { - font: "Tizen:style=Roman"; - size: 10; - min: 0 0; - align: 0.0 0.5; - text_class: "tizen"; - } - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 0; - text.min: 1 1; - rel1.offset: 0 4; - rel2.offset: 0 -5; - } - } - part { name: "background"; - mouse_events: 0; - scale: 1; - clip_to: "elm.background.progressbar"; - description { - state: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - offset: -1 -1; - } - image { - normal: "00_toolbar_progress_bg.png"; - border: 6 6 0 0; - } - } - } - part { name: "elm.text.status"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - rel1 { - to: "background"; - relative: 0.5 0.5; - } - rel2 { - to: "background"; - relative: 0.5 0.5; - } - text { - font: "Tizen:style=Roman"; - size: 10; - min: 0 0; - align: 0.5 0.0; - text_class: "tizen"; - } - color: PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 0; - text.min: 1 1; - } - } - part { name: "elm.progress.progressbar"; - mouse_events: 0; - scale: 1; - clip_to: "elm.background.progressbar"; - description { - state: "default" 0.0; - min: 0 0; - fixed: 1 1; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; - offset: -1 -1; - } - image { - normal: "00_toolbar_progress_bar.png"; - border: 6 6 0 0; - } - } - description { - state: "invert" 0.0; - inherit: "default" 0.0; - rel1 { - to_y: "elm.swallow.bar"; - to_x: "elm.cur.progressbar"; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - } - description { - state: "state_begin" 0.0; - inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.0 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 0.1 1.0; - } - } - description { - state: "state_end" 0.0; - inherit: "default" 0.0; - rel1 { - to: "elm.swallow.bar"; - relative: 0.9 0.0; - } - rel2 { - to: "elm.swallow.bar"; - relative: 1.0 1.0; - } - } - } - part { name: "text-bar"; - type: TEXT; - mouse_events: 0; - scale: 1; - clip_to: "progress-rect"; - //effect: SOFT_SHADOW; - scale: 0; - description { state: "default" 0.0; - align: 0.0 0.0; - fixed: 1 1; - visible: 0; - rel1.to: "elm.text.status"; - rel1.offset: -1 -1; - rel2.to: "elm.text.status"; - text { - text_source: "elm.text.status"; - font: "Tizen:style=Roman"; - size: 10; - min: 0 0; - align: 0.0 0.0; - text_class: "tizen"; - } - color: PROGRESSBAR_LIST_PROGRESS_STYLE_STATUS_TEXT_COLOR_INC; - } - description { state: "show" 0.0; - inherit: "default" 0.0; - visible: 0; - text.min: 1 1; - } - } - part { name: "elm.cur.progressbar"; - mouse_events: 0; - scale: 1; - dragable { - confine: "background"; - x: 1 1 1; - y: 0 0 0; - } - description { state: "default" 0.0; - min: 0 28; - fixed: 1 1; - visible: 0; - rel1 { - to: "background"; - relative: 0 0; - } - rel2.to: "background"; - } - } - part { name: "progress-rect"; - mouse_events: 0; - scale: 1; - type: RECT; - description { - state: "default" 0.0; - rel1.to: "elm.progress.progressbar"; - rel2.to: "elm.progress.progressbar"; - } - } - } - programs { - program { name: "label_show"; - signal: "elm,state,text,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.text"; - } - program { name: "label_hide"; - signal: "elm,state,text,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "icon_show"; - signal: "elm,state,icon,visible"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.content"; - } - program { name: "icon_hide"; - signal: "elm,state,icon,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - } - program { name: "units_show"; - signal: "elm,state,units,visible"; - source: "elm"; - action: STATE_SET "show" 0.0; - target: "text-bar"; - target: "elm.text.status"; - } - program { name: "units_hide"; - signal: "elm,state,units,hidden"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "text-bar"; - target: "elm.text.status"; - } - program { name: "slide_to_end"; - action: STATE_SET "state_end" 0.0; - transition: LINEAR 0.5; - target: "elm.progress.progressbar"; - after: "slide_to_begin"; - } - program { name: "slide_to_begin"; - signal: "elm,state,slide,begin"; - action: STATE_SET "state_begin" 0.0; - target: "elm.progress.progressbar"; - transition: LINEAR 0.5; - after: "slide_to_end"; - } - program { name: "start_pulse"; - signal: "elm,state,pulse,start"; - source: "elm"; - after: "slide_to_end"; - } - program { name: "stop_pulse"; - signal: "elm,state,pulse,stop"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; - after: "state_pulse"; - } - program { name: "state_pulse"; - signal: "elm,state,pulse"; - source: "elm"; - action: STATE_SET "state_begin" 0.0; - target: "elm.progress.progressbar"; - after: "units_hide"; - } - program { name: "state_fraction"; - signal: "elm,state,fraction"; - source: "elm"; - action: ACTION_STOP; - target: "slide_to_begin"; - target: "slide_to_end"; - target: "start_pulse"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "set_invert_on"; - signal: "elm,state,inverted,on"; - source: "elm"; - action: STATE_SET "invert" 0.0; - target: "elm.progress.progressbar"; - } - program { name: "set_invert_off"; - signal: "elm,state,inverted,off"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.progress.progressbar"; - } - } - } group { name: "elm/progressbar/horizontal/pending_list"; images {