[entry] modify bubble style (add date, image rect)

diff --git a/themes/groups/bubble.edc b/themes/groups/bubble.edc
index 509e682..0caa814 100644 (file)
--- a/themes/groups/bubble.edc
+++ b/themes/groups/bubble.edc
@@ -728,7 +728,7 @@ group {
             signal: "elm,state,select,enable";
             source: "elm";
             action: STATE_SET "selectview" 0.0;
-            //transition: DECELERATE 0.7;
+            transition: DECELERATE 0.7;
             target: "elm.swallow.select_icon";
             target: "elm.icon";
          }

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index f0743e3..b574894 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1964,11 +1964,23 @@ group { name: "elm/entry/base-password/popup";
                }
        } 
 
-#define BUBBLE_EX_PAD 10
-#define BUBBLE_IX_PAD 14
-#define BUBBLE_Y_PAD 10
-// Y_PAD + bottom shadow(5) = 15
-#define BUBBLE_BOTTOM_PAD 15
+/* Entry's bubble style */
+
+      styles
+       {
+          style { name: "entry_bubble_date_area_textblock_style";
+             base: "font=SLP:style=Roman font_size="ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" left_margin=2 right_margin=2 wrap=mixed text_class_entry";
+             tag:  "br" "\n";
+             tag:  "ps" "ps";
+             tag:  "tab" "\t";
+             tag:  "em" "+ font=SLP:style=Oblique";
+             tag:  "b" "+ font=SLP:style=Bold";
+             tag:  "link" "+ color=#800 underline=on underline_color=#8008";
+             tag:  "hilight" "+ font=SLP:style=Bold";
+             tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
+             tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
+          }
+       }
 
    group { name: "elm/entry/base/readmessage";
       data.item: "default_font_size" "24";
@@ -1984,7 +1996,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_EX_PAD 0;
+              min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1997,7 +2009,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_IX_PAD 0;
+              min: ENTRY_BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -2011,7 +2023,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2024,7 +2036,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -2114,7 +2126,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_EX_PAD 0;
+               min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -2127,7 +2139,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_IX_PAD 0;
+               min: ENTRY_BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -2141,7 +2153,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2154,7 +2166,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_BOTTOM_PAD;
+              min: 0 ENTRY_BUBBLE_BOTTOM_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -2175,19 +2187,26 @@ group { name: "elm/entry/base-password/popup";
               }
            }
         }
