[bubble] white theme

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 5a89a42..4a959e8 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -1076,6 +1076,7 @@
 #define MAGNIFIER_WIDTH_FIXED 358
 
 #define ENTRY_BUBBLE_EX_PAD 15
+#define ENTRY_BUBBLE_EX_CALLERID_PAD 15
 #define ENTRY_BUBBLE_IX_PAD 22
 #define ENTRY_BUBBLE_Y_PAD 15
 #define ENTRY_BUBBLE_BOTTOM_PAD 22
@@ -1084,6 +1085,27 @@
 #define ENTRY_BUBBLE_CALLERID_HEIGHT 60
 #define ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC 26
 
+#define ENTRY_BUBBLE_RECEV_BG_BORDER_INC 1 20 13 20
+#define ENTRY_BUBBLE_SENT_BG_BORDER_INC 20 1 13 20
+#define ENTRY_BUBBLE_CALLERID_RELATIVE_INC 0.0 1.0
+#define ENTRY_BUBBLE_RECEV_CALLERID_REL1_INC 1.0 1.0
+#define ENTRY_BUBBLE_RECEV_CALLERID_REL2_INC 1.0 0.0
+#define ENTRY_BUBBLE_BOTTOMRIGHT_PAD 0
+#define ENTRY_BUBBLE_READ_TEXT_CALLID_REL1_X_INC "elm.rect.callerid.pad"
+#define ENTRY_BUBBLE_TEXT_CALLID_REL2_X_INC "elm.rect.callerid.pad"
+#define ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC "elm.rect.subject.line"
+#define ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC 6
+#define ENTRY_BUBBLE_STATUS_TIME_PAD_REL_INC -0.8 1.0
+#define ENTRY_BUBBLE_READ_STATUS_TIME_PAD_REL_INC 1.5 1.0
+#define ENTRY_BUBBLE_STATUS_TIME_SIZE_INC 28
+#define ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC 100 100 100 255
+#define ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC 100 100 100 255
+#define ENTRY_BUBBLE_GROUPCHAT_SIZE_INC 36
+#define ENTRY_BUBBLE_GROUPCHAT_COLOR_INC 0 0 0 0
+#define ENTRY_BUBBLE_GROUPCHART_ENABLE_INC 0
+#define ENTRY_BUBBLE_READ_STATUS_REL_INC 0.0 0.0
+#define ENTRY_BUBBLE_READ_TIME_REL_INC 0.0 1.0
+
 #define PANES_DEFAULT_FIXED_SEPERATOR_NORMAL_COLOR_INC 118 118 118 255
 
 #define DAYSELECTOR_BACKGROUND_COLOR_INC       100 100 100 255

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 9f21b17..86b95ec 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -2058,16 +2058,21 @@ group { name: "elm/entry/base-password/popup";
       parts {
          part {
             name: "elm.rect.left.pad";
-           type: RECT;
-           scale: 1;
-           description {
-              state: "default" 0.0;
+               type: RECT;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
                min: ENTRY_BUBBLE_EX_PAD 0;
                fixed: 1 0;
-              align: 0.0 0.0;
+                  align: 0.0 0.0;
                color: 0 0 0 0;
-              rel2.relative: 0.0 1.0;
-           }
+                  rel2.relative: 0.0 1.0;
+              }
+              description {
+               state: "callerid_on" 0.0;
+               inherit: "default" 0.0;
+                  min: ENTRY_BUBBLE_EX_CALLERID_PAD 0;
+              }
          }
          part {
             name: "elm.rect.right.pad";
@@ -2122,6 +2127,68 @@ group { name: "elm/entry/base-password/popup";
               rel1.relative: 0.0 1.0;
            }
          }
+         part {
+           name: "elm.rect.bottomleft.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: ENTRY_BUBBLE_BOTTOMRIGHT_PAD  2;
+              max: ENTRY_BUBBLE_BOTTOMRIGHT_PAD 2;
+              align: 0.0 1.0;
+                         visible: 0;
+           }
+         }
+         part {
+           name: "elm.rect.groupchat.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: 46 30;
+              max: 46 30;
+              align: 0.0 0.0;
+                         visible: 0;
+           }
+           description {
+              state: "callerid_on" 0.0;
+              inherit: "default" 0.0;
+              min: 130 30;
+              max: 130 30;
+           }
+         }
+         part {
+           name: "elm.rect.groupchat.text.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: 120 14;
+              max: 120 14;
+              align: 0.0 0.0;
+                         visible: 0;
+                         rel1 { relative: 0.0 1.0; to: "elm.rect.groupchat.pad"; }
+           }
+         }
+         part { name: "elm.text.groupchat";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               fixed: 1 1;
+               text {
+                  font: "SLP:style=Roman";
+                  size: ENTRY_BUBBLE_GROUPCHAT_SIZE_INC;
+                  min: 1 0;
+                                 align: 0.0 0.5;
+                  text_class: "slp_roman";
+               }
+               visible: 1;
+               color: ENTRY_BUBBLE_GROUPCHAT_COLOR_INC;
+               rel1 { relative: 1.0 0.0; to: "elm.rect.groupchat.pad"; }
+               rel2.to_y: "elm.rect.groupchat.pad";
+            }
+         }
         part {
            name: "elm.image.bg";
            type: IMAGE;
@@ -2131,10 +2198,25 @@ group { name: "elm/entry/base-password/popup";
               rel2.to_x: "elm.rect.right.pad";
               image {
                  normal: "00_MessageBubble_BG_receive.png";
-                 border: 1 20 13 20;
+                 border: ENTRY_BUBBLE_RECEV_BG_BORDER_INC;
                  border_scale: 1;
               }
            }
+           description {
+              state: "callerid_on" 0.0;
+           inherit: "default" 0.0;
+           rel1 { relative: 1.0 0.0; to_x: "elm.rect.bottomleft.pad"; }
+           }
+           description {
+              state: "callerid_groupchat" 0.0;
+           inherit: "default" 0.0;
+           rel1 { relative: 1.0 1.0; to_x: "elm.rect.bottomleft.pad"; to_y:"elm.rect.groupchat.pad"; }
+           }
+           description {
+              state: "groupchat_on" 0.0;
+           inherit: "default" 0.0;
+           rel1 { relative: 0.0 1.0; to_y:"elm.rect.groupchat.pad"; }
+           }
         }
          // it's temporary blocked for prepare entry's signal feature
          /*
@@ -2154,6 +2236,7 @@ group { name: "elm/entry/base-password/popup";
            }
          }
          */
