Merge "[panes] Added support for UI Mirroring."

diff --git a/debian/changelog b/debian/changelog
index 083c8b4..a6f40d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nbeat-theme (0.1.1-30) unstable; urgency=low
+
+  * Package Upload : sync with elementary
+  * Git: 165.213.180.234:/slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-30
+
+ -- WooHyun Jung <wh0705.jung@samsung.com>  Sat, 30 Apr 2011 10:37:41 +0900
+
 nbeat-theme (0.1.1-29) unstable; urgency=low
 
   * [Genlist] Upstream merge. Added genlist mode feature.

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/groups/conformant.edc b/themes/groups/conformant.edc
index ad8543f..f8ec3d8 100644 (file)
--- a/themes/groups/conformant.edc
+++ b/themes/groups/conformant.edc
@@ -26,20 +26,10 @@
 /////////////////////////////////////////////////////////////////////////////
  group { name: "elm/conformant/base/default";
      parts {
-        part { name: "elm.swallow.shelf";
-           type: SWALLOW;
-           description { state: "default" 0.0;
-              fixed: 1 1;
-              align: 0.0 0.0;
-              rel2.relative: 1.0 0.0;
-           }
-        }
         part { name: "elm.swallow.content";
            type: SWALLOW;
            description { state: "default" 0.0;
               align: 0.5 0.5;
-              rel1.relative: 0.0 1.0;
-              rel1.to_y: "elm.swallow.shelf";
               rel2.relative: 1.0 0.0;
               rel2.to_y: "elm.swallow.virtualkeypad";
            }

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 2024f0d..7d90055 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -288,13 +288,13 @@
        group{
                name: "elm/controlbar/item_bg/default";
                images{
-//                     image: "00_winset_tabbar_focus.png" COMP;
-                       image: "00_winset_tab_press_left.png" COMP;
-                       image: "00_winset_tab_press_right.png" COMP;
+                       image: "00_winset_tabbar_press.png" COMP;
+                       image: "00_winset_tabbar_press_left.png" COMP;
+                       image: "00_winset_tabbar_press_right.png" COMP;
                        image: "00_winset_toolbar_press.png" COMP;
                        image: "00_winset_tabbar_focus.png" COMP;
-                       image: "00_winset_tab_focus_left.png" COMP;
-                       image: "00_winset_tab_focus_right.png" COMP;
+                       image: "00_winset_tabbar_focus_left.png" COMP;
+                       image: "00_winset_tabbar_focus_right.png" COMP;
                }
 
                parts{
@@ -325,24 +325,24 @@
                                description{
                                        state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_press.png";
+                                       image.border: 2 2 3 2;
                                        color: 255 255 255 50;
                                        visible: 1;
                                }
                                description{
                                        state: "pressed_left" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_press_left.png";
+                                       image.border: 2 3 2 2;
                                        color: 255 255 255 50;
                                        visible: 1;
                                }
                                description{
                                        state: "pressed_right" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_press_right.png";
+                                       image.border: 3 2 2 2;
                                        color: 255 255 255 50;
                                        visible: 1;
                                }
@@ -350,21 +350,21 @@
                                        state: "focused" 0.0;
                                        inherit: "default" 0.0;
                                        image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.border: 2 2 3 2;
                                        visible: 1;
                                }
                                description{
                                        state: "focused_left" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_focus_left.png";
+                                       image.border: 2 3 2 2;
                                        visible: 1;
                                }
                                description{
                                        state: "focused_right" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_focus_right.png";
+                                       image.border: 3 2 2 2;
                                        visible: 1;
                                }
                                description{
@@ -739,7 +739,7 @@
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: 0 0;}
                                        image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.border: 2 2 3 2;
                                }
                        }
                }
@@ -748,7 +748,7 @@
        group{
                name: "elm/controlbar/item_bg_move_left/default";
                images{
-                       image: "00_winset_tabbar_focus.png" COMP;
+                       image: "00_winset_tabbar_focus_left.png" COMP;
                }
 
                parts{
@@ -759,8 +759,8 @@
                                description{
                                        state: "default" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_focus_left.png";
+                                       image.border: 2 3 2 2;
                                }
                        }
                }
@@ -769,7 +769,7 @@
        group{
                name: "elm/controlbar/item_bg_move_right/default";
                images{
-                       image: "00_winset_tabbar_focus.png" COMP;
+                       image: "00_winset_tabbar_focus_right.png" COMP;
                }
 
                parts{
@@ -780,8 +780,8 @@
                                description{
                                        state: "default" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tabbar_focus.png";
-                                       image.border: 2 2 2 2;
+                                       image.normal: "00_winset_tabbar_focus_right.png";
+                                       image.border: 3 2 2 2;
                                }
                        }
                }

diff --git a/themes/groups/ctxpopup.edc b/themes/groups/ctxpopup.edc
index 84e4068..29e054d 100644 (file)
--- a/themes/groups/ctxpopup.edc
+++ b/themes/groups/ctxpopup.edc
@@ -1141,6 +1141,8 @@
                                description {
                                        state: "default" 0.0;
                                        visible: 0;
+                                       min: 100 70;
+                                       max: 100 70;
                                }
                                description {
                                        state: "clicked" 0.0;
@@ -1155,8 +1157,8 @@
                                name: "left_top_padding";
                                scale: 1;
                                description {
-                                       min: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_PADDING;
-                                       max: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_PADDING;
+                                       min: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
+                                       max: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
                                        visible: 0;
                                        align: 0 0;
                                        fixed: 1 1;
@@ -1198,9 +1200,9 @@
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: (CTXPOPUP_ICON_WIDTH+30) CTXPOPUP_ICON_HEIGHT;
-                                       max: (CTXPOPUP_ICON_WIDTH+30) CTXPOPUP_ICON_HEIGHT;
-                                       align: 0.5 0.5;
+                                       min: (CTXPOPUP_ICON_WIDTH - 10) (CTXPOPUP_ICON_HEIGHT - 10);
+                                       max: (CTXPOPUP_ICON_WIDTH - 10) (CTXPOPUP_ICON_HEIGHT - 10);
+                                       align: 0 0;
                                        aspect: 1.0 1.0;
                                        rel1 { to: "left_top_padding"; relative: 1 1; }
                                        rel2 { to: "right_bottom_padding"; relative: 0 0; }
@@ -1210,8 +1212,8 @@
                                name: "right_bottom_padding";
                                scale: 1;
                                description {
-                                       min: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_PADDING;
-                                       max: CTXPOPUP_ITEM_PADDING CTXPOPUP_ITEM_PADDING;
+                                       min: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
+                                       max: (CTXPOPUP_ITEM_PADDING + 15) CTXPOPUP_ITEM_PADDING;
                                        visible: 0;
                                        align: 1 1;
                                        fixed: 1 1;

diff --git a/themes/groups/genlist/genlist_expandable_list.edc b/themes/groups/genlist/genlist_expandable_list.edc
index 24503e4..a55f6e3 100644 (file)
--- a/themes/groups/genlist/genlist_expandable_list.edc
+++ b/themes/groups/genlist/genlist_expandable_list.edc
@@ -226,6 +226,14 @@
             target: "arrow"; \
          } \
          program { \
+            BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
             BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
             target: "base"; \
             target: "elm.text"; \
@@ -234,7 +242,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 ) \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -258,7 +266,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 ) \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -392,6 +400,14 @@
             target: "disclip"; \
          } \
          program { \
+            BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.pad"; \
+            target: "elm.swallow.end"; \
+            target: "bottom_line"; \
+         } \
+         program { \
             BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
             target: "base"; \
             target: "elm.text"; \
@@ -400,7 +416,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 ) \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -424,7 +440,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 ) \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \

