Revert "Revert "Code clearance and height fix."" 84/93284/1
authorRadoslaw Czerski <r.czerski@samsung.com>
Fri, 21 Oct 2016 09:01:56 +0000 (11:01 +0200)
committerRadoslaw Czerski <r.czerski@samsung.com>
Fri, 21 Oct 2016 09:01:56 +0000 (11:01 +0200)
Previous revert was not necessary.

This reverts commit b75af15ad5fe9e502f520ed6084b0166b76074a3.

Change-Id: I36ea045b200218e09c81f07a5afc4d50150f8ec2
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>
inc/indicator.h
inc/indicator_gui.h
res/indicator.conf [deleted file]
res/resource/indicator_common.edc
res/resource/indicator_port.edc
res/resource/ticker.edc
res/resource/ticker_animated_icon.edc
src/main.c
src/modules/information/more_notify.c

index 6ae4b79..391a995 100644 (file)
@@ -177,7 +177,6 @@ typedef struct _ind_win_info
        Evas_Object *_dynamic_box_noti;
        Evas_Object *_alarm_box;
        Evas_Object *_digit_box;
-       Evas_Object *_more_noti_box;
 
        struct {
                int x;
index ffdcb1a..2f3ecc7 100644 (file)
 #define MESSAGE_ICON_HEIGHT 30
 #define MESSAGE_ICON_PADDING 12
 
-#define NONFIXED_DEFAULT_PADDING 25
-#define NONFIXED_DYNAMIC_PADDING 11
-#define FIXED4_DYNAMIC_PADDING 0
-#define FIXED2_PADDING  2
-#define FIXED1_PADDING 72
-#define FIXED0_PADDING 72
-#define LANDSCAPE_FIXED1_PADDING 122
-#define LANDSCAPE_FIXED0_PADDING 122
-
-#define HOME_PADDING_PORTRAIT 50
-#define HOME_PADDING_LANDSCAPE 50
-#define DEFAULT_NON_FIXED_PADDING 0
-
 #define INDI_DEFAULT_BG_COLOR 30 30 30 255
 #define INDI_DEFAULT_BG_TRANSLUCENT 0 0 0 125
 #define INDI_DEFAULT_BG_TRANSPARENT 0 0 0 0
diff --git a/res/indicator.conf b/res/indicator.conf
deleted file mode 100644 (file)
index 20a618d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-height = 48
-
index be42f5a..1d6d448 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "color_classes.edc"
 
-#define TEMP_SWALLOW_PART_FROM_LEFT( partName, rel_x, rel_y, MinWidth, MinHeight) \
+#define TEMP_SWALLOW_PART_FROM_LEFT( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part { \
                                name: partName; \
                                type: SWALLOW; \
@@ -27,8 +27,8 @@
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.5 0.5; \
@@ -36,7 +36,7 @@
                                } \
                        } \
 
-#define SWALLOW_PART_FROM_LEFT( partName, rel_x, rel_y, MinWidth, MinHeight) \
+#define SWALLOW_PART_FROM_LEFT( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part { \
                                name: partName; \
                                type: SWALLOW; \
@@ -44,8 +44,8 @@
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.0 0.5; \
@@ -53,7 +53,7 @@
                                } \
                        } \
 
-#define SWALLOW_PART_FROM_LEFT_WITH_SPACE( partName, rel_x, rel_y, MinWidth, MinHeight) \
+#define SWALLOW_PART_FROM_LEFT_WITH_SPACE( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part {\
                          name : "rect."partName; \
                          type : RECT;\
@@ -71,8 +71,8 @@
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.0 0.5; \
                                } \
                                description { \
                                        state: "hide" 0.0; \
-                                       min: 0 MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
+                                       inherit: "default"; \
                                        visible: 0; \
                                } \
                        } \
 
-#define SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( partName, rel_x, rel_y, MinWidth, MinHeight, MaxHeight) \
+#define SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part {\
                          name : "rect."partName; \
                          type : RECT;\
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.0 0.5; \
                                } \
                                description { \
                                        state: "hide" 0.0; \
-                                       max: 0 MaxHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
+                                       inherit: "default"; \
                                        visible: 0; \
                                } \
                        } \
 
-#define SWALLOW_PART_FROM_LEFT_WITH_EFFECT( partName, rel_x, rel_y, MinWidth, MinHeight) \
-                       part { \
-                               name: partName; \
-                               type: SWALLOW; \
-                               mouse_events: 0; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       visible: 1; \
-                               } \
-                               description { \
-                                       state: "show" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       visible: 1; \
-                               } \
-                       } \
-
-#define SWALLOW_PART_FROM_LEFT_WITH_EFFECT2( partName, rel_x, rel_y, MinWidth, MinHeight) \
-                       part { \
-                               name: partName; \
-                               type: SWALLOW; \
-                               mouse_events: 0; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       visible: 1; \
-                               } \
-                               description { \
-                                       state: "show" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       visible: 1; \
-                               } \
-                       } \
-
-#define SWALLOW_PART_FROM_CENTER( partName, rel_x_left, rel_x_right, rel_y, MinWidth, MinHeight) \
+#define SWALLOW_PART_FROM_RIGHT( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part { \
                                name: partName; \
                                type: SWALLOW; \
-                               mouse_events: 0; \
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x_left; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x_right; to_y: rel_y; } \
-                                       align: 0.5 0.5; \
-                                       visible: 1; \
-                               } \
-                       } \
-
-#define SWALLOW_PART_FROM_RIGHT( partName, rel_x, rel_y, MinWidth, MinHeight) \
-                       part { \
-                               name: partName; \
-                               type: SWALLOW; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       visible: 1; \
-                               } \
-                       } \
-
-#define SWALLOW_PART_FROM_RIGHT_WITH_SPACE( partName, rel_x, rel_y, MinWidth, MinHeight) \
-                       part { \
-                               name: partName; \
-                               type: SWALLOW; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       visible: 1; \
-                               } \
-                               description { \
-                                       state: "hide" 0.0; \
-                                       min: 0 MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       visible: 0; \
-                               } \
-                       } \
-
-#define SWALLOW_PART_FROM_RIGHT_WITH_EFFECT( partName, rel_x, rel_y, MinWidth, MinHeight) \
-                       part { \
-                               name: partName; \
-                               type: SWALLOW; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       visible: 1; \
-                               } \
-                               description { \
-                                       state: "show" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 1.0 0.5; \
                                } \
                        } \
 
-#define SWALLOW_PART_FROM_RIGHT_WITH_EFFECT2( partName, rel_x, rel_y, MinWidth, MinHeight) \
+#define SWALLOW_PART_FROM_RIGHT_WITH_SPACE( partName, rel_x, rel_y, MaxWidth, MaxHeight) \
                        part { \
                                name: partName; \
                                type: SWALLOW; \
-                               mouse_events: 0; \
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
+                                       max: MaxWidth MaxHeight; \
+                                       fixed: 1 1; \
                                        rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 1.0 0.5; \
                                } \
                                description { \
                                        state: "show" 0.0; \
-                                       min: MinWidth MinHeight; \
-                                       fixed: 1 0; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       visible: 1; \
+                                       inherit: "default"; \
+                                       visible: 0; \
                                } \
                        } \
 
-#define FIXED_RECT_FROM_LEFT( rectName, rel_x, rel_y, MinWidth, colorValue, visibleValue) \
+#define FIXED_RECT_FROM_LEFT( rectName, rel_x, rel_y, MaxWidth, colorValue, visibleValue) \
                        part { \
                                name: rectName; \
                                type: RECT; \
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
+                                       max: MaxWidth -1; \
+                                       fixed: 1 0; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.0 0.5; \
                                description { \
                                        state: "hide" 0.0; \
                                        inherit: "default" 0.0; \
-                                       min: 0 0; \
                                        visible: 0; \
                                } \
                        } \
 
-#define FIXED_RSSI_RECT_FROM_LEFT_WITH_CONSTRICTION( rectName, rel_x, rel_y, MinWidth, MaxHeight, colorValue, visibleValue) \
+#define FIXED_RSSI_RECT_FROM_LEFT_WITH_CONSTRICTION( rectName, rel_x, rel_y, MaxWidth, MaxHeight, colorValue, visibleValue) \
                        part { \
                                name: rectName; \
                                type: RECT; \
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
+                                       max: MaxWidth -1; \
+                                       fixed: 1 0; \
                                        rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 0.0 0.5; \
                                } \
                        } \
 