+
          part {
            name: "elm.rect.subject.line";
            type: RECT;
@@ -2164,10 +2247,6 @@ 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.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"; }
            }
@@ -2183,8 +2262,8 @@ group { name: "elm/entry/base-password/popup";
                fixed: 1 1;
                align: 0.0 0.0;
                visible: 0;
-               rel1 { relative: 1.0 1.0; to: "elm.rect.topleft.pad"; to_y: "elm.rect.topleft.pad"; }
-               rel2 { relative: 1.0 0.0; to_y: "elm.rect.bottom.pad"; }
+               rel1 { relative: ENTRY_BUBBLE_RECEV_CALLERID_REL1_INC; to: "elm.rect.topleft.pad"; to_y: "elm.rect.topleft.pad"; }
+               rel2 { relative: ENTRY_BUBBLE_RECEV_CALLERID_REL2_INC; to_y: "elm.rect.bottom.pad"; }
             }
             description { state: "callerid_on" 0.0;
                inherit: "default" 0.0;
@@ -2230,11 +2309,24 @@ group { name: "elm/entry/base-password/popup";
                   max: 1 0;
               }
             }
-            description { state: "callerid_on" 0.0;
+               /* callerid only */
+           description { state: "callerid_on" 0.0;
                inherit: "default" 0.0;
-               rel1 { relative: 1.0 1.0; to_x: "elm.rect.callerid.pad"; to_y: "elm.rect.subject.line"; }
+               rel1 { relative: 1.0 1.0; to_x: ENTRY_BUBBLE_READ_TEXT_CALLID_REL1_X_INC; to_y: "elm.rect.subject.line"; }
                rel2 { relative: 1.0 1.0; to_y: "elm.rect.subject.line"; }
-            }
+           }
+               /* callerid and groupchat */
+           description { state: "callerid_groupchat" 0.0;
+               inherit: "default" 0.0;
+               rel1 { relative: 1.0 1.0; to_x: ENTRY_BUBBLE_READ_TEXT_CALLID_REL1_X_INC; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+               rel2 { relative: 1.0 1.0; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+           }
+               /* groupchat only */
+           description { state: "groupchat_on" 0.0;
+               inherit: "default" 0.0;
+               rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+               rel2 { relative: 1.0 1.0; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+           }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                text {
@@ -2248,11 +2340,13 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: GENLIST_PADDING_6_INC GENLIST_SIZE_64_INC;
+               min: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_SIZE_64_INC;
+               max: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_SIZE_64_INC;
               fixed: 1 1;
               align: 0.0 1.0;
                visible: 0;
-              rel1 { relative: 1.5 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; }
+                          color: 255 0 0 255;
+              rel1 { relative: ENTRY_BUBBLE_READ_STATUS_TIME_PAD_REL_INC; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; }
               rel2 { relative: 1.0 1.0; to_y: "elm.rect.bottom.pad"; }
            }
         }
@@ -2262,11 +2356,12 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC;
-               max: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC;
+               min: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_PADDING_34_INC;
+               max: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_PADDING_34_INC;
               fixed: 1 1;
               align: 0.0 0.0;
                visible: 0;
+                          color: 0 255 0 255;
               rel1.to: "elm.rect.status.pad";
               rel2 { relative: 1.0 1.0; to_y: "elm.rect.bottom.pad"; }
            }
@@ -2279,14 +2374,14 @@ group { name: "elm/entry/base-password/popup";
                fixed: 1 1;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_28_INC;
+                  size: ENTRY_BUBBLE_STATUS_TIME_SIZE_INC;
                   min: 1 0;
                   text_class: "slp_roman";
                }
                visible: 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               rel1 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
-               rel2 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
+               color: ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC;
+               rel1 { relative: ENTRY_BUBBLE_READ_STATUS_REL_INC; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
+               rel2 { relative: ENTRY_BUBBLE_READ_STATUS_REL_INC; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2301,14 +2396,14 @@ group { name: "elm/entry/base-password/popup";
                fixed: 1 1;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_28_INC;
+                  size: ENTRY_BUBBLE_STATUS_TIME_SIZE_INC;
                   min: 1 0;
                   text_class: "slp_roman";
                }
                visible: 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               rel1 { relative: 0.0 1.0; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; }
+               color: ENTRY_BUBBLE_READ_STATUS_TIME_COLOR_INC;
+               rel1 { relative: ENTRY_BUBBLE_READ_TIME_REL_INC; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; }
+               rel2 { relative: ENTRY_BUBBLE_READ_TIME_REL_INC; to_x: "elm.rect.time.pad"; to_y: "elm.rect.time.pad"; }
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2367,17 +2462,64 @@ group { name: "elm/entry/base-password/popup";
         program { name: "go_callerid_on";
            signal: "elm,state,callerid,enabled";
            source: "elm";
-           action: STATE_SET "callerid_on" 0.0;
-           target: "elm.swallow.callerid";
-           target: "elm.text";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "default")) {
+              set_state(PART:"elm.image.bg", "callerid_on", 0.0);
+              set_state(PART:"elm.text", "callerid_on", 0.0);
+                       }
+            else if (!strcmp(st, "groupchat_on")) {
+              set_state(PART:"elm.image.bg", "callerid_groupchat", 0.0);
+              set_state(PART:"elm.text", "callerid_groupchat", 0.0);
+                       }
+
+            set_state(PART:"elm.swallow.callerid", "callerid_on", 0.0);
+            set_state(PART:"elm.rect.left.pad", "callerid_on", 0.0);
+            set_state(PART:"elm.rect.groupchat.pad", "callerid_on", 0.0);
+         }
         }
         program { name: "go_callerid_off";
            signal: "elm,state,callerid,disabled";
            source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.swallow.callerid";
-           target: "elm.text";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "callerid_groupchat")) {
+              set_state(PART:"elm.image.bg", "groupchat_on", 0.0);
+              set_state(PART:"elm.text", "groupchat_on", 0.0);
+                       }
+            else {
+              set_state(PART:"elm.image.bg", "default", 0.0);
+              set_state(PART:"elm.text", "default", 0.0);
+                       }
+
+            set_state(PART:"elm.swallow.callerid", "default", 0.0);
+            set_state(PART:"elm.rect.groupchat.pad", "default", 0.0);
+                }
+        }
+/* groupchat - since white-hd theme */
+#if ENTRY_BUBBLE_GROUPCHART_ENABLE_INC
+        program { name: "go_groupchat_on";
+           signal: "elm,state,groupchat,enabled";
+           source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "default")) {
+              set_state(PART:"elm.image.bg", "groupchat_on", 0.0);
+              set_state(PART:"elm.text", "groupchat_on", 0.0);
+                       }
+            else if (!strcmp(st, "callerid_on")) {
+              set_state(PART:"elm.image.bg", "callerid_groupchat", 0.0);
+              set_state(PART:"elm.text", "callerid_groupchat", 0.0);
+                       }
+         }
         }
