Update volume layout 23/45523/1
authorjinwoo.shin <jw0227.shin@samsung.com>
Fri, 7 Aug 2015 05:45:58 +0000 (14:45 +0900)
committerjinwoo.shin <jw0227.shin@samsung.com>
Fri, 7 Aug 2015 05:45:58 +0000 (14:45 +0900)
Change-Id: I8fe96ecf828043f1a2d8f26cae4b4ce0eb5fb1eb
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
data/volume.edc
data/widget/progressbar.edc

index bb87aac..3b2472a 100644 (file)
@@ -58,6 +58,7 @@ collections {
                                part {
                                        name, PART_VOLUME_TEXT;
                                        type, TEXT;
+                                       effect, SHADOW;
                                        scale, 1;
                                        description {
                                                state, "default" 0.0;
@@ -69,6 +70,8 @@ collections {
                                                        align, 0.5 0.5;
                                                }
                                                color, 255 255 255 178;
+                                               color2, 0 0 0 78;
+                                               color3, 0 0 0 78;
                                                min, 62 36;
                                                align, 0.5 0.0;
                                                fixed, 1 1;
index a07849e..7990429 100644 (file)
  */
 
 
-group {
-       name: "elm/progressbar/horizontal/volume_progressbar";
-       parts {
-               part {
-                       name: "elm.background.progressbar";
-                       type: RECT;
-                       mouse_events: 0;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
+group { name: "elm/progressbar/vertical/volume_progressbar";
+   parts {
+      part { name: "elm.background.progressbar"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "elm.swallow.bar"; type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 6 4;
+            max: 6 9999;
+            fixed: 1 1;
+            align: 0.5 1.0;
+            rel1 {
+               to_y: "elm.text";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               to_y: "elm.text.box";
+               relative: 1.0 0.0;
+            }
+         }
+      }
+         part { name : "elm.padding.top"; type: SPACER;
+            scale: 1;
+                description { state: "default" 0.0;
+                   min: 0 1;
+                       fixed: 1 1;
+                   align: 0.0 0.0;
+                   rel1 {
+                          to_y: "elm.swallow.bar";
+                          relative: 0.0 0.0;
                        }
-               }
-               part {
-                       name: "elm.swallow.bar";
-                       type: SWALLOW;
-                       mouse_events: 0;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 28;
-                               max: 99999 28;
-                               rel1 {
-                                       to_x: "elm.text";
-                                       to_y: "elm.background.progressbar";
-                                       relative: 1.0 0.0;
-                               }
-                               rel2 {
-                                       to: "elm.background.progressbar";
-                               }
+                       rel2 {
+                          to_y: "elm.swallow.bar";
+                          relative: 1.0 0.0;
                        }
-               }
-               part {
-                       name: "elm.swallow.content";
-                       type: SWALLOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               visible: 0;
-                               align: 0.0 0.5;
-                               rel1 {
-                                       to_y: "elm.background.progressbar";
-                               }
-                               rel2 {
-                                       relative: 0.0 1.0;
-                                       to_y: "elm.background.progressbar";
-                               }
+                }
+         }
+      part { name : "elm.padding.bottom"; type: SPACER;
+            scale: 1;
+                description { state: "default" 0.0;
+                   min: 0 1;
+                       fixed: 1 1;
+                   align: 0.0 1.0;
+                   rel1 {
+                          to_y: "elm.swallow.bar";
+                          relative: 0.0 1.0;
                        }
-                       description {
-                               state: "visible" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
-                               aspect: 1.0 1.0;
-                               aspect_preference: VERTICAL;
+                       rel2 {
+                          to_y: "elm.swallow.bar";
+                          relative: 1.0 1.0;
                        }
-               }
-               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;
-                               rel2.to_x: "elm.swallow.content";
-                               rel2.relative: 1.0 1.0;
-                               color: 0 0 0 255;
-                               text {
-                                       font: "Sans,Edje-Vera";
-                                       size: 10;
-                                       min: 0 0;
-                                       align: 0.0 0.5;
-                                       ellipsis: -1;
-                               }
+                }
+         }
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 0.5 0.0;
+            rel1.to_x: "elm.swallow.bar";
+            rel2 {
+               relative: 1.0 0.0;
+               to_x: "elm.swallow.bar";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            aspect: 1.0 1.0;
+            aspect_preference: HORIZONTAL;
+         }
+      }
+      part { name: "elm.text"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 0.0;
+            rel1.to_y: "elm.swallow.content";
+            rel1.relative: 0.5 1.0;
+            rel2.to_y: "elm.swallow.content";
+            rel2.relative: 0.5 1.0;
+            color: 0 0 0 0;
+            text {
+               font: "Sans,Edje-Vera";
+               size: 10;
+               min: 0 0;
+               align: 0.5 0.0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            text.min: 1 1;
+            text.ellipsis: -1;
+         }
+      }
+      part { name: "background"; type: RECT; mouse_events: 0;
+         clip_to: "elm.background.progressbar";
+         description { state: "default" 0.0;
+            rel1.to: "elm.swallow.bar";
+            rel2.to: "elm.swallow.bar";
+            color: 0 0 0 76;
+         }
+      }
+      part { name: "elm.progress.progressbar"; type: RECT; mouse_events: 0;
+         clip_to: "elm.background.progressbar";
+         description { state: "default" 0.0;
+            min: 4 4;
+            max: 4 9999;
+            fixed: 1 1;
+            rel1 {
+               to_x: "elm.swallow.bar";
+               to_y: "elm.padding.top";
+                          relative: 0.0 1.0;
                        }
-                       description {
-                               state: "visible" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
-                               text.min: 1 1;
+            rel2 {
+               to_x: "elm.swallow.bar";
+               to_y: "elm.cur.progressbar";
+            }
+            color: 255 255 255 255;
+         }
+         description { state: "invert" 0.0;
+            inherit: "default" 0.0;
+            rel1 {
+               to_x: "elm.swallow.bar";
+               to_y: "elm.cur.progressbar";
+            }
+            rel2 {
+               to_x: "elm.swallow.bar";
+                          to_y: "elm.padding.bottom";
+               relative: 1.0 0.0;
                        }
-               }
-               part {
-                       name: "background";
-                       type: RECT;
-                       mouse_events: 0;
-                       clip_to: "elm.background.progressbar";
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 0 14;
-                               max: 9999 14;
-                               rel1.to: "elm.swallow.bar";
-                               rel2.to: "elm.swallow.bar";
-                               color, 0 0 0 76;
-                       }
-               }
-               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: "Sans:style=Bold,Edje-Vera-Bold";
-                                       size: 10;
-                                       min: 1 1;
-                                       align: 0.5 0.0;
-                                       ellipsis: -1;
-                               }
-                               color: 0 0 0 255;
-                       }
-                       description {
-                               state: "hidden" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 0;
-                               text.min: 0 0;
-                       }
-               }
-               part {
-                       name: "elm.progress.progressbar";
-                       type, RECT;
-                       mouse_events: 0;
-                       scale: 1;
-                       clip_to: "elm.background.progressbar";
-                       description {
-                               state: "default" 0.0;
-                               min: 0 14;
-                               max: 9999 14;
-                               fixed: 1 1;
-                               rel1.to: "elm.swallow.bar";
-                               rel2 {
-                                       to_y: "elm.swallow.bar";
-                                       to_x: "elm.cur.progressbar";
-                               }
-                               color, 255 255 255 255;
-                       }
-                       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";
-                       }
-                       description {
-                               state: "state_begin" 0.0;
-                               inherit: "default" 0.0;
-                               rel1.to: "elm.swallow.bar";
-                               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";
-                       }
-               }
-               part {
-                       name: "text-bar";
-                       type: TEXT;
-                       mouse_events: 0;
-                       clip_to: "progress-rect";
-                       effect: SOFT_SHADOW;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               align: 0.0 0.0;
-                               fixed: 1 1;
-                               visible: 0;
-                               rel1.to: "elm.text.status";
-                               rel2.to: "elm.text.status";
-                               text {
-                                       text_source: "elm.text.status";
-                                       font: "Sans:style=Bold,Edje-Vera-Bold";
-                                       size: 10;
-                                       min: 1 1;
-                                       align: 0.0 0.0;
-                                       ellipsis: -1;
-                               }
-                               color: 224 224 224 255;
-                               color3: 0 0 0 64;
-                       }
-                       description {
-                               state: "hidden" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 0;
-                               text.min: 0 0;
-                       }
-               }
-               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";
-                       type: RECT;
-                       mouse_events: 0;
-                       scale: 1;
-                       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 "default" 0.0;
-                       target: "text-bar";
-                       target: "elm.text.status";
-               }
-               program {
-                       name: "units_hide";
-                       signal: "elm,state,units,hidden";
-                       source: "elm";
-                       action:  STATE_SET "hidden" 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";
-               }
-        }
+         }
+         description { state: "state_begin" 0.0;
+            inherit: "default" 0.0;
+            rel1.to: "elm.swallow.bar";
+            rel2 {
+               to: "elm.swallow.bar";
+               relative: 1.0 0.1;
+            }
+         }
+         description { state: "state_end" 0.0;
+            inherit: "default" 0.0;
+            rel1 {
+               to: "elm.swallow.bar";
+               relative: 0.0 0.9;
+            }
+            rel2.to: "elm.swallow.bar";
+         }
+      }
+      part { name: "over1"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "elm.progress.progressbar";
+            rel2.to: "elm.progress.progressbar";
+            rel2.relative: 1.0 0.5;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "over2"; type: RECT; mouse_events: 1;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.progress.progressbar";
+            rel2.to: "elm.progress.progressbar";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "elm.cur.progressbar"; mouse_events: 0;
+         dragable {
+            confine: "background";
+            x: 0 0 0;
+            y: 1 1 1;
+         }
+         description { state: "default" 0.0;
+            min: 4 1;
+            max: 9999 1;
+            fixed: 1 1;
+            visible: 0;
+            rel1.to: "background";
+            rel2.to: "background";
+         }
+      }
+      part { name: "elm.text.box"; mouse_events: 0; type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1.to: "elm.text.status";
+            rel2.to: "elm.text.status";
+            color: 255 255 255 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.text.status"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            color: 0 0 0 0;
+            text {
+               font: "Sans:style=Bold,Edje-Vera-Bold";
+               size: 10;
+               min: 0 0;
+               align: 0.5 0.0;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            fixed: 1 1;
+            visible: 1;
+            text.min: 1 1;
+            text.ellipsis: -1;
+         }
+      }
+   }
+   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 "visible" 0.0;
+         target: "elm.text.status";
+         target: "elm.text.box";
+      }
+      program { name: "units_hide";
+         signal: "elm,state,units,hidden";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.text.status";
+         target: "elm.text.box";
+      }
+      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";
+         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";
+         action: STATE_SET "state_begin" 0.0;
+         target: "elm.progress.progressbar";
+         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";
+         target: "elm.cur.progressbar";
+      }
+      program { name: "set_invert_off";
+         signal: "elm,state,inverted,off";
+         source: "elm";
+         action:  STATE_SET "default" 0.0;
+         target: "elm.progress.progressbar";
+         target: "elm.cur.progressbar";
+      }
+   }
 }