-#define FIXED_RECT_FROM_RIGHT( rectName, rel_x, rel_y, MinWidth, colorValue, visibleValue) \
+#define FIXED_RECT_FROM_RIGHT( rectName, rel_x, rel_y, MaxWidth, colorValue, visibleValue) \
                        part { \
                                name: rectName; \
                                type: RECT; \
                                scale: 1; \
                                description { \
                                        state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
+                                       max: MaxWidth -1; \
+                                       fixed: 1 0; \
                                        rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
                                        rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
                                        align: 1.0 0.5; \
                                } \
                        } \
 
-#define DYNAMIC_RECT_FROM_RIGHT( rectName, rel_x, rel_y, MinWidth, changeWidth, colorValue, visibleValue) \
-                       part { \
-                               name: rectName; \
-                               type: RECT; \
-                               mouse_events: 0; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 1.0 0.5; \
-                                       color : colorValue; \
-                                       visible: visibleValue; \
-                               } \
-                               description { \
-                                       state: "changePad" 0.0; \
-                                       min: changeWidth 0; \
-                                       fixed: 1 1; \
-                                       rel1 { relative: 0.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 0.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       color : colorValue; \
-                                       visible: visibleValue; \
-                                       align: 1.0 0.5; \
-                               } \
-                       } \
-
-#define DYNAMIC_RECT_FROM_LEFT( rectName, rel_x, rel_y, MinWidth, changeWidth, colorValue, visibleValue) \
-                       part { \
-                               name: rectName; \
-                               type: RECT; \
-                               mouse_events: 0; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       color : colorValue; \
-                                       visible: visibleValue; \
-                               } \
-                               description { \
-                                       state: "changePad" 0.0; \
-                                       min: changeWidth 0; \
-                                       fixed: 1 1; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       color : colorValue; \
-                                       visible: visibleValue; \
-                                       align: 0.0 0.5; \
-                               } \
-                       } \
-
-
 #define PART_SWALLOW_SET( partName, lPadding, rPadding) \
                        part { \
                                name: partName; \
index a429dc3..29dd527 100644 (file)
@@ -63,22 +63,6 @@ collections {
                                name: "textblock_outline_style";
                                base: "font=Tizen:style=Bold text_class=tizen color=#FFFFFFFF";
                        }
-                       style {
-                               name: "message_style";
-                               base: "font=Tizen:style=Regular text_class=tizen font_size=29 color=#FFFFFFFF valign=middle wrap=none ellipsis=1";
-                       }
-                       style {
-                               name: "message_style2";
-                               base: "font=Tizen:style=Regular text_class=tizen font_size=29 color=#FFFFFFFF valign=middle wrap=none ellipsis=1";
-                       }
-                       style {
-                               name: "message_style_compare";
-                               base: "font=Tizen:style=Regular text_class=tizen font_size=29 color=#FFFFFFFF valign=middle wrap=none ellipsis=0";
-                       }
-                       style {
-                               name: "plmn_style";
-                               base: "font=Tizen:style=Bold text_class=tizen font_size=35 color=#FFFFFFFF valign=middle wrap=none ellipsis=1";
-                       }
                }
 
                images {
@@ -101,7 +85,8 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 INDICATOR_HEIGHT;
+                                       max: -1 INDICATOR_HEIGHT;
+                                       fixed: 0 1;
                                        color_class: "bg_default";
                                }
                                description {
@@ -126,78 +111,6 @@ collections {
                                }
                        }
                        part {
-                               name: "padding.top";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 INDICATOR_PADDING_H;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 0.0; to: "background"; }
-                                       rel2 { relative: 1.0 0.0; to: "background"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "padding.bottom";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 INDICATOR_PADDING_H;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to: "background"; }
-                                       rel2 { relative: 1.0 1.0; to: "background"; }
-                                       align: 0.0 1.0;
-                                       visible: 0;
-                               }
-
-                       }
-                       /* Left padding */
-                       part {
-                               name: "resize_padding.left";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; }
-                                       rel2 { relative: 0.0 1.0; to: "elm.rect.bg"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 1 0;
-                                       color: 255 0 0 255;
-                               }
-                               description {
-                                       state: "2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 2 0;
-                                       color: 0 255 0 255;
-                               }
-                               description {
-                                       state: "3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 3 0;
-                                       color: 0 0 255 255;
-                               }
-
-                               description {
-                                       state: "4" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 4 0;
-                                       color: 255 255 0 255;
-                               }
-                       }
-                       part {
                                name: "padding.left";
                                type: RECT;
                                scale: 1;
@@ -218,48 +131,6 @@ collections {
                                        min: 72 0;
                                }
                        }
-                       /* Right padding */
-                       part {
-                               name: "resize_padding.right";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.0; to: "elm.rect.bg"; }
-                                       rel2 { relative: 1.0 1.0; to: "elm.rect.bg"; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "1" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 1 0;
-                                       color: 255 0 0 255;
-                               }
-                               description {
-                                       state: "2" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 2 0;
-                                       color: 0 255 0 255;
-                               }
-                               description {
-                                       state: "3" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 3 0;
-                                       color: 0 0 255 255;
-                               }
-
-                               description {
-                                       state: "4" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 4 0;
-                                       color: 255 255 0 255;
-                               }
-
-                       }
                        part {
                                name: "padding.right";
                                type: RECT;
@@ -280,19 +151,6 @@ collections {
                                        inherit: "default" 0.0;
                                        min: 72 0;
                                }
-                               description {
-                                       state: "dynamic" 0.0;
-                                       inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 1.0 0.0; to: "resize_padding.right";
-                                               offset : 73 0;
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0; to: "resize_padding.right";
-                                               offset : 73 0;
-                                       }
-                                       align: 1.0 0.0;
-                               }
 
                        }
                        part {
@@ -353,265 +211,14 @@ collections {
                                description {
                                        state: "notification" 0.0;
                                        inherit: "default" 0.0;
-                               }
-                               description {
-                                       state: "transparent_slide" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                               description {
-                                       state: "transparent" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "elm.rect.bg.call";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "elm.rect.bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "elm.rect.bg";
-                                       }
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "during_call" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class:"AO005";
-                                       visible : 1;
-                               }
-                               description {
-                                       state: "call_hold" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class:"AO007";
-                                       visible : 1;
-                               }
-                               description {
-                                       state: "call_end" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class:"AO006";
-                                       visible : 1;
-                               }
-                       }
-
-                       part {
-                               name: "elm.rect.right_con";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: HOME_PADDING_PORTRAIT 0;
-                                       visible: 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to: "elm.rect.bg"; }
-                                       rel2 { relative: 0.0 1.0; to: "elm.rect.bg"; }
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "icon_bg";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       rel1 { relative: 1.0 0.0; to_x: padding.left; to_y: elm.rect.bg; }
-                                       rel2 { relative: 0.0 1.0; to_x: elm.swallow.connection/system; to_y: elm.rect.bg; }
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "plmn.bg";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       min: 0 INDICATOR_HEIGHT;
-                                       fixed: 0 1;
-                                       rel1 { relative: 1.0 1.0; to_x: padding.left; to_y: elm.swallow.more_noti; }
-                                       rel2 { relative: 0.0 1.0; to_x: padding.right; to_y: elm.swallow.more_noti; }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "plmn.padding.left";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: MESSAGE_PADDING 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "plmn.bg";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to: "plmn.bg";
-                                       }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "plmn.text";
-                               type: TEXTBLOCK;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       visible: 1;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "plmn.padding.left";
-                                               to_y: "plmn.bg";
-                                       }
-
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "plmn.padding.right";
-                                               to_y: "plmn.bg";
-                                       }
-                                       text {
-                                               style: "plmn_style";
-                                               min: 0 1;
-                                       }
-                               }
-                       }
-                       part {
-                               name: "plmn.padding.right";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "plmn.bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "plmn.bg";
-                                       }
-                                       align: 1.0 0.0;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
-                               name: elm.swallow.fixed0;
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-#ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: HOME_PADDING_PORTRAIT DEFAULT_ICON_HEIGHT;
-#else
-                                       min: 0 0;
-#endif
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.0; to_x: padding.left; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 1.0 1.0; to_x: padding.left; to_y: elm.rect.right_con; }
-                                       align: 0.0 0.5;
-                                       visible: 1;
-                               }
-                       }
-                       part {
-                               name: "padding.separator";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-#ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: PADDING_WIDTH/2 0;
-#else
-                                       min: 0 0;
-#endif
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to_x: elm.swallow.connection/system; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 0.0 1.0; to_x: elm.swallow.connection/system; to_y: elm.rect.right_con; }
-                                       align: 1.0 0.5;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 1;
-                               }
-                       }
-
-                       /* Separator Padding */
-                       part {
-                               name: "seperator.image";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-#ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: 3 44;
-#else
-                                       min: 0 0;
-#endif
-                                       fixed: 1 1;
-                                       image.normal: "B03_search_divider.png";
-                                       color_class:"AO004";
-                                       rel1 { relative: 0.0 0.5; to_x: padding.separator; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 0.0 0.5; to_x: padding.separator; to_y: elm.rect.right_con; }
-                                       align: 1.0 0.5;
-                                       visible : 1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 1;
-                                       visible : 0;
-                               }
-                       }
-
-                       part {
-                               name: "padding.separator2";
-                               type: SPACER;
-                               mouse_events: 0;
-                               scale: 1;
+                               }
                                description {
-                                       state: "default" 0.0;
-#ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: PADDING_WIDTH 0;
-#else
-                                       min: 0 0;
-#endif
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to_x: seperator.image; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 0.0 1.0; to_x: seperator.image; to_y: elm.rect.right_con; }
-                                       align: 1.0 0.5;
+                                       state: "transparent_slide" 0.0;
+                                       inherit: "default" 0.0;
                                }
                                description {
-                                       state: "hide" 0.0;
+                                       state: "transparent" 0.0;
                                        inherit: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 1;
                                }
                        }
 