+#endif
         program { name: "go_textstatus_on";
            signal: "elm,state,text,status,enabled";
            source: "elm";
@@ -2676,17 +2818,22 @@ group { name: "elm/entry/base-password/popup";
       }
       parts {
          part {
-            name: "elm.rect.right.pad";
-           type: RECT;
-           scale: 1;
-           description {
-              state: "default" 0.0;
-              min: ENTRY_BUBBLE_EX_PAD 0;
-               fixed: 1 0;
-              align: 1.0 0.0;
-               color: 0 0 0 0;
-               rel1.relative: 1.0 0.0;
-           }
+           name: "elm.rect.right.pad";
+              type: RECT;
+              scale: 1;
+              description {
+                 state: "default" 0.0;
+                 min: ENTRY_BUBBLE_EX_PAD 0;
+              fixed: 1 0;
+                 align: 1.0 0.0;
+              color: 0 0 0 0;
+              rel1.relative: 1.0 0.0;
+              }
+              description {
+               state: "callerid_on" 0.0;
+               inherit: "default" 0.0;
+                  min: ENTRY_BUBBLE_EX_CALLERID_PAD 0;
+              }
          }
          part {
             name: "elm.rect.left.pad";
@@ -2741,19 +2888,96 @@ group { name: "elm/entry/base-password/popup";
               rel1.relative: 0.0 1.0;
            }
          }
+         part {
+           name: "elm.rect.bottomright.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: ENTRY_BUBBLE_BOTTOMRIGHT_PAD  2;
+              max: ENTRY_BUBBLE_BOTTOMRIGHT_PAD 2;
+              align: 1.0 1.0;
+                         visible: 0;
+           }
+         }
+         part {
+           name: "elm.rect.groupchat.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: 46 30;
+              max: 46 30;
+              align: 1.0 0.0;
+                         visible: 0;
+           }
+           description {
+              state: "callerid_on" 0.0;
+              inherit: "default" 0.0;
+              min: 130 30;
+              max: 130 30;
+           }
+         }
+         part {
+           name: "elm.rect.groupchat.text.pad";
+           type: RECT;
+           scale: 1;
+           description {
+              state: "default" 0.0;
+              min: 120 14;
+              max: 120 14;
+              align: 0.0 0.0;
+                         visible: 0;
+                         rel1 { relative: 0.0 1.0; to: "elm.rect.groupchat.pad"; }
+           }
+         }
+         part { name: "elm.text.groupchat";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               fixed: 1 1;
+               text {
+                  font: "SLP:style=Roman";
+                  size: ENTRY_BUBBLE_GROUPCHAT_SIZE_INC;
+                  min: 1 0;
+                                 align: 1.0 0.5;
+                  text_class: "slp_roman";
+               }
+               visible: 1;
+               color: ENTRY_BUBBLE_GROUPCHAT_COLOR_INC;
+               rel2 { relative: 0.0 1.0; to: "elm.rect.groupchat.pad"; }
+            }
+         }
         part {
            name: "elm.image.bg";
            type: IMAGE;
            scale: 1;
            description {
               state: "default" 0.0;
-               rel1.to_x: "elm.rect.left.pad";
+           rel1.to_x: "elm.rect.left.pad";
               image {
-                 normal: "00_MessageBubble_BG_send.png";
-                 border: 20 1 13 20;
-                 border_scale: 1;
+                     normal: "00_MessageBubble_BG_send.png";
+                     border: ENTRY_BUBBLE_SENT_BG_BORDER_INC;
+                     border_scale: 1;
               }
            }
+           description {
+              state: "callerid_on" 0.0;
+           inherit: "default" 0.0;
+           rel2 { relative: 0.0 1.0; to: "elm.rect.bottomright.pad"; }
+           }
+           description {
+              state: "callerid_groupchat" 0.0;
+           inherit: "default" 0.0;
+                  rel1 { relative: 0.0 1.0; to_x:"elm.rect.left.pad"; to_y:"elm.rect.groupchat.pad"; }
+           rel2 { relative: 0.0 1.0; to: "elm.rect.bottomright.pad"; }
+           }
+           description {
+              state: "groupchat_on" 0.0;
+           inherit: "default" 0.0;
+                  rel1 { relative: 0.0 1.0; to_x:"elm.rect.left.pad"; to_y:"elm.rect.groupchat.pad"; }
+           }
         }
          // it's temporary blocked for prepare entry's signal feature
          /*
@@ -2773,6 +2997,7 @@ group { name: "elm/entry/base-password/popup";
            }
          }
          */
