projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6e37a03)
[Button & check] Modified circle styles and edit styles to implement changes in white...
authorAmit Kamboj <amit.kamboj@samsung.com>
Fri, 20 Jul 2012 08:30:07 +0000 (14:00 +0530)
committerAmit Kamboj <amit.kamboj@samsung.com>
Fri, 20 Jul 2012 08:30:07 +0000 (14:00 +0530)
Change-Id: I8767bac1d1f828a199a0a8f22feb76deb8752033

themes/images/tizen-hd/00_btn_circle_bg_normal_01.png [new file with mode: 0644] patch | blob
themes/images/tizen-hd/00_btn_circle_bg_press_01.png [new file with mode: 0644] patch | blob
themes/images/tizen-hd/00_button_edit_Delete.png [new file with mode: 0644] patch | blob
themes/images/tizen-hd/00_button_edit_Delete_press.png [new file with mode: 0644] patch | blob
themes/widgets/button.edc patch | blob | history
themes/widgets/check.edc patch | blob | history

diff --git a/themes/images/tizen-hd/00_btn_circle_bg_normal_01.png b/themes/images/tizen-hd/00_btn_circle_bg_normal_01.png
new file mode 100644 (file)
index 0000000..23b80f0
Binary files /dev/null and b/themes/images/tizen-hd/00_btn_circle_bg_normal_01.png differ
diff --git a/themes/images/tizen-hd/00_btn_circle_bg_press_01.png b/themes/images/tizen-hd/00_btn_circle_bg_press_01.png
new file mode 100644 (file)
index 0000000..9408a25
Binary files /dev/null and b/themes/images/tizen-hd/00_btn_circle_bg_press_01.png differ
diff --git a/themes/images/tizen-hd/00_button_edit_Delete.png b/themes/images/tizen-hd/00_button_edit_Delete.png
new file mode 100644 (file)
index 0000000..a7aabe9
Binary files /dev/null and b/themes/images/tizen-hd/00_button_edit_Delete.png differ
diff --git a/themes/images/tizen-hd/00_button_edit_Delete_press.png b/themes/images/tizen-hd/00_button_edit_Delete_press.png
new file mode 100644 (file)
index 0000000..306c745
Binary files /dev/null and b/themes/images/tizen-hd/00_button_edit_Delete_press.png differ
diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 74eed38..37b0c3e 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -4790,11 +4790,11 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_CIRCLE_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#define BUTTON_CIRCLE_STYLES(style_name, circle_normal, circle_press, image_normal, image_press, min_width, min_height) \
    group { name: "elm/button/base/"style_name; \
       images { \
-         image: "00_btn_circle_bg_normal.png" COMP; \
-         image: "00_btn_circle_bg_press.png" COMP; \
+         image: circle_normal COMP; \
+         image: circle_press COMP; \
          image: image_normal COMP; \
          image: image_press COMP; \
       } \
@@ -4804,13 +4804,13 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0; \
                min: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
                max: BUTTON_CIRCLE_STYLE_BG_MIN_MAX_INC; \
-               image.normal: "00_btn_circle_bg_normal.png"; \
+               image.normal: circle_normal; \
                color: 255 255 255 255; \
             } \
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_btn_circle_bg_press.png"; \
+               image.normal: circle_press; \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -4915,71 +4915,72 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal", "00_button_reveal.png", "00_button_reveal_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("reveal", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_reveal.png", "00_button_reveal_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("reveal/extended", "00_button_reveal.png", "00_button_reveal_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("reveal/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_reveal.png", "00_button_reveal_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("expand/closed", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("expand/closed/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_expand_closed.png", "00_button_expand_closed_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("expand/opened", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("expand/opened/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_expand_opened.png", "00_button_expand_opened_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info", "00_button_info.png", "00_button_info_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("info", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_info.png", "00_button_info_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("info/extended", "00_button_info.png", "00_button_info_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("info/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_info.png", "00_button_info_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename", "00_button_rename.png", "00_button_rename_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("rename", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_rename.png", "00_button_rename_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("rename/extended", "00_button_rename.png", "00_button_rename_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("rename/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_rename.png", "00_button_rename_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call", "00_button_call.png", "00_button_call_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("call", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_call.png", "00_button_call_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("call/extended", "00_button_call.png", "00_button_call_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("call/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_call.png", "00_button_call_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("warning", "00_button_warning.png", "00_button_warning_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("warning", "00_btn_circle_bg_normal_01.png", "00_btn_circle_bg_press_01.png", "00_button_warning.png", "00_button_warning_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("warning/extended", "00_button_warning.png", "00_button_warning_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("warning/extended", "00_btn_circle_bg_normal_01.png", "00_btn_circle_bg_press_01.png", "00_button_warning.png", "00_button_warning_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus", "00_button_plus.png", "00_button_plus_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("plus", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_plus.png", "00_button_plus_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("plus/extended", "00_button_plus.png", "00_button_plus_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("plus/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_plus.png", "00_button_plus_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus", "00_button_minus.png", "00_button_minus_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("minus", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_minus.png", "00_button_minus_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("minus/extended", "00_button_minus.png", "00_button_minus_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("minus/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_minus.png", "00_button_minus_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel", "00_button_cancel.png", "00_button_cancel_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("cancel", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_cancel.png", "00_button_cancel_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("cancel/extended", "00_button_cancel.png", "00_button_cancel_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("cancel/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_cancel.png", "00_button_cancel_press.png", 60, 70)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send", "00_button_send.png", "00_button_send_press.png", 40, 40)
+   BUTTON_CIRCLE_STYLES("send", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_send.png", "00_button_send_press.png", 40, 40)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_CIRCLE_STYLES("send/extended", "00_button_send.png", "00_button_send_press.png", 60, 70)
+   BUTTON_CIRCLE_STYLES("send/extended", "00_btn_circle_bg_normal.png", "00_btn_circle_bg_press.png", "00_button_send.png", "00_button_send_press.png", 60, 70)
 ///////////////////////////////////////////////////////////////////////////////////////
+
    group { name: "elm/button/base/circle/empty";
       images {
          image: "00_btn_circle_bg_normal.png" COMP;
@@ -5104,14 +5105,14 @@ group { name: "elm/button/base/searchbar/default";
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-#define BUTTON_EDIT_STYLES(style_name, image_normal, image_press, min_width, min_height) \
+#define BUTTON_EDIT_STYLES(style_name, edit_normal, edit_press, image_normal, image_press, min_width, min_height) \
    group { name: "elm/button/base/contacts/"style_name; \
    alias: "elm/button/base/"style_name; \
       images { \
          image: image_normal COMP; \
          image: image_press COMP; \
-         image: "00_button_edit.png" COMP; \
-         image: "00_button_edit_press.png" COMP; \
+         image: edit_normal COMP; \
+         image: edit_press COMP; \
          image: "00_button_edit_dim.png" COMP; \
          image: "00_button_edit_focus.png" COMP; \
       } \
@@ -5122,7 +5123,7 @@ group { name: "elm/button/base/searchbar/default";
                min: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
                max: BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC; \
                image { \
-                  normal: "00_button_edit.png"; \
+                  normal: edit_normal; \
                   border: BUTTON_EDIT_STYLE_BORDER_INC; \
                   border_scale: 1; \
                } \
@@ -5130,7 +5131,7 @@ group { name: "elm/button/base/searchbar/default";
             description { \
                state: "clicked" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_button_edit_press.png"; \
+               image.normal: edit_press; \
             } \
             description { \
                state: "disabled" 0.0; \
@@ -5237,34 +5238,34 @@ group { name: "elm/button/base/searchbar/default";
       } \
    }
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_plus/extended", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_plus.png", "00_button_icon_plus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_minus", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_minus", "00_button_edit_Delete.png", "00_button_edit_Delete_press.png", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_minus/extended", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_minus/extended", "00_button_edit_Delete.png", "00_button_edit_Delete_press.png", "00_button_icon_minus.png", "00_button_icon_minus_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand.png", "00_button_icon_expand_press.png", BUTTON_EDIT_EXTENDED_MIN_WIDTH_INC, BUTTON_EDIT_EXTENDED_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_icon_expand_closed.png", "00_button_icon_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_closed", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand_closed.png", "00_button_icon_expand_closed_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_icon_expand_opened.png", "00_button_icon_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
+   BUTTON_EDIT_STYLES("icon_expand_opened", "00_button_edit.png", "00_button_edit_press.png", "00_button_icon_expand_opened.png", "00_button_icon_expand_opened_press.png", BUTTON_EDIT_NORMAL_MIN_WIDTH_INC, BUTTON_EDIT_NORMAL_MIN_HEIGHT_INC)
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/contacts/delete";
       images {
-         image: "00_button_edit.png" COMP;
-         image: "00_button_edit_press.png" COMP;
+         image: "00_button_edit_Delete.png" COMP;
+         image: "00_button_edit_Delete_press.png" COMP;
          image: "00_button_edit_dim.png" COMP;
          image: "00_button_edit_focus.png" COMP;
       }
@@ -5277,14 +5278,14 @@ group { name: "elm/button/base/searchbar/default";
             description { state: "default" 0.0;
                min: BUTTON_CONTACT_DELETE_BG_NORMAL_MIN_INC;
                image {
-                  normal: "00_button_edit.png";
+                  normal: "00_button_edit_Delete.png";
                   border: BUTTON_CONTACT_DELETE_BG_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_Delete_press.png";
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc
index 4a036cf..f29cb38 100644 (file)
--- a/themes/widgets/check.edc
+++ b/themes/widgets/check.edc
@@ -1510,8 +1510,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
       images {
          image: "00_button_icon_minus.png" COMP;
          image: "00_button_icon_minus_press.png" COMP;
-         image: "00_button_edit.png" COMP;
-         image: "00_button_edit_press.png" COMP;
+         image: "00_button_edit_Delete.png" COMP;
+         image: "00_button_edit_Delete_press.png" COMP;
          image: "00_button_edit_dim.png" COMP;
          image: "00_button_edit_focus.png" COMP;
       }
@@ -1526,14 +1526,14 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                rel1.to: "bg2";
                rel2.to: "bg2";
                image {
-                  normal: "00_button_edit.png";
+                  normal: "00_button_edit_Delete.png";
                   border: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC;
                   border_scale: 1;
                }
             }
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_Delete_press.png";
             }
             description { state: "intermediate" 0.0;
                inherit: "default" 0.0;
@@ -1605,7 +1605,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
                min: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
                max: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_IMAGE_MIN_MAX_WIDTH_INC;
                image {
-                  normal: "00_button_edit.png";
+                  normal: "00_button_edit_Delete.png";
                   border: CHECK_STYLE_DELETE_BUTTON_BG_EXPAND_BORDER_INC;
                   border_scale: 1;
                }
@@ -1619,7 +1619,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", CHECK_STYLE_FAVORITE_EXTENDED_BG_IMAGE
             description { state: "clicked" 0.0;
                inherit: "default" 0.0;
                align: 1.0 0.5;
-               image.normal: "00_button_edit_press.png";
+               image.normal: "00_button_edit_Delete_press.png";
             }
             description { state: "intermediate" 0.0;
                inherit: "default" 0.0;
Domain: UI Framework / EFL;