@@ -677,7 +284,7 @@ collections {
 
                        /* ICON_FIXED4 (RSSI 2) + PADDING_FIXED5(RIGHT, FIXED PADDING) */
                        FIXED_RSSI_RECT_FROM_LEFT_WITH_CONSTRICTION( "elm.rect.rssi2", "elm.swallow.fixed1", "elm.rect.bg", DEFAULT_ICON_PADDING, DEFAULT_ICON_WIDTH, INDI_DEFAULT_BG_TEST, 0)
-                       SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( "elm.swallow.fixed2", "elm.rect.rssi2", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT, DEFAULT_ICON_WIDTH)
+                       SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( "elm.swallow.fixed2", "elm.rect.rssi2", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT)
 
                        /* ICON_FIXED1 (Connection-3G) + PADDING_NONFIXED1(RIGHT,DYNAMIC PADDING) */
                        FIXED_RECT_FROM_LEFT( "elm.rect.connection", "elm.swallow.fixed2", "elm.rect.bg", DEFAULT_ICON_PADDING, INDI_DEFAULT_BG_TEST, 0)
@@ -809,461 +416,163 @@ collections {
                        //////////////////////////////////////////
 
                        /* System (Sound Profile, Alarm, GPS) */
-                       FIXED_RECT_FROM_RIGHT( "elm.rect.system", "elm.swallow.fixed8", "elm.rect.bg", DEFAULT_ICON_PADDING, 255 0 0 255, 0)
+                       FIXED_RECT_FROM_RIGHT( "elm.rect.system", "elm.swallow.fixed8", "elm.rect.bg", DEFAULT_ICON_PADDING, 255 0 0 255, 1)
                        SWALLOW_PART_FROM_RIGHT_WITH_SPACE( "elm.swallow.system", "elm.rect.system", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
 
                        /* MiniCtrl (Call, Music/FM Radio, Voice recorder) */
-                       FIXED_RECT_FROM_RIGHT( "elm.rect.minictrl", "elm.swallow.system", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 255 0 255, 0)
+                       FIXED_RECT_FROM_RIGHT( "elm.rect.minictrl", "elm.swallow.system", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 255 0 255, 1)
                        SWALLOW_PART_FROM_RIGHT_WITH_SPACE( "elm.swallow.minictrl", "elm.rect.minictrl", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
 
                        /* NOTI(R1~R5) */
-                       FIXED_RECT_FROM_RIGHT( "elm.rect.noti", "elm.swallow.minictrl", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 0 255 255, 0)
+                       FIXED_RECT_FROM_RIGHT( "elm.rect.noti", "elm.swallow.minictrl", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 0 255 255, 1)
                        SWALLOW_PART_FROM_RIGHT_WITH_SPACE( "elm.swallow.noti", "elm.rect.noti", "elm.rect.bg", 0, 0)
 
                        /* more */
-                       FIXED_RECT_FROM_RIGHT( "elm.rect.more_noti", "elm.swallow.noti", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 0 255 255, 0)
-                       SWALLOW_PART_FROM_RIGHT_WITH_EFFECT( "elm.swallow.more_noti", "elm.rect.more_noti", "elm.rect.bg", 0, 0)
-
-#ifdef _SUPPORT_SCREEN_READER
-                       part {
-                               name: elm.swallow.fixed9.access;
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       rel1.to: elm.swallow.fixed9;
-                                       rel2.to: elm.swallow.fixed9;
-                                       visible: 1;
-                                       color:0 0 0 0;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 0;
-                               }
-                       }
-#endif
-                       part {
-                               name: elm.swallow.fixed9;
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-#ifndef _INDICATOR_REMOVE_SEARCH
-                                       min: HOME_PADDING_PORTRAIT DEFAULT_ICON_HEIGHT;
-#else
-                                       min: 0 0;
-#endif
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to_x: padding.right; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 0.0 1.0; to_x: padding.right; to_y: elm.rect.right_con; }
-                                       align: 1.0 0.5;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 0 0;
-                                       fixed:1 0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "elm.image.plmn";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       color: 100 100 100 100;
-                                       rel1 { relative: 0.0 0.5; to_x: elm.swallow.fixed8; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 0.0 0.5; to_x: elm.swallow.fixed8; to_y: elm.rect.right_con; }
-                                       align: 1.0 0.5;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 112 31;
-                                       fixed: 1 1;
-                                       image {
-                                       normal:"B03_OrangeF.png";
-                                       }
-                                       color_class:"AO004";
-                                       visible: 1;
-                               }
-                       }
-                       part {
-                               name: "plmn_dynamic.padding.left";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.5; to_x: elm.swallow.fixed9; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 1.0 0.5; to_x: elm.swallow.fixed9; to_y: elm.rect.right_con; }
-                                       color : 255 0 0 125;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 30 0;
-                                       fixed: 1 0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "elm.image.plmn_dynamic";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.5; to_x:plmn_dynamic.padding.left; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 1.0 0.5; to_x:plmn_dynamic.padding.left; to_y: elm.rect.right_con; }
-                                       align: 0.0 0.5;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 112 31;
-                                       fixed: 1 1;
-                                       image {
-                                       normal:"B03_OrangeF.png";
-                                       }
-                                       visible: 1;
-                               }
-                       }
-                       part {
-                               name: "plmn_dynamic.padding.right";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.5; to_x: elm.image.plmn_dynamic; to_y: elm.rect.right_con; }
-                                       rel2 { relative: 1.0 0.5; to_x: elm.image.plmn_dynamic; to_y: elm.rect.right_con; }
-                                       color : 255 0 0 125;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 5 0;
-                                       fixed: 1 0;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "clock.padding.left";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 5 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 0.0 0.0; to_x: elm.text.clock; to_y: elm.rect.bg; }
-                                       rel2 { relative: 0.0 1.0; to_x: elm.text.clock; to_y: elm.rect.bg; }
-                                       align: 1.0 0.5;
-                                       visible: 0;
-                               }
-                       }
-
-                       part {
-                               name: "elm.text.clock";
-                               type: TEXTBLOCK;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 1.0 0.0; to: "elm.rect.bg"; }
-                                       rel2 { relative: 0.0 1.0; to: "elm.rect.bg"; }
-                                       align: 0.5 0.5;
-                                       fixed: 1 1;
-                                       text {
-                                               min: 1 1;
-                                               style: "textblock_style";
-                                               align: 0.5 0.5;
-                                               ellipsis: -1;
-                                       }
-                               }
-                               description {
-                                       state: "set_color" 0.0;
-                                       inherit: "default" 0.0;
-                                       text {
-                                               style: "textblock_outline_style";
-                                       }
-                               }
-                               description {
-                                       state: "size24" 0.0;
-                                       inherit: "default" 0.0;
-                                       text {
-                                               style: "textblock_style_24";
-                                       }
-                               }
-                               description {
-                                       state: "invisible" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible:0;
-                               }
-                       }
-                       part {
-                               name: "clock.padding.right";
-                               type: RECT;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 2 0;
-                                       fixed: 1 0;
-                                       rel1 { relative: 1.0 0.0; to_x: "elm.text.clock"; to_y: "elm.rect.bg"; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.text.clock"; to_y: "elm.rect.bg"; }
-                                       align: 1.0 0.5;
-                                       visible: 0;
-                               }
-                       }
-                       part {
-                               name: "indicator.alarm.icon";
-                               type: SWALLOW;
-                               mouse_events: 0;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                                       rel1 { relative: 1.0 0.0; to_x: "clock.padding.right"; to_y: "elm.rect.bg"; }
-                                       rel2 { relative: 1.0 1.0; to_x: "clock.padding.right"; to_y: "elm.rect.bg"; }
-                                       fixed: 1 0;
-                                       align: 0.0 0.0;
-                               }
-                       }
-
-#ifdef _SUPPORT_SCREEN_READER
-                       part {
-                               name: "elm.rect.clock.access";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed5"; to_y: "elm.swallow.fixed5"; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.rect.clock"; to_y: "elm.rect.clock"; }
-                                       visible: 1;
-                                       color:0 0 0 0;
-                               }
-                       }
-#endif
-
-                       part {
-                               name: "message.bg";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 INDICATOR_HEIGHT;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 -1.0; to: "elm.rect.bg.base"; }
-                                       rel2 { relative: 1.0 0.0; to: "elm.rect.bg.base"; }
-                                       align: 0.0 1.0;
-                                       color: INDI_DEFAULT_BG_TRANSPARENT;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "transparent" 0.0;
-                                       inherit: "default" 0.0;
-                               }
-                       }
-
-                       part {
-                               name: "message.padding.left";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: MESSAGE_PADDING 0;
-                                       fixed: 1 0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "message.bg";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to: "message.bg";
-                                       }
-                                       align: 0.0 0.0;
-                                       visible: 0;
-                               }
-                               description {
-                                       state: "scover" 0.0;
-                                       inherit: "default" 0.0;
-                                       min: 72 0;
-                               }
-                       }
+                       FIXED_RECT_FROM_RIGHT( "elm.rect.more_noti", "elm.swallow.noti", "elm.rect.bg", DEFAULT_ICON_PADDING, 0 0 255 255, 1)
+
+#ifdef _SUPPORT_SCREEN_READER
                        part {
-                               name: "message.padding.right";
+                               name: elm.swallow.fixed9.access;
                                type: RECT;
                                scale: 1;
-                               mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       min: MESSAGE_PADDING 0;
                                        fixed: 1 0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "message.bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "message.bg";
-                                       }
-                                       align: 1.0 0.0;
-                                       visible: 0;
+                                       rel1.to: elm.swallow.fixed9;
+                                       rel2.to: elm.swallow.fixed9;
+                                       visible: 1;
+                                       color:0 0 0 0;
                                }
                                description {
-                                       state: "scover" 0.0;
+                                       state: "hide" 0.0;
                                        inherit: "default" 0.0;
-                                       min: 72 0;
+                                       visible: 0;
                                }
                        }
