Added button's style viz. "contacts/delete" to comply with UX ver-1.2

Change-Id: I7e3e2111ece9542150eb81640e3661ff6c38ba55

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index d80127b..4684ef7 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -3573,12 +3573,12 @@
             mouse_events: 1; \
             repeat_events: 1; \
             description { state: "default" 0.0; \
-               color: 255 255 255 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "clicked" 0.0; \
                inherit:  "default" 0.0; \
                visible: 1; \
-               color: 255 255 255 0; \
+               color: 0 0 0 0; \
             } \
          } \
          part { name: "disabler"; \
@@ -3719,7 +3719,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
 #define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
-   group { name: "elm/button/base/"style_name; \
+   group { name: "elm/button/base/contacts"style_name; \
+   alias: "elm/button/base/"style_name; \
       images { \
          image: image_normal COMP; \
          image: image_press COMP; \
@@ -3783,12 +3784,12 @@
             mouse_events: 1; \
             repeat_events: 1; \
             description { state: "default" 0.0; \
-               color: 255 255 255 0; \
+               color: 0 0 0 0; \
             } \
             description { state: "clicked" 0.0; \
                inherit:  "default" 0.0; \
                visible: 1; \
-               color: 255 255 255 0; \
+               color: 0 0 0 0; \
             } \
          } \
          part { name: "disabler"; \
@@ -3877,6 +3878,378 @@ BUTTON_EDIT_STYLES("icon_expand", "00_button_icon_expand.png", "00_button_icon_e
 BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_button_icon_expand_press.png", 60, 75)
 
 ///////////////////////////////////////////////////////////////////////////////////////
+   group { name: "elm/button/base/contacts/delete";
+      images {
+         image: "00_button_EditStyle.png" COMP;
+         image: "00_button_EditStyle_press.png" COMP;
+         image: "00_button_EditStyle_dim.png" COMP;
+      }
+      script {
+         public button_state = BUTTON_STATE_ENABLED;
+      }
+      parts {
+         part { name: "button_image";
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 28 46;
+               image {
+                  normal: "00_button_EditStyle.png";
+                  border: 8 0 3 3;
+                  border_scale: 1;
+               }
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_EditStyle_press.png";
+            }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               image.normal: "00_button_EditStyle_dim.png";
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_button_EditStyle_press.png";
+            }
+         }
+         part {
+            name: "padding_left_top";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 0.0 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+               min: 16 2;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part {
+            name: "padding_right_bottom";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               align: 1.0 1.0;
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+               min: 12 2;
+               fixed: 1 1;
+               visible: 0;
+            }
+         }
+         part {
+            name: "padding_icon_text";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0; //when only icon or no icon is there
+               align: 0.0 0.0;
+               rel1 { relative: 1.0 0.0; to: "elm.swallow.content"; }
+               rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
+               fixed: 1 0;
+               min: 0 0;
+               visible: 0;
+            }
+            description { state: "icononly" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "visible" 0.0; //when icon is visible
+               inherit: "default" 0.0;
+               min: 5 0;
+            }
+         }
+         part { name: "elm.swallow.content";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               align: 0.0 0.5;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               fixed: 1 0;
+            }
+            description { state: "visible" 0.0;
+               fixed: 1 0;
+               visible: 1;
+               align: 0.0 0.5;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+            description { state: "icononly" 0.0;
+               visible: 1;
+               min: 42 42;
+               rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
+               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               align: 0.5 0.5;
+               aspect: 1.0 1.0;
+               aspect_preference: VERTICAL;
+            }
+         }
+         part { name: "elm.text";
+            type: TEXT;
+            mouse_events:  0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
+               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
+               align: 0.5 0.5;
+               color: BUTTON_TEXT_CONTACTS_DELETE_NORMAL_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: 20;
+                  min:  1 0;
+                  align: 0.5 0.5;
+                  max: 1 0;
+                  text: "Delete";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+            }
+            description { state: "clicked" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 128;
+               color3: 0 0 0 0;
+            }
+            description { state: "disabled_visible" 0.0;
+               inherit: "default" 0.0;
+               color: BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC;
+               color3: 0 0 0 0;
+            }
+            description { state: "focused" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               min: 0 0;
+               color: BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC;
+            }
+         }
+         part { name: "over2";
+            type: RECT;
+            mouse_events: 1;
+            repeat_events: 1;
+            ignore_flags: ON_HOLD;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit:  "default" 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "over3";
+            type: RECT;
+            mouse_events: 1;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+            }
+            description { state: "clicked" 0.0;
+               inherit:  "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "disabler";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 0;
+            }
+            description { state: "disabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "button_click";
+            signal: "mouse,down,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,press" "";
+            after: "button_click_anim";
+         }
+         program { name: "button_click_anim";
+            action: STATE_SET "clicked" 0.0;
+            target: "button_image";
+            after: "text_clicked";
+         }
+         program { name: "text_clicked";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "clicked", 0.0);
+            }
+         }
+         program { name: "button_unpress";
+            action: SIGNAL_EMIT "elm,action,unpress" "";
+         }
+         program { name: "button_mouseout_clicked";
+            signal: "mouse,up,1";
+            source: "over3";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (strcmp(st, "icononly"))
+               {
+                  emit("elm,action,default,text,set", "");
+                  set_state(PART:"elm.text", "visible", 0.0);
+               }
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                  set_state(PART:"button_image", "default", 0.0);
+            }
+            after: button_unpress;
+         }
+         program { name: "button_click2";
+            signal: "mouse,down,1";
+            source: "over3";
+            action: STATE_SET "clicked" 0.0;
+            target: "over3";
+         }
+         program { name: "button_unclick2";
+            signal: "mouse,clicked,1";
+            source: "over3";
+            action: STATE_SET "default" 0.0;
+            target: "over3";
+         }
+         program { name: "button_unclick3";
+            signal: "mouse,clicked,1";
+            source: "over2";
+            action: SIGNAL_EMIT "elm,action,click" "";
+         }
+         program { name: "text_show";
+            signal: "elm,state,text,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "icononly"))
+               {
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+                  set_state(PART:"padding_icon_text", "visible", 0.0);
+               }
+               if(get_int(button_state) != BUTTON_STATE_DISABLED)
+                 set_state(PART:"elm.text", "visible", 0.0);
+               else
+                 set_state(PART:"elm.text", "disabled_visible", 0.0);
+            }
+         }
+         program { name: "text_hide";
+            signal: "elm,state,text,hidden";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.swallow.content", st, 30, vl);
+               if (!strcmp(st, "visible"))
+               {
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                  set_state(PART:"padding_icon_text", "icononly", 0.0);
+               }
+               set_state(PART:"elm.text", "default", 0.0);
+            }
+         }
+         program { name: "icon_show";
+            signal: "elm,state,icon,visible";
+            source: "elm";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+               {
+                  set_state(PART:"elm.swallow.content", "visible", 0.0);
+                  set_state(PART:"padding_icon_text", "visible", 0.0);
+               }
+               else
+               {
+                  set_state(PART:"elm.swallow.content", "icononly", 0.0);
+                  set_state(PART:"padding_icon_text", "icononly", 0.0);
+               }
+            }
+         }
+         program { name: "icon_hide";
+            signal: "elm,state,icon,hidden";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.swallow.content";
+         }
+         program { name: "disable";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "button_image";
+            target: "over2";
+            target: "disabler";
+            after: "disable_text";
+         }
+         program { name: "disable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "visible"))
+                  set_state(PART:"elm.text", "disabled_visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "disabled", 0.0);
+               set_int(button_state, BUTTON_STATE_DISABLED);
+            }
+         }
+         program { name: "enable";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            target: "over2";
+            target: "disabler";
+            after: "enable_text";
+         }
+         program { name: "enable_text";
+            script {
+               new st[31];
+               new Float:vl;
+               get_state(PART:"elm.text", st, 30, vl);
+               if (!strcmp(st, "disabled_visible"))
+                  set_state(PART:"elm.text", "visible", 0.0);
+               else
+                  set_state(PART:"elm.text", "default", 0.0);
+               set_int(button_state, BUTTON_STATE_ENABLED);
+            }
+         }
+         program { name: "focused";
+            //signal: "elm,action,focus";
+            //source: "elm";
+            action: STATE_SET "focused" 0.0;
+            target: "button_image";
+            target: "elm.text";
+         }
+         program { name: "unfocused";
+            //signal: "elm,action,unfocus";
+            //source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "button_image";
+            after: "unfocus_text";
+         }
+         program { name: "unfocus_text";
+            action: STATE_SET "visible" 0.0;
+            target: "elm.text";
+         }
+      }
+   }
+
+///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/multiline";
       alias: "elm/button/base/text_only/multiline";
       images {
@@ -7279,12 +7652,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
             rel1.to: "button_image";
             rel2.to: "button_image";
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
          }
          part { name: "disabler";
@@ -7577,14 +7950,14 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             description { state: "default" 0.0;
                rel1.to: "button_image";
                rel2.to: "button_image";
-               color: 255 255 255 0;
+               color: 0 0 0 0;
                fixed: 1 1;
                min: 28 40;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
          }
          part { name: "disabler";
@@ -7814,12 +8187,12 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
                visible: 1;
-               color: 255 255 255 0;
+               color: 0 0 0 0;
             }
          }
          part { name: "disabler";

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 64eee6a..c6384de 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -230,6 +230,10 @@
 #define BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC                   180 176 162 255
 #define BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC           41 36 34 255
 
+#define BUTTON_TEXT_CONTACTS_DELETE_NORMAL_COLOR_INC 207 41 41 255
+#define BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 43736f7..d257aef 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -252,6 +252,10 @@
 #define BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_COLOR_INC                   154 144 123 255
 #define BUTTON_HIDDEN_BUTTON_TEXT_DISABLED_SHAWDOW_COLOR_INC           255 255 255 255
 
+#define BUTTON_TEXT_CONTACTS_DELETE_NORMAL_COLOR_INC 207 41 41 255
+#define BUTTON_TEXT_CONTACTS_DELETE_PRESSED_COLOR_INC 255 255 255 255
+#define BUTTON_TEXT_CONTACTS_DELETE_DISABLED_COLOR_INC 0 0 0 128
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255