diff --git a/themes/groups/genlist/genlist_macro.edc b/themes/groups/genlist/genlist_macro.edc
index 681e34d..79229ee 100644 (file)
--- a/themes/groups/genlist/genlist_macro.edc
+++ b/themes/groups/genlist/genlist_macro.edc
@@ -306,6 +306,7 @@
 #define BEAT_GENLIST_PART_MAP_START( param_x, param_y, param_z ) \
                description { state: "map_transition" 0.0; \
                    inherit: "default" 0.0; \
+                   color: 86 76 65 255; \
                    map { \
                       perspective: "point"; \
                       on: 1; \
@@ -375,6 +376,11 @@
             BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
+#define BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+                name: "unvisible"; \
+                signal: "elm,state,unvisible"; \
+                action: STATE_SET "map_transition" 0.0;
+
 #define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
                 name: "rotaion_transition"; \
                 signal: "flip_item"; \
@@ -392,7 +398,7 @@
                 action: STATE_SET "default" 0.0;
 
 #define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
-                name: "rotaion_transition2"; \
+                name: "rotation_transition2"; \
                 signal: "elm,state,contract_flip"; \
                 action: STATE_SET "map_rotate" 0.0; \
                 after: "rotation2";

diff --git a/themes/images/nbeat-black/00_winset_tabbar_focus.png b/themes/images/nbeat-black/00_winset_tabbar_focus.png
index 0f4d2a8..8487da3 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_focus.png and b/themes/images/nbeat-black/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat/00_winset_tab_press_left.png b/themes/images/nbeat-black/00_winset_tabbar_focus_left.png
similarity index 90%
rename from themes/images/nbeat/00_winset_tab_press_left.png
rename to themes/images/nbeat-black/00_winset_tabbar_focus_left.png
index a1996d8..72217df 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tab_press_left.png and b/themes/images/nbeat-black/00_winset_tabbar_focus_left.png differ

diff --git a/themes/images/nbeat/00_winset_tab_focus_left.png b/themes/images/nbeat-black/00_winset_tabbar_focus_right.png
similarity index 90%
rename from themes/images/nbeat/00_winset_tab_focus_left.png
rename to themes/images/nbeat-black/00_winset_tabbar_focus_right.png
index 1652300..d9400e6 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tab_focus_left.png and b/themes/images/nbeat-black/00_winset_tabbar_focus_right.png differ

diff --git a/themes/images/nbeat/00_winset_tab_focus_right.png b/themes/images/nbeat-black/00_winset_tabbar_press.png
similarity index 90%
rename from themes/images/nbeat/00_winset_tab_focus_right.png
rename to themes/images/nbeat-black/00_winset_tabbar_press.png
index df171e5..3156216 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tab_focus_right.png and b/themes/images/nbeat-black/00_winset_tabbar_press.png differ

diff --git a/themes/images/nbeat/00_winset_tab_press_right.png b/themes/images/nbeat-black/00_winset_tabbar_press_left.png
similarity index 90%
rename from themes/images/nbeat/00_winset_tab_press_right.png
rename to themes/images/nbeat-black/00_winset_tabbar_press_left.png
index 8fee887..bbbd3dd 100644 (file)
Binary files a/themes/images/nbeat/00_winset_tab_press_right.png and b/themes/images/nbeat-black/00_winset_tabbar_press_left.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_press_right.png b/themes/images/nbeat-black/00_winset_tabbar_press_right.png
new file mode 100644 (file)
index 0000000..a1e1d7a
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_tabbar_press_right.png differ

diff --git a/themes/images/nbeat/00_winset_tab_focus.png b/themes/images/nbeat/00_winset_tab_focus.png
deleted file mode 100644 (file)
index 5f24abb..0000000
Binary files a/themes/images/nbeat/00_winset_tab_focus.png and /dev/null differ

diff --git a/themes/images/nbeat/00_winset_tab_press.png b/themes/images/nbeat/00_winset_tab_press.png
deleted file mode 100644 (file)
index 75974f4..0000000
Binary files a/themes/images/nbeat/00_winset_tab_press.png and /dev/null differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus.png b/themes/images/nbeat/00_winset_tabbar_focus.png
index 0f4d2a8..8487da3 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_tabbar_focus.png and b/themes/images/nbeat/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus_left.png b/themes/images/nbeat/00_winset_tabbar_focus_left.png
new file mode 100644 (file)
index 0000000..72217df
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_focus_left.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus_right.png b/themes/images/nbeat/00_winset_tabbar_focus_right.png
new file mode 100644 (file)
index 0000000..d9400e6
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_focus_right.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_press.png b/themes/images/nbeat/00_winset_tabbar_press.png
new file mode 100644 (file)
index 0000000..3156216
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_press.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_press_left.png b/themes/images/nbeat/00_winset_tabbar_press_left.png
new file mode 100644 (file)
index 0000000..bbbd3dd
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_press_left.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_press_right.png b/themes/images/nbeat/00_winset_tabbar_press_right.png
new file mode 100644 (file)
index 0000000..a1e1d7a
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_press_right.png differ

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