[TickerNoti] New style name "info", refactoring and Ellipsis support added.

Change-Id: I9a1f5e3bb97269f0d6084cb7bc6e1edae8eddc08

diff --git a/themes/groups/tickernoti.edc b/themes/groups/tickernoti.edc
index 3145cc2..40169be 100644 (file)
--- a/themes/groups/tickernoti.edc
+++ b/themes/groups/tickernoti.edc
@@ -24,61 +24,55 @@
    group {
       name: "elm/tickernoti/base/1line/default";
       alias: "elm/tickernoti/base/1line";
-      alias: "elm/tickernoti/base/default";
       alias: "elm/tickernoti/1line/default";
+      alias: "elm/tickernoti/base/info";
       data {
          item: "height" 27;
       }
       parts {
-         part { name: "bg";
-            mouse_events: 1;
+         part { name: "base";
+            mouse_events: 0;
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 1;
+               visible: 0;
                rel1 {
                   relative: 0.0 0.0;
                }
                rel2 {
                   relative: 1.0 1.0;
                }
-               color: 0 0 0 255;
             }
          }
-         part {
-            name: "bg_1line";
+         part { name: "bg";
+            mouse_events: 1;
             type: RECT;
             scale: 1;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               visible: 0;
+            description { state: "default" 0.0;
+               visible: 1;
                min: 0 27;
-               fixed: 0 1;
-               align: 0.0 0.0;
+               align: 0.5 0.0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to:"bg";
+                  relative: 0.0 2.0;
+                  to: "base";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to:"bg";
+                  relative: 1.0 3.0;
+                  to: "base";
                }
+               color: 0 0 0 0;
             }
-            description {
-               state: "show" 1.0;
-               visible: 0;
-               min: 0 27;
-               fixed: 0 1;
-               align: 0.0 0.0;
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
                rel1 {
                   relative: 0.0 0.0;
-                  to:"bg";
+                  to: "base";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to:"bg";
+                  relative: 1.0 1.0;
+                  to: "base";
                }
+               color: SELECTION_INFO_BACKGROUND_COLOR_INC;
             }
          }
          part {
@@ -94,11 +88,11 @@
                align: 0.0 0.0;
                rel1 {
                   relative: 0.0 0.0;
-                  to:"bg_1line";
+                  to:"bg";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to:"bg_1line";
+                  to:"bg";
                }
             }
          }
@@ -155,13 +149,13 @@
                   to:"padding_text";
                }
                rel2 {
-                  relative: 1.0 1.0; to:"bg_1line";
+                  relative: 1.0 1.0;
+                  to:"bg";
                }
-               color: TICKER_NOTI_TEXT_COLOR_INC;
+               color: SELECTION_INFO_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 18;
-                  text: "";
                   align: 0.0 0.5;
                }
             }
@@ -169,36 +163,33 @@
       } 
       programs {
          program {
-            name: "init";
-            signal: "show";
-            after: "effect_show";
+            name: "effect_show";
+            signal: "effect,show";
+            source: "elm";
+            action: STATE_SET "show" "0.0";
+            in: 0.1 0.0;
+            transition: ACCEL 0.4;
+            target: "bg";
          }
          program {
-            name: "ticker_click";
+            name: "other_click";
             signal: "mouse,down,1";
             source: "bg";
             action: STATE_SET "default" "0.0";
-            transition: SINUSOIDAL 0.3;
-            target: "bg_1line";
-            after: "ind_hide";
+            transition: DECEL 0.4;
+            target: "bg";
+            after: "hide";
          }
          program {
-            name: "ind_hide";
-            action: SIGNAL_EMIT "request,detail,show" "";
-         }
-         program {
-            name: "effect_show";
-            signal: "effect,show";
-            source: "bg_1line";
-            action: STATE_SET "show" "1.0";
-            transition: SINUSOIDAL 0.3;
-            target: "bg_1line";
+            name: "hide";
+            action: SIGNAL_EMIT "request,hide" "";
          }
       }
    }
    group {
       name: "elm/tickernoti/base/2line/default";
       alias: "elm/tickernoti/2line/default";
+      alias: "elm/tickernoti/base/default";
       data {
          item: "height" 55;
       }
@@ -208,7 +199,7 @@
       styles {
          style {
             name: "style_text";
-            base: "font=SLP:style=Roman font_size=22 wrap=char color=#f4f4f4 style=shadow";
+            base: "font=SLP:style=Roman font_size=22 wrap=char color=#f4f4f4 wrap=char ellipsis=1.0";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "b" "+ font=SLP:style=Bold";
@@ -234,22 +225,28 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               visible: 0;
+               visible: 1;
                min: 0 55;
-               fixed: 0 1;
-               align: 0.0 0.0;
                rel1 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 -1.0;
                   to:"bg";
                }
                rel2 {
                   relative: 1.0 0.0;
                   to:"bg";
                }
+               color: 0 0 0 0;
             }
             description { state: "show" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to:"bg";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to:"bg";
+               }
             }
          }
          part { name: "bg_2line_img";
@@ -269,22 +266,6 @@
                image.normal: "00_winset_notification_bg.png";
             }
          }
-         part { name: "bg_other";
-            mouse_events: 1;
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to:"bg_2line";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to:"bg";
-               }
-            }
-         }
          part {
             name: "padding_top";
             type: RECT;
@@ -492,19 +473,17 @@
             description {
                state: "default" 0.0;
                rel1 {
-                  relative: 0.0 0.5;
+                  relative: 0.0 0.0;
                   to:"text_rect";
                }
                rel2 {
-                  relative: 1.0 0.5;
+                  relative: 1.0 1.0;
                   to:"text_rect";
                }
                color: 255 255 255 255;
                align: 0.0 0.5;
-               fixed: 0 1;
                text {
                   style: "style_text";
-                  min: 0 1;
                }
             }
          }
@@ -513,23 +492,24 @@
          program {
             name: "effect_show";
             signal: "effect,show";
-            source: "bg_2line";
+            source: "elm";
+            in: 0.1 0.0;
             action: STATE_SET "show" "0.0";
-            transition: SINUSOIDAL 0.4;
+            transition: ACCEL 0.4;
             target: "bg_2line";
          }
          program {
-            name: "other_click";
-            signal: "mouse,down,1";
-            source: "bg_other";
+            name: "effect_hide";
+            signal: "effect,hide";
+            source: "elm";
             action: STATE_SET "default" "0.0";
-            transition: SINUSOIDAL 0.4;
+            transition: DECEL 0.4;
             target: "bg_2line";
-            after: "detail_hide";
+            after: "hide";
          }
          program {
-            name: "detail_hide";
-            action: SIGNAL_EMIT "request,detail,hide" "";
+            name: "hide";
+            action: SIGNAL_EMIT "request,hide" "";
          }
       }
    }