+#endif
+
                        part {
-                               name: "message.padding.top";
-                               type: RECT;
+                               name: "elm.swallow.more_noti";
+                               type: SWALLOW;
                                scale: 1;
-                               mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 INDICATOR_PADDING_H;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 0.0; to: "message.bg"; }
-                                       rel2 { relative: 1.0 0.0; to: "message.bg"; }
-                                       align: 0.0 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       fixed: 1 1;
+                                       rel2 {
+                                               relative: 0.0 1.0;
+                                               to_x: "elm.rect.more_noti";
+                                               to_y: "elm.rect.bg";
+                                       }
+                                       align: 1.0 0.5;
                                        visible: 0;
                                }
+                               description {
+                                       state: "show" 0.0;
+                                       inherit: "default";
+                                       visible: 1;
+                               }
                        }
+
                        part {
-                               name: "message.padding.bottom";
+                               name: "clock.padding.left";
                                type: RECT;
-                               scale: 1;
                                mouse_events: 0;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 INDICATOR_PADDING_H;
-                                       fixed: 0 1;
-                                       rel1 { relative: 0.0 1.0; to: "message.bg"; }
-                                       rel2 { relative: 1.0 1.0; to: "message.bg"; }
-                                       align: 0.0 1.0;
+                                       min: 5 0;
+                                       fixed: 1 0;
+                                       rel1 { relative: 0.0 0.0; to_x: elm.text.clock; to_y: elm.rect.bg; }
+                                       rel2 { relative: 0.0 1.0; to_x: elm.text.clock; to_y: elm.rect.bg; }
+                                       align: 1.0 0.5;
                                        visible: 0;
                                }
-
                        }
+
                        part {
-                               name: "message.text";
+                               name: "elm.text.clock";
                                type: TEXTBLOCK;
                                scale: 1;
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
+                                       rel1 { relative: 1.0 0.0; to: "elm.rect.bg"; }
+                                       rel2 { relative: 0.0 1.0; to: "elm.rect.bg"; }
+                                       align: 0.5 0.5;
                                        fixed: 1 1;
-                                       visible: 1;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to_x: "message.padding.left";
-                                               to_y: "message.bg";
-                                       }
-
-                                       rel2 {
-                                               relative: 0.0 1.0;
-                                               to_x: "message.padding.right";
-                                               to_y: "message.bg";
-                                       }
                                        text {
-                                               style: "message_style";
-                                               min: 0 1;
+                                               min: 1 1;
+                                               style: "textblock_style";
+                                               align: 0.5 0.5;
+                                               ellipsis: -1;
                                        }
                                }
                                description {
-                                       state: "line2" 0.0;
+                                       state: "set_color" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to_x: "message.padding.left";
-                                               to_y: "message.bg";
-                                       }
-
-                                       rel2 {
-                                               relative: 0.0 2.0;
-                                               to_x: "message.padding.right";
-                                               to_y: "message.bg";
+                                       text {
+                                               style: "textblock_outline_style";
                                        }
+                               }
+                               description {
+                                       state: "size24" 0.0;
+                                       inherit: "default" 0.0;
                                        text {
-                                               style: "message_style2";
-                                               min: 0 1;
+                                               style: "textblock_style_24";
                                        }
-                                       visible: 0;
+                               }
+                               description {
+                                       state: "invisible" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible:0;
                                }
                        }
                        part {
-                               name: "message.text.compare";
-                               type: TEXTBLOCK;
-                               scale: 1;
+                               name: "clock.padding.right";
+                               type: RECT;
                                mouse_events: 0;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
+                                       min: 2 0;
+                                       fixed: 1 0;
+                                       rel1 { relative: 1.0 0.0; to_x: "elm.text.clock"; to_y: "elm.rect.bg"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.text.clock"; to_y: "elm.rect.bg"; }
+                                       align: 1.0 0.5;
                                        visible: 0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "message.text";
-                                       }
-                                       rel2 {
-                                               relative: 3.0 1.0;
-                                               to: "message.text";
-                                       }
-                                       text {
-                                               style: "message_style_compare";
-                                               min: 0 1;
-                                       }
                                }
                        }
                        part {
-                               name: "message.line2.text";
-                               type: TEXTBLOCK;
-                               scale: 1;
+                               name: "indicator.alarm.icon";
+                               type: SWALLOW;
                                mouse_events: 0;
+                               scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       fixed: 1 1;
-                                       visible: 1;
-                                       rel1 {
-                                               relative: 1.0 -1.0;
-                                               to_x: "message.padding.left";
-                                               to_y: "message.text";
-                                       }
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       rel1 { relative: 1.0 0.0; to_x: "clock.padding.right"; to_y: "elm.rect.bg"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "clock.padding.right"; to_y: "elm.rect.bg"; }
+                                       fixed: 1 0;
+                                       align: 0.0 0.0;
+                               }
+                       }
 
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to_x: "message.padding.right";
-                                               to_y: "message.text";
-                                       }
-                                       text {
-                                               style: "message_style";
-                                               min: 0 1;
-                                       }
+#ifdef _SUPPORT_SCREEN_READER
+                       part {
+                               name: "elm.rect.clock.access";
+                               type: RECT;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; to_x: "elm.swallow.fixed5"; to_y: "elm.swallow.fixed5"; }
+                                       rel2 { relative: 1.0 1.0; to_x: "elm.rect.clock"; to_y: "elm.rect.clock"; }
+                                       visible: 1;
+                                       color:0 0 0 0;
                                }
                        }