+         // it's temporary blocked for prepare entry's signal feature
+         /*
          part {
-           name: "elm.swallow.subject";
-           type: SWALLOW;
+           name: "elm.text.subject";
+           type: TEXTBLOCK;
            scale: 1;
            description {
               state: "default" 0.0;
               align: 0.0 0.0;
+              text {
+                 style: "entry_textblock_style";
+                 min: 0 1;
+              }
               rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
               rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.top.pad"; }
            }
          }
+         */
          part {
-           name: "elm.swallow.line";
+           name: "elm.rect.subject.line";
            type: RECT;
            scale: 1;
            description {
@@ -2196,8 +2215,12 @@ group { name: "elm/entry/base-password/popup";
               min: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 255;
-              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.swallow.subject"; }
-              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.swallow.subject"; }
+              /*
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text.subject"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.text.subject"; }
+              */
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.top.pad"; }
            }
          }
         part { name: "elm.text";
@@ -2215,8 +2238,8 @@ group { name: "elm/entry/base-password/popup";
            description { state: "default" 0.0;
                fixed: 1 0;
                align: 0.0 0.0;
-               rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.swallow.line"; }
-               rel2 { relative: 1.0 0.0; to_y: "elm.swallow.end"; }
+               rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.subject.line"; }
+               rel2 { relative: 1.0 1.0; to_y: "elm.rect.subject.line"; }
               text {
                  style: "entry_textblock_style";
                  min: 0 1;
@@ -2231,13 +2254,28 @@ group { name: "elm/entry/base-password/popup";
            }
         }
          part {
+           name: "elm.text.date";
+           type: TEXTBLOCK;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              align: 0.0 0.0;
+              text {
+                 style: "entry_bubble_date_area_textblock_style";
+                 min: 0 1;
+              }
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.text"; }
+           }
+         }
+         part {
            name: "elm.swallow.end";
            type: SWALLOW;
            scale: 1;
            description {
               state: "default" 0.0;
-              align: 0 1.0;
-              rel1 { relative: 1.0 0.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
+              align: 0.0 0.0;
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text.date"; }
               rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; }
            }
          }
@@ -2278,7 +2316,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_EX_PAD 0;
+               min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -2291,7 +2329,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_IX_PAD 0;
+               min: ENTRY_BUBBLE_IX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -2305,7 +2343,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2318,7 +2356,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -2406,7 +2444,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_EX_PAD 0;
+              min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2419,7 +2457,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_IX_PAD 0;
+              min: ENTRY_BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2433,7 +2471,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2446,7 +2484,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -2536,7 +2574,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_EX_PAD 0;
+              min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2549,7 +2587,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_IX_PAD 0;
+              min: ENTRY_BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2563,7 +2601,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2576,7 +2614,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_BOTTOM_PAD;
+              min: 0 ENTRY_BUBBLE_BOTTOM_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -2597,19 +2635,26 @@ group { name: "elm/entry/base-password/popup";
               }
            }
         }
+         // it's temporary blocked for prepare entry's signal feature
+         /*
          part {
-           name: "elm.swallow.subject";
-           type: SWALLOW;
+           name: "elm.text.subject";
+           type: TEXTBLOCK;
            scale: 1;
            description {
               state: "default" 0.0;
               align: 0.0 0.0;
+              text {
+                 style: "entry_textblock_style";
+                 min: 0 1;
+              }
               rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
               rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.top.pad"; }
            }
          }
+         */
          part {
-           name: "elm.swallow.line";
+           name: "elm.rect.subject.line";
            type: RECT;
            scale: 1;
            description {
@@ -2618,8 +2663,12 @@ group { name: "elm/entry/base-password/popup";
               min: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 255;
-              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.swallow.subject"; }
-              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.swallow.subject"; }
+              /*
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text.subject"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.text.subject"; }
+              */
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.top.pad"; }
            }
          }
         part { name: "elm.text";
@@ -2637,8 +2686,8 @@ group { name: "elm/entry/base-password/popup";
            description { state: "default" 0.0;
                fixed: 1 0;
                align: 1.0 0.0;
-               rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad";}
-               rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.swallow.end"; }
+               rel1 { relative: 0.0 1.0; to_y: "elm.rect.subject.line";}
+               rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.subject.line"; }
               text {
                  style: "entry_textblock_style";
                  min: 0 1;
@@ -2653,13 +2702,28 @@ group { name: "elm/entry/base-password/popup";
            }
         }
          part {
+           name: "elm.text.date";
+           type: TEXTBLOCK;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              align: 0.0 0.0;
+              text {
+                 style: "entry_bubble_date_area_textblock_style";
+                 min: 0 1;
+              }
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text"; }
+              rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.text"; }
+           }
+         }
+         part {
            name: "elm.swallow.end";
            type: SWALLOW;
            scale: 1;
            description {
               state: "default" 0.0;
-              align: 0 1.0;
-              rel1 { relative: 1.0 0.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
+              align: 0.0 0.0;
+              rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.text.date"; }
               rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; }
            }
          }
@@ -2700,7 +2764,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_EX_PAD 0;
+              min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2713,7 +2777,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_IX_PAD 0;
+              min: ENTRY_BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -2727,7 +2791,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 0.0;
               color: 0 0 0 0;
@@ -2740,7 +2804,7 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-              min: 0 BUBBLE_Y_PAD;
+              min: 0 ENTRY_BUBBLE_Y_PAD;
               fixed: 0 1;
               align: 0.0 1.0;
               color: 0 0 0 0;
@@ -3362,7 +3426,7 @@ group { name: "elm/scroller/entry/default";
          part { name: "bg";
             type: RECT;
             description { state: "default" 0.0;
-                      visible: 0;
+               visible: 0;
             }
          }
          part { name: "clipper";

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index b79572d..d585f7c 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -899,6 +899,12 @@
 #define MAGNIFIER_HEIGHT_FIXED 108
 #define MAGNIFIER_WIDTH_FIXED 358
 
+#define ENTRY_BUBBLE_EX_PAD 15
+#define ENTRY_BUBBLE_IX_PAD 22
+#define ENTRY_BUBBLE_Y_PAD 15
+#define ENTRY_BUBBLE_BOTTOM_PAD 22
+#define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 26
+
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 
 #define DAYSELECTOR_BACKGROUND_COLOR_INC       66 82 90 255

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 60e35e8..bee0276 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -887,6 +887,12 @@
 #define MAGNIFIER_HEIGHT_FIXED 68
 #define MAGNIFIER_WIDTH_FIXED 224
 
+#define ENTRY_BUBBLE_EX_PAD 10
+#define ENTRY_BUBBLE_IX_PAD 14
+#define ENTRY_BUBBLE_Y_PAD 10
+#define ENTRY_BUBBLE_BOTTOM_PAD 15
+#define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 16
+
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 
 #define DAYSELECTOR_BACKGROUND_COLOR_INC       66 82 90 255

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index d6834fa..ef8cd9a 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -914,6 +914,12 @@
 #define MAGNIFIER_HEIGHT_FIXED 108
 #define MAGNIFIER_WIDTH_FIXED 358
 
+#define ENTRY_BUBBLE_EX_PAD 15
+#define ENTRY_BUBBLE_IX_PAD 22
+#define ENTRY_BUBBLE_Y_PAD 15
+#define ENTRY_BUBBLE_BOTTOM_PAD 22
+#define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 26
+
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 219 219 219 255
 
 #define DAYSELECTOR_BACKGROUND_COLOR_INC       199 199 199 255

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 3d4fe3a..0ca8a8a 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -908,6 +908,13 @@
 #define MAGNIFIER_HEIGHT_FIXED 68
 #define MAGNIFIER_WIDTH_FIXED 224
 
+#define ENTRY_BUBBLE_EX_PAD 10
+#define ENTRY_BUBBLE_IX_PAD 14
+#define ENTRY_BUBBLE_Y_PAD 10
+// Y_PAD + bottom shadow(5) = 15
+#define ENTRY_BUBBLE_BOTTOM_PAD 15
+#define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 16
+
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 219 219 219 255
 
 #define DAYSELECTOR_BACKGROUND_COLOR_INC       199 199 199 255