+
          part {
            name: "elm.rect.subject.line";
            type: RECT;
@@ -2783,10 +3008,6 @@ 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.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"; }
            }
@@ -2801,8 +3022,8 @@ group { name: "elm/entry/base-password/popup";
                max: ENTRY_BUBBLE_CALLERID_WIDTH ENTRY_BUBBLE_CALLERID_HEIGHT;
                align: 1.0 0.0;
                visible: 0;
-               rel1 { relative: 0.0 1.0; to_x: "elm.rect.topright.pad"; to_y: "elm.rect.topright.pad"; }
-               rel2 { relative: 0.0 1.0; to_x: "elm.rect.topright.pad"; to_y: "elm.rect.bottom.pad"; }
+               rel1 { relative: ENTRY_BUBBLE_CALLERID_RELATIVE_INC; to_x: "elm.rect.topright.pad"; to_y: "elm.rect.topright.pad"; }
+               rel2 { relative: ENTRY_BUBBLE_CALLERID_RELATIVE_INC; to_x: "elm.rect.topright.pad"; to_y: "elm.rect.bottom.pad"; }
             }
             description { state: "callerid_on" 0.0;
                inherit: "default" 0.0;
@@ -2821,7 +3042,7 @@ group { name: "elm/entry/base-password/popup";
                visible: 0;
                rel1 { relative: 0.0 1.0; to_x: "elm.swallow.callerid"; to_y: "elm.rect.topright.pad"; }
                rel2 { relative: 0.0 1.0; to_x: "elm.swallow.callerid"; to_y: "elm.rect.bottom.pad"; }
-           }
+               }
          }
         part { name: "elm.text";
            type: TEXTBLOCK;
@@ -2836,21 +3057,34 @@ group { name: "elm/entry/base-password/popup";
            source3: ENTRY_BLOCK_HANDLE_SOURCE3; // block handle
            source5: "elm/entry/anchor/default"; // anchor under
            description {
-               state: "default" 0.0;
-               fixed: 1 0;
-               align: 1.0 0.0;
-               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"; }
+           state: "default" 0.0;
+           fixed: 1 0;
+           align: 1.0 0.0;
+           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;
-                  max: 1 0;
+                     style: "entry_textblock_style";
+                     min: 0 1;
+              max: 1 0;
               }
            }
+               /* callerid only */
            description { state: "callerid_on" 0.0;
                inherit: "default" 0.0;
                rel1 { relative: 0.0 1.0; to_y: "elm.rect.subject.line";}
-               rel2 { relative: 0.0 1.0; to_x: "elm.rect.callerid.pad"; to_y: "elm.rect.subject.line"; }
+               rel2 { relative: 0.0 1.0; to_x: ENTRY_BUBBLE_TEXT_CALLID_REL2_X_INC; to_y: "elm.rect.subject.line"; }
+           }
+               /* callerid and groupchat */
+           description { state: "callerid_groupchat" 0.0;
+               inherit: "default" 0.0;
+               rel1 { relative: 0.0 1.0; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+               rel2 { relative: 0.0 1.0; to_x: ENTRY_BUBBLE_TEXT_CALLID_REL2_X_INC; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+           }
+               /* groupchat only */
+           description { state: "groupchat_on" 0.0;
+               inherit: "default" 0.0;
+               rel1 { relative: 0.0 1.0; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
+               rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: ENTRY_BUBBLE_TEXT_CALLID_REL2_Y_INC; }
            }
            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
@@ -2865,12 +3099,13 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: GENLIST_PADDING_6_INC GENLIST_SIZE_64_INC;
+               min: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_SIZE_64_INC;
               fixed: 1 1;
               align: 1.0 1.0;
                visible: 0;
-              rel1 { relative: -0.8 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
-              rel2 { relative: -0.8 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
+                          color: 255 0 0 255;
+              rel1 { relative: ENTRY_BUBBLE_STATUS_TIME_PAD_REL_INC; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
+              rel2 { relative: ENTRY_BUBBLE_STATUS_TIME_PAD_REL_INC; to_x: "elm.rect.left.pad"; to_y: "elm.rect.bottom.pad"; }
            }
         }
          part {
@@ -2879,11 +3114,12 @@ group { name: "elm/entry/base-password/popup";
            scale: 1;
            description {
               state: "default" 0.0;
-               min: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC;
-               max: GENLIST_PADDING_6_INC GENLIST_PADDING_34_INC;
+               min: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_PADDING_34_INC;
+               max: ENTRY_BUBBLE_STATUS_TIME_PAD_MIN_H_INC GENLIST_PADDING_34_INC;
               fixed: 1 1;
               align: 0.0 0.0;
                visible: 0;
+                          color: 0 255 0 255;
               rel1.to: "elm.rect.status.pad";
               rel2 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.bottom.pad"; }
            }
@@ -2896,12 +3132,12 @@ group { name: "elm/entry/base-password/popup";
                fixed: 1 1;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_28_INC;
+                  size: ENTRY_BUBBLE_STATUS_TIME_SIZE_INC;
                   min: 1 0;
                   text_class: "slp_roman";
                }
                visible: 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               color: ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC;
                rel1 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
                rel2 { relative: 0.0 0.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.status.pad"; }
             }
@@ -2918,12 +3154,12 @@ group { name: "elm/entry/base-password/popup";
                fixed: 1 1;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_28_INC;
+                  size: ENTRY_BUBBLE_STATUS_TIME_SIZE_INC;
                   min: 1 0;
                   text_class: "slp_roman";
                }
                visible: 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               color: ENTRY_BUBBLE_SENT_STATUS_TIME_COLOR_INC;
                rel1 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.time.pad"; }
                rel2 { relative: 0.0 1.0; to_x: "elm.rect.status.pad"; to_y: "elm.rect.time.pad"; }
             }
@@ -2985,16 +3221,80 @@ group { name: "elm/entry/base-password/popup";
         program { name: "go_callerid_on";
            signal: "elm,state,callerid,enabled";
            source: "elm";
-           action: STATE_SET "callerid_on" 0.0;
-           target: "elm.swallow.callerid";
-           target: "elm.text";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "default")) {
+              set_state(PART:"elm.image.bg", "callerid_on", 0.0);
+              set_state(PART:"elm.text", "callerid_on", 0.0);
+                       }
+            else if (!strcmp(st, "groupchat_on")) {
+              set_state(PART:"elm.image.bg", "callerid_groupchat", 0.0);
+              set_state(PART:"elm.text", "callerid_groupchat", 0.0);
+                       }
+
+            set_state(PART:"elm.swallow.callerid", "callerid_on", 0.0);
+            set_state(PART:"elm.rect.right.pad", "callerid_on", 0.0);
+            set_state(PART:"elm.rect.groupchat.pad", "callerid_on", 0.0);
+         }
         }
         program { name: "go_callerid_off";
            signal: "elm,state,callerid,disabled";
            source: "elm";
-           action: STATE_SET "default" 0.0;
-           target: "elm.swallow.callerid";
-           target: "elm.text";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "callerid_groupchat")) {
+              set_state(PART:"elm.image.bg", "groupchat_on", 0.0);
+              set_state(PART:"elm.text", "groupchat_on", 0.0);
+                       }
+            else {
+              set_state(PART:"elm.image.bg", "default", 0.0);
+              set_state(PART:"elm.text", "default", 0.0);
+                       }
+
+            set_state(PART:"elm.swallow.callerid", "default", 0.0);
+            set_state(PART:"elm.rect.groupchat.pad", "default", 0.0);
+                }
+        }
+/* groupchat - since white-hd theme */
+#if ENTRY_BUBBLE_GROUPCHART_ENABLE_INC
+        program { name: "go_groupchat_on";
+           signal: "elm,state,groupchat,enabled";
+           source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "default")) {
+              set_state(PART:"elm.image.bg", "groupchat_on", 0.0);
+              set_state(PART:"elm.text", "groupchat_on", 0.0);
+                       }
+            else if (!strcmp(st, "callerid_on")) {
+              set_state(PART:"elm.image.bg", "callerid_groupchat", 0.0);
+              set_state(PART:"elm.text", "callerid_groupchat", 0.0);
+                       }
+         }
+        }
+#endif
+        program { name: "go_groupchat_off";
+           signal: "elm,state,groupchat,disabled";
+           source: "elm";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.text", st, 30, vl);
+            if (!strcmp(st, "callerid_groupchat")) {
+              set_state(PART:"elm.image.bg", "callerid_on", 0.0);
+              set_state(PART:"elm.text", "callerid_on", 0.0);
+                       }
+            else {
+              set_state(PART:"elm.image.bg", "default", 0.0);
+              set_state(PART:"elm.text", "default", 0.0);
+                       }
+                }
         }
         program { name: "go_textstatus_on";
            signal: "elm,state,text,status,enabled";