+#endif
                }
 
                programs {
@@ -1293,7 +602,6 @@ collections {
                                        }
                                }
                        }
-
                        program {
                                name: "message.show.effect";
                                action: STATE_SET "hide" 0.0;
@@ -1301,7 +609,6 @@ collections {
                                target: "elm.rect.bg.base";
                                transition: LINEAR 0.3;
                        }
-
                        program {
                                name: "message.show.noeffect";
                                action: STATE_SET "hide" 0.0;
@@ -1309,7 +616,6 @@ collections {
                                source: "indicator.prog";
                                target: "elm.rect.bg.base";
                        }
-
                        program {
                                name: "message.hide";
                                action: STATE_SET "default" 0.0;
@@ -1317,31 +623,6 @@ collections {
                                source: "indicator.prog";
                                target: "elm.rect.bg.base";
                                transition: LINEAR 0.3;
-                               after:message.line2.hide.noeffect;
-                       }
-                       program {
-                               name: "message.line2.show";
-                               action: STATE_SET "line2" 0.0;
-                               signal: "message.line2.show";
-                               source: "indicator.prog";
-                               target: "message.text";
-                               transition: LINEAR 0.3;
-                       }
-
-                       program {
-                               name: "message.line2.hide";
-                               action: STATE_SET "default" 0.0;
-                               signal: "message.line2.hide";
-                               source: "indicator.prog";
-                               target: "message.text";
-                               transition: LINEAR 0.3;
-                       }
-                       program {
-                               name: "message.line2.hide.noeffect";
-                               action: STATE_SET "default" 0.0;
-                               signal: "message.line2.hide.noeffect";
-                               source: "indicator.prog";
-                               target: "message.text";
                        }
                        /*********************************************************
                         *
@@ -1356,7 +637,6 @@ collections {
                                source: "indicator.prog";
                                target: "background";
                        }
-
                        program {
                                name: "bg_color_call_incoming";
                                signal: "bg.color.call.incoming";
@@ -1365,7 +645,6 @@ collections {
                                        set_state(PART:"background", "incoming_call", 0.0);
                                }
                        }
-
                        program {
                                name: "bg_color_call_end";
                                signal: "bg.color.call.end";
@@ -1374,7 +653,6 @@ collections {
                                        set_state(PART:"background", "end_call", 0.0);
                                }
                        }
-
                        program {
                                name: "bg_color_call_on_hold";
                                signal: "bg.color.call.onhold";
@@ -1383,7 +661,6 @@ collections {
                                        set_state(PART:"background", "on_hold", 0.0);
                                }
                        }
-
                        program {
                                name: "bg_opaque";
                                action: STATE_SET "default" 0.0;
@@ -1392,9 +669,7 @@ collections {
                                script {
                                        set_int(bg_set, 0);
                                        set_state(PART:"elm.rect.bg", "opaque", 0.0);
-                                       set_state(PART:"message.bg", "transparent", 0.0);
                                }
-
                        }
                        program {
                                name: "bg_translucent";
@@ -1404,9 +679,7 @@ collections {
                                script {
                                        set_int(bg_set, 1);
                                        set_state(PART:"elm.rect.bg", "translucent", 0.0);
-                                       set_state(PART:"message.bg", "transparent", 0.0);
                                }
-
                        }
                        program {
                                name: "bg_transparent";
@@ -1415,9 +688,7 @@ collections {
                                script {
                                        set_int(bg_set, 2);
                                        set_state(PART:"elm.rect.bg", "transparent", 0.0);
-                                       set_state(PART:"message.bg", "transparent", 0.0);
                                }
-
                        }
                        program {
                                name: "bg_notification";
@@ -1426,31 +697,7 @@ collections {
                                script {
                                        set_int(bg_set, 3);
                                        set_state(PART:"elm.rect.bg", "notification", 0.0);
-                                       set_state(PART:"message.bg", "transparent", 0.0);
                                }
-
-                       }
-
-                       program {
-                               name: "indicator.lock.on";
-                               action: STATE_SET "hide" 0.0;
-                               signal: "indicator.lock.on";
-                               source: "indicator.prog";
-                               target: "elm.swallow.connection/system";
-                               target: "seperator.image";
-                               target: "padding.separator";
-                               target: "padding.separator2";
-                       }
-
-                       program {
-                               name: "indicator.lock.off";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.lock.off";
-                               source: "indicator.prog";
-                               target: "elm.swallow.connection/system";
-                               target: "seperator.image";
-                               target: "padding.separator";
-                               target: "padding.separator2";
                        }
 
                        /* Battery */
@@ -1461,7 +708,6 @@ collections {
                                source: "indicator.prog";
                                target: "elm.swallow.fixed8";
                        }
-
                        program {
                                name: "indicator.battery.percentage.hide";
                                action: STATE_SET "default" 0.0;
@@ -1469,7 +715,6 @@ collections {
                                source: "indicator.prog";
                                target: "elm.swallow.fixed8";
                        }
-
                        program {
                                name: "indicator.battery.percentage.one.digit.show";
                                action: STATE_SET "default" 0.0;
@@ -1477,7 +722,6 @@ collections {
                                source: "indicator.prog";
                                target: "percentage.digit.box";
                        }
-
                        program {
                                name: "indicator.battery.percentage.two.digits.show";
                                action: STATE_SET "two_digits" 0.0;
@@ -1485,7 +729,6 @@ collections {
                                source: "indicator.prog";
                                target: "percentage.digit.box";
                        }
-
                        program {
                                name: "indicator.battery.percentage.full.show";
                                action: STATE_SET "three_digits" 0.0;
@@ -1493,6 +736,7 @@ collections {
                                source: "indicator.prog";
                                target: "percentage.digit.box";
                        }
+
                        // RSSI1
                        program {
                                name: "indicator.rssi1.show";
@@ -1502,7 +746,6 @@ collections {
                                target: "elm.swallow.fixed1";
                                target: "elm.rect.rssi1";
                        }
-
                        program {
                                name: "indicator.rssi1.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1511,6 +754,7 @@ collections {
                                target: "elm.swallow.fixed1";
                                target: "elm.rect.rssi1";
                        }
+
                        // RSSI2
                        program {
                                name: "indicator.rssi2.show";
@@ -1520,7 +764,6 @@ collections {
                                target: "elm.swallow.fixed2";
                                target: "elm.rect.rssi2";
                        }
-
                        program {
                                name: "indicator.rssi2.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1539,7 +782,6 @@ collections {
                                target: "elm.swallow.fixed4";
                                target: "elm.rect.connection";
                        }
-
                        program {
                                name: "indicator.connection.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1558,7 +800,6 @@ collections {
                                target: "elm.swallow.fixed5";
                                target: "elm.rect.wifi";
                        }
-
                        program {
                                name: "indicator.wifi.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1577,7 +818,6 @@ collections {
                                target: "elm.swallow.fixed7";
                                target: "elm.rect.wifidirect";
                        }
-
                        program {
                                name: "indicator.wifidirect.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1658,6 +898,7 @@ collections {
                                source: "indicator.prog";
                                target: "elm.image.updown2";
                        }
+
                        // System Box
                        program {
                                name: "indicator.system.show";
@@ -1667,7 +908,6 @@ collections {
                                target: "elm.swallow.system";
                                target: "elm.rect.system";
                        }
-
                        program {
                                name: "indicator.system.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1676,6 +916,7 @@ collections {
                                target: "elm.swallow.system";
                                target: "elm.rect.system";
                        }
+
                        // Mini Control box
                        program {
                                name: "indicator.minictrl.show";
@@ -1685,7 +926,6 @@ collections {
                                target: "elm.swallow.minictrl";
                                target: "elm.rect.minictrl";
                        }
-
                        program {
                                name: "indicator.minictrl.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1694,6 +934,7 @@ collections {
                                target: "elm.swallow.minictrl";
                                target: "elm.rect.minictrl";
                        }
+
                        // Connection/System box
                        program {
                                name: "indicator.connection/system.show";
@@ -1703,7 +944,6 @@ collections {
                                target: "elm.swallow.connection/system";
                                target: "elm.rect.connection/system";
                        }
-
                        program {
                                name: "indicator.connection/system.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1712,6 +952,7 @@ collections {
                                target: "elm.swallow.connection/system";
                                target: "elm.rect.connection/system";
                        }
+
                        // Noti box
                        program {
                                name: "indicator.noti.show";
@@ -1721,7 +962,6 @@ collections {
                                target: "elm.swallow.noti";
                                target: "elm.rect.noti";
                        }
-
                        program {
                                name: "indicator.noti.hide";
                                action: STATE_SET "hide" 0.0;
@@ -1734,142 +974,19 @@ collections {
                        // More noti
                        program {
                                name: "indicator.more_noti.show";
-                               action: STATE_SET "default" 0.0;
+                               action: STATE_SET "show" 0.0;
                                signal: "indicator.more_noti.show";
                                source: "indicator.prog";
                                target: "elm.swallow.more_noti";
-                               target: "elm.rect.more_noti";
                        }
-
                        program {
                                name: "indicator.more_noti.hide";
-                               action: STATE_SET "hide" 0.0;
+                               action: STATE_SET "default" 0.0;
                                signal: "indicator.more_noti.hide";
                                source: "indicator.prog";
                                target: "elm.swallow.more_noti";
-                               target: "elm.rect.more_noti";
-                       }
-
-                       // S Cover
-                       program {
-                               name: "indicator.scover.on";
-                               action: STATE_SET "scover" 0.0;
-                               signal: "indicator.scover.on";
-                               source: "indicator.prog";
-                               target: "padding.left";
-                               target: "padding.right";
-                               target: "message.padding.left";
-                               target: "message.padding.right";
-                       }
-                       program {
-                               name: "indicator.scover.off";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.scover.off";
-                               source: "indicator.prog";
-                               target: "padding.left";
-                               target: "padding.right";
-                               target: "message.padding.left";
-                               target: "message.padding.right";
-                       }
-                       program {
-                               name: "indicator.padding.dynamic.on";
-                               action: STATE_SET "dynamic" 0.0;
-                               signal: "indicator.padding.dynamic.on";
-                               source: "indicator.prog";
-                               target: "padding.right";
-                               transition: LINEAR 0.4;
-                       }
-                       program {
-                               name: "indicator.padding.dynamic.off";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.padding.dynamic.off";
-                               source: "indicator.prog";
-                               target: "padding.right";
-                               transition: LINEAR 0.4;
-                       }
-
-                       program {
-                               name: "indicator.padding.dynamic.off.noeffect";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.padding.dynamic.off.noeffect";
-                               source: "indicator.prog";
-                               target: "padding.right";
-                       }
-
-                       program {
-                               name: "indicator.padding.resize.0";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.padding.resize.0";
-                               source: "indicator.prog";
-                               target: "resize_padding.left";
-                               target: "resize_padding.right";
-                       }
-                       program {
-                               name: "indicator.padding.resize.1";
-                               action: STATE_SET "1" 0.0;
-                               signal: "indicator.padding.resize.1";
-                               source: "indicator.prog";
-                               target: "resize_padding.left";
-                               target: "resize_padding.right";
-                       }
-
-                       program {
-                               name: "indicator.padding.resize.2";
-                               action: STATE_SET "2" 0.0;
-                               signal: "indicator.padding.resize.2";
-                               source: "indicator.prog";
-                               target: "resize_padding.left";
-                               target: "resize_padding.right";
-                       }
-
-                       program {
-                               name: "indicator.padding.resize.3";
-                               action: STATE_SET "3" 0.0;
-                               signal: "indicator.padding.resize.3";
-                               source: "indicator.prog";
-                               target: "resize_padding.left";
-                               target: "resize_padding.right";
-                       }
-
-                       program {
-                               name: "indicator.padding.resize.4";
-                               action: STATE_SET "4" 0.0;
-                               signal: "indicator.padding.resize.4";
-                               source: "indicator.prog";
-                               target: "resize_padding.left";
-                               target: "resize_padding.right";
-                       }
-
-                       program {
-                               name: "indicator.bg.call.0";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.bg.call.0";
-                               source: "indicator.prog";
-                               target: "elm.rect.bg.call";
                        }
                        program {
-                               name: "indicator.bg.call.1";
-                               action: STATE_SET "during_call" 0.0;
-                               signal: "indicator.bg.call.1";
-                               source: "indicator.prog";
-                               target: "elm.rect.bg.call";
-                       }
-                       program {
-                               name: "indicator.bg.call.2";
-                               action: STATE_SET "call_hold" 0.0;
-                               signal: "indicator.bg.call.2";
-                               source: "indicator.prog";
-                               target: "elm.rect.bg.call";
-                       }
-                       program {
-                               name: "indicator.bg.call.3";
-                               action: STATE_SET "call_end" 0.0;
-                               signal: "indicator.bg.call.3";
-                               source: "indicator.prog";
-                               target: "elm.rect.bg.call";
-                       }
-
-                       program {
                                name: "clock.font.12";
                                action: STATE_SET "default" 0.0;
                                signal: "clock.font.12";
@@ -1890,13 +1007,6 @@ collections {
                                source: "indicator.prog";
                                target: "elm.text.clock";
                        }
-
-                       /*********************************************************
-                        *
-                        * BADGE
-                        *
-                        **********************************************************/
-
                }
        }
 }
index 40071ef..8c888b8 100755 (executable)
@@ -19,7 +19,7 @@
 #define TICKERNOTI_MAIN_TEXT_HEIGHT_INC 1
 collections
 {
-       base_scale: 1.7;
+       base_scale: 2.6;
        group {
                name: "quickpanel/tickernoti/text";
                data {
index f78c282..ef0a966 100755 (executable)
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+* Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
 
-#define FRAME_TIME 0.3
+#include "../../inc/indicator_gui.h"
 
+#define FRAME_TIME 0.3
 images {
        image: "noti_download_01.png" COMP;
        image: "noti_download_02.png" COMP;
@@ -24,14 +25,12 @@ images {
        image: "noti_download_04.png" COMP;
        image: "noti_download_05.png" COMP;
        image: "noti_download_complete.png" COMP;
-
        image: "noti_upload_01.png" COMP;
        image: "noti_upload_02.png" COMP;
        image: "noti_upload_03.png" COMP;
        image: "noti_upload_04.png" COMP;
        image: "noti_upload_05.png" COMP;
        image: "noti_upload_complete.png" COMP;
-
        image: "noti_install_01.png" COMP;
        image: "noti_install_02.png" COMP;
        image: "noti_install_03.png" COMP;
@@ -39,479 +38,470 @@ images {
        image: "noti_install_05.png" COMP;
        image: "noti_install_complete.png" COMP;
 }
-
 collections {
-group {
-       name: "quickpanel/animated_icon_download";
-       parts {
-               part { name: "background";
-                       type: SPACER;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
+       base_scale: 2.6;
+       group {
+               name: "quickpanel/animated_icon_download";
+               parts {
+                       part { name: "background";
+                               type: SPACER;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                               }
                        }
-               }
-               part{
-                       name: "obj.image";
-                       type:IMAGE;
-                       scale:1;
-                       description {
-                               state: "default" 0.0;
-                               fixed: 1 1;
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
-                               rel1 {
-                                       to: "background";
+                       part{
+                               name: "obj.image";
+                               type:IMAGE;
+                               scale:1;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 1;
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       rel1 {
+                                               to: "background";
+                                       }
+                                       rel2 {
+                                               to: "background";
+                                       }
+                                       image {
+                                               normal:"noti_download_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
+                                       color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
+                                       visible:1;
                                }
-                               rel2 {
-                                       to: "background";
+                               description {
+                                       state: "state.0" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               image {
-                                       normal:"noti_download_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.1" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_02.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
-                               visible:1;
-                       }
-                       description {
-                               state: "state.0" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.2" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_03.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.1" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_02.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.3" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_04.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.2" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_03.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.4" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_05.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.3" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_04.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.5" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_download_complete.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
                        }
-                       description {
-                               state: "state.4" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_05.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+               }
+               programs {
+                       program {
+                               name: "init.layout";
+                               signal: "load";
+                               source: "";
+                               in: 0.0 0.0;
+                               action: SIGNAL_EMIT "icon.state.0" "prog";
                        }
-                       description {
-                               state: "state.5" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_download_complete.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+                       program{
+                               name: "icon.state.0";
+                               signal: "icon.state.0";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.0" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.1";
+                       }
+                       program{
+                               name: "icon.state.1";
+                               signal: "icon.state.1";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.1" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.2";
+                       }
+                       program{
+                               name: "icon.state.2";
+                               signal: "icon.state.2";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.2" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.3";
+                       }
+                       program{
+                               name: "icon.state.3";
+                               signal: "icon.state.3";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.3" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.4";
+                       }
+                       program{
+                               name: "icon.state.4";
+                               signal: "icon.state.4";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.4" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.5";
+                       }
+                       program{
+                               name: "icon.state.5";
+                               signal: "icon.state.5";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.5" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.0";
                        }
                }
        }
-
-       programs {
-               program {
-                       name: "init.layout";
-                       signal: "load";
-                       source: "";
-                       in: 0.0 0.0;
-                       action: SIGNAL_EMIT "icon.state.0" "prog";
-               }
-               program{
-                       name: "icon.state.0";
-                       signal: "icon.state.0";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.0" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.1";
-               }
-               program{
-                       name: "icon.state.1";
-                       signal: "icon.state.1";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.1" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.2";
-               }
-               program{
-                       name: "icon.state.2";
-                       signal: "icon.state.2";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.2" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.3";
-               }
-               program{
-                       name: "icon.state.3";
-                       signal: "icon.state.3";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.3" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.4";
-               }
-               program{
-                       name: "icon.state.4";
-                       signal: "icon.state.4";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.4" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.5";
-               }
-               program{
-                       name: "icon.state.5";
-                       signal: "icon.state.5";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.5" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.0";
-               }
-       }
-}
-
-group {
-       name: "quickpanel/animated_icon_upload";
-       parts {
-               part { name: "background";
-                       type: SPACER;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
+       group {
+               name: "quickpanel/animated_icon_upload";
+               parts {
+                       part { name: "background";
+                               type: SPACER;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       fixed: 1 1;
+                               }
                        }
-               }
-               part{
-                       name: "obj.image";
-                       type:IMAGE;
-                       scale:1;
-                       description {
-                               state: "default" 0.0;
-                               fixed: 1 1;
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
-                               rel1 {
-                                       to: "background";
+                       part{
+                               name: "obj.image";
+                               type:IMAGE;
+                               scale:1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       fixed: 1 1;
+                                       rel1.to: "background";
+                                       rel2.to: "background";
+                                       image {
+                                               normal:"noti_upload_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
+                                       color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
+                                       visible:1;
                                }
-                               rel2 {
-                                       to: "background";
+                               description {
+                                       state: "state.0" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               image {
-                                       normal:"noti_upload_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.1" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_02.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
-                               visible:1;
-                       }
-                       description {
-                               state: "state.0" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.2" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_03.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.1" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_02.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.3" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_04.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.2" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_03.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.4" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_05.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.3" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_04.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.5" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_upload_complete.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
                        }
-                       description {
-                               state: "state.4" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_05.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+               }
+               programs {
+                       program {
+                               name: "init.layout";
+                               signal: "load";
+                               source: "";
+                               in: 0.0 0.0;
+                               action: SIGNAL_EMIT "icon.state.0" "prog";
                        }
-                       description {
-                               state: "state.5" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_upload_complete.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+                       program{
+                               name: "icon.state.0";
+                               signal: "icon.state.0";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.0" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.1";
+                       }
+                       program{
+                               name: "icon.state.1";
+                               signal: "icon.state.1";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.1" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.2";
+                       }
+                       program{
+                               name: "icon.state.2";
+                               signal: "icon.state.2";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.2" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.3";
+                       }
+                       program{
+                               name: "icon.state.3";
+                               signal: "icon.state.3";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.3" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.4";
+                       }
+                       program{
+                               name: "icon.state.4";
+                               signal: "icon.state.4";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.4" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.5";
+                       }
+                       program{
+                               name: "icon.state.5";
+                               signal: "icon.state.5";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.5" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.0";
                        }
                }
        }
-
-       programs {
-               program {
-                       name: "init.layout";
-                       signal: "load";
-                       source: "";
-                       in: 0.0 0.0;
-                       action: SIGNAL_EMIT "icon.state.0" "prog";
-               }
-               program{
-                       name: "icon.state.0";
-                       signal: "icon.state.0";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.0" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.1";
-               }
-               program{
-                       name: "icon.state.1";
-                       signal: "icon.state.1";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.1" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.2";
-               }
-               program{
-                       name: "icon.state.2";
-                       signal: "icon.state.2";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.2" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.3";
-               }
-               program{
-                       name: "icon.state.3";
-                       signal: "icon.state.3";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.3" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.4";
-               }
-               program{
-                       name: "icon.state.4";
-                       signal: "icon.state.4";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.4" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.5";
-               }
-               program{
-                       name: "icon.state.5";
-                       signal: "icon.state.5";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.5" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.0";
-               }
-       }
-}
-
-group {
-       name: "quickpanel/animated_icon_install";
-       parts {
-               part { name: "background";
-                       type: SPACER;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
+       group {
+               name: "quickpanel/animated_icon_install";
+               parts {
+                       part { name: "background";
+                               type: SPACER;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                               }
                        }
-               }
-               part{
-                       name: "obj.image";
-                       type:IMAGE;
-                       scale:1;
-                       description {
-                               state: "default" 0.0;
-                               fixed: 1 1;
-                               state: "default" 0.0;
-                               min: 47 47;
-                               max: 47 47;
-                               rel1 {
-                                       to: "background";
+                       part{
+                               name: "obj.image";
+                               type:IMAGE;
+                               scale:1;
+                               description {
+                                       state: "default" 0.0;
+                                       fixed: 1 1;
+                                       state: "default" 0.0;
+                                       min: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       max: DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
+                                       rel1 {
+                                               to: "background";
+                                       }
+                                       rel2 {
+                                               to: "background";
+                                       }
+                                       image {
+                                               normal:"noti_install_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
+                                       color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
+                                       visible:1;
                                }
-                               rel2 {
-                                       to: "background";
+                               description {
+                                       state: "state.0" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_01.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               image {
-                                       normal:"noti_install_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.1" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_02.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                               color_class: QP_THEME_LIST_ITEM_ICON_COLOR;
-                               visible:1;
-                       }
-                       description {
-                               state: "state.0" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_01.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.2" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_03.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.1" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_02.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.3" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_04.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.2" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_03.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.4" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_05.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
-                       }
-                       description {
-                               state: "state.3" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_04.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
+                               description {
+                                       state: "state.5" 0.0;
+                                       inherit: "default" 0.0;
+                                       image {
+                                               normal:"noti_install_complete.png";
+                                               border: 0 0 0 0;
+                                               border_scale: 1;
+                                       }
                                }
                        }
-                       description {
-                               state: "state.4" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_05.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+               }
+               programs {
+                       program {
+                               name: "init.layout";
+                               signal: "load";
+                               source: "";
+                               in: 0.0 0.0;
+                               action: SIGNAL_EMIT "icon.state.0" "prog";
                        }
-                       description {
-                               state: "state.5" 0.0;
-                               inherit: "default" 0.0;
-                               image {
-                                       normal:"noti_install_complete.png";
-                                       border: 0 0 0 0;
-                                       border_scale: 1;
-                               }
+                       program{
+                               name: "icon.state.0";
+                               signal: "icon.state.0";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.0" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.1";
+                       }
+                       program{
+                               name: "icon.state.1";
+                               signal: "icon.state.1";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.1" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.2";
+                       }
+                       program{
+                               name: "icon.state.2";
+                               signal: "icon.state.2";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.2" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.3";
+                       }
+                       program{
+                               name: "icon.state.3";
+                               signal: "icon.state.3";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.3" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.4";
+                       }
+                       program{
+                               name: "icon.state.4";
+                               signal: "icon.state.4";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.4" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.5";
+                       }
+                       program{
+                               name: "icon.state.5";
+                               signal: "icon.state.5";
+                               source: "prog";
+                               in: FRAME_TIME 0.0;
+                               action: STATE_SET "state.5" 0.0;
+                               target: "obj.image";
+                               after: "icon.state.0";
                        }
                }
        }
-
-       programs {
-               program {
-                       name: "init.layout";
-                       signal: "load";
-                       source: "";
-                       in: 0.0 0.0;
-                       action: SIGNAL_EMIT "icon.state.0" "prog";
-               }
-               program{
-                       name: "icon.state.0";
-                       signal: "icon.state.0";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.0" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.1";
-               }
-               program{
-                       name: "icon.state.1";
-                       signal: "icon.state.1";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.1" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.2";
-               }
-               program{
-                       name: "icon.state.2";
-                       signal: "icon.state.2";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.2" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.3";
-               }
-               program{
-                       name: "icon.state.3";
-                       signal: "icon.state.3";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.3" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.4";
-               }
-               program{
-                       name: "icon.state.4";
-                       signal: "icon.state.4";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.4" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.5";
-               }
-               program{
-                       name: "icon.state.5";
-                       signal: "icon.state.5";
-                       source: "prog";
-                       in: FRAME_TIME 0.0;
-                       action: STATE_SET "state.5" 0.0;
-                       target: "obj.image";
-                       after: "icon.state.0";
-               }
-       }
-}
-}
+}
\ No newline at end of file
index e679450..798611a 100644 (file)
@@ -68,8 +68,6 @@
 
 #define ERROR_MESSAGE_LEN 256
 
-#define INDICATOR_HEIGHT_TM1 52
-
 Evas_Coord_Point indicator_press_coord = {0,0};
 Ecore_Timer *clock_timer;
 int is_transparent = 0;
@@ -315,13 +313,13 @@ static void _indicator_service_cb(void *data, tzsh_indicator_service_h service,
        switch (angle) {
                case 0:
                case 180:
-                       _D("Enable indicator portrait mode: %d %d", info->port_w, INDICATOR_HEIGHT_TM1);
-                       evas_object_resize(info->win, info->port_w, INDICATOR_HEIGHT_TM1);
+                       _D("Enable indicator portrait mode: %d %d", info->port_w, INDICATOR_HEIGHT);
+                       evas_object_resize(info->win, info->port_w, INDICATOR_HEIGHT);
                        break;
                case 90:
                case 270:
-                       _D("Enable indicator landscape mode: %d %d", info->land_w, INDICATOR_HEIGHT_TM1);
-                       evas_object_resize(info->win, info->land_w, INDICATOR_HEIGHT_TM1);
+                       _D("Enable indicator landscape mode: %d %d", info->land_w, INDICATOR_HEIGHT);
+                       evas_object_resize(info->win, info->land_w, INDICATOR_HEIGHT);
                        break;
                default:
                        _E("Unahandled rotation value");
@@ -415,8 +413,8 @@ static void _create_window(struct appdata *ad)
        evas_object_size_hint_fill_set(ad->win.win , EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(ad->win.win , 1.0, 0.5);
 
-       evas_object_resize(ad->win.win, ad->win.port_w, INDICATOR_HEIGHT_TM1);
-       _D("w,h(%d,%d)", ad->win.port_w, INDICATOR_HEIGHT_TM1);
+       evas_object_resize(ad->win.win, ad->win.port_w, INDICATOR_HEIGHT);
+       _D("w,h(%d,%d)", ad->win.port_w, INDICATOR_HEIGHT);
 
        evas_object_show(ad->win.win);
        if (indicator_tzsh_init(&ad->win))
@@ -434,7 +432,7 @@ static void _create_base_gui(void* data)
        _create_window(ad);
 
        /* FIXME */
-       ad->win.h = INDICATOR_HEIGHT_TM1;
+       ad->win.h = INDICATOR_HEIGHT;
        ad->win.w = ad->win.port_w;
        ad->win.evas = evas_object_evas_get(ad->win.win);
 
index 70b13f5..5ac5d30 100644 (file)
@@ -45,7 +45,6 @@ icon_s more_notify = {
        .priority = ICON_PRIORITY,
        .always_top = EINA_TRUE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
        .img_obj.data = "Notify/b03_notify_more.png",
        .obj_exist = EINA_FALSE,
        .area = INDICATOR_ICON_AREA_MORE_NOTI,
@@ -63,61 +62,45 @@ static void set_app_state(void *data)
        more_notify.ad = data;
 }
 
-icon_s *more_noti_get_icon(void)
+void indicator_more_notify_icon_change(Eina_Bool show)
 {
-       return &more_notify;
-}
-
-void indicator_more_notify_icon_change(Eina_Bool val)
-{
-       _D("indicator_more_notify_change. Val=%s", (val) ? "true" : "false");
+       _D("Show 'more notify' icon:%s", (show) ? "true" : "false");
 
        struct appdata *ad = more_notify.ad;
-       retm_if(ad == NULL, "Invalid parameter!");
-
-       if (val) {
-               util_signal_emit(ad->win.data, "indicator.more_noti.show", "indicator.prog");
-               evas_object_show(more_notify.img_obj.obj);
-       } else {
-               util_signal_emit(ad->win.data, "indicator.more_noti.hide", "indicator.prog");
-               evas_object_hide(more_notify.img_obj.obj);
+       retm_if(!ad, "Invalid parameter!");
+
+       if (show) {
+               util_signal_emit(ad, "indicator.more_noti.show", "indicator.prog");
+               _D();
+       }
+       else {
+               util_signal_emit(ad, "indicator.more_noti.hide", "indicator.prog");
+               _D();
        }
 
        return;
 }
 
-Evas_Object *icon_create_and_swallow(icon_s *icon, const char *part_name)
+static void icon_create_and_swallow(icon_s *icon, const char *part_name)
 {
        struct appdata *ad = (struct appdata *)icon->ad;
-       retv_if(!ad, NULL);
-
-       Evas_Object *obj = NULL;
+       ret_if(!ad);
 
        icon_add(&ad->win, icon);
-       retv_if(!icon->img_obj.obj, NULL);
-
-       obj = box_add(ad->win.layout);
-       retv_if(!obj, NULL);
-
-       elm_box_pack_end(obj, icon->img_obj.obj);
+       ret_if(!icon->img_obj.obj);
 
-       evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       edje_object_part_swallow(elm_layout_edje_get(ad->win.layout), part_name, obj);
-
-       return obj;
+       edje_object_part_swallow(elm_layout_edje_get(ad->win.layout), part_name, icon->img_obj.obj);
 }
 
 static int register_more_notify_module(void *data)
 {
        _D("register_more_notify_module");
 
-       retvm_if(data == NULL, FAIL, "Invalid parameter!");
-
-       struct appdata *ad = (struct appdata *)data;
+       retvm_if(!data, FAIL, "Invalid parameter!");
 
        set_app_state(data);
 
-       ad->win._more_noti_box = icon_create_and_swallow(&more_notify, PART_NAME_MORE_NOTI);
+       icon_create_and_swallow(&more_notify, PART_NAME_MORE_NOTI);
 
        return OK;
 }
@@ -128,7 +111,7 @@ static int unregister_more_notify_module(void)
        struct appdata *ad = (struct appdata *)more_notify.ad;
 
        icon_del(&more_notify);
-       edje_object_part_unswallow(ad->win.layout, ad->win._more_noti_box);
+       edje_object_part_unswallow(ad->win.layout, more_notify.img_obj.obj);
 
        return OK;
 }