[UX 0.8] Popup, tickernoti,check & radio implementation for Light Theme.

Change-Id: Ice92874a7320b75231070f42689076df41f42dfe

diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png b/themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..44b86f1
Binary files /dev/null and b/themes/images/HD/dark/Controls/Check_box/00_check_activated_press.png differ

diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_bg.png
index efda6ba..80d1dc9 100644 (file)
Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_bg.png differ

diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png
index ab7ff05..7033ce4 100644 (file)
Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_dim_bg.png differ

diff --git a/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png b/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png
index 3cd5418..b268899 100644 (file)
Binary files a/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png and b/themes/images/HD/dark/Controls/Check_box/00_check_press_bg.png differ

diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..11fa3b0
Binary files /dev/null and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_activated_press.png differ

diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png
index 2963c39..2c09cfc 100644 (file)
Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_dim_bg.png differ

diff --git a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png
index 7c9da92..405592b 100644 (file)
Binary files a/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png and b/themes/images/HD/dark/Controls/Radio_button/00_button_radio_press_bg.png differ

diff --git a/themes/images/HD/dark/Popup/00_popup_button_dim.png b/themes/images/HD/dark/Popup/00_popup_button_dim.png
index 77268cf..68bfcf4 100644 (file)
Binary files a/themes/images/HD/dark/Popup/00_popup_button_dim.png and b/themes/images/HD/dark/Popup/00_popup_button_dim.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 21d8719..6eee097 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -1132,6 +1132,7 @@
 #define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0"
 #define COLORSELECTOR_PALETTE_BORDER_INC 13 13 13 13
 
+#define TICKERNOTI_TEXT_COLOR_INC 250 250 250 255
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_TOTAL_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 8 8 8 8

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index 8234854..29d318c 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -1133,6 +1133,7 @@
 #define COLORSELECTOR_LANDSCAPE_VER_PAD_INC "0"
 #define COLORSELECTOR_PALETTE_BORDER_INC 13 13 13 13
 
+#define TICKERNOTI_TEXT_COLOR_INC 250 250 250 255
 #define TICKERNOTI_DEFAULT_BG_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_TOTAL_MIN_HEIGHT_INC 100
 #define TICKERNOTI_DEFAULT_BG_BORDER_INC 8 8 8 8

diff --git a/themes/widgets/check.edc b/themes/widgets/check.edc
index 13c9a2a..acc9a13 100644 (file)
--- a/themes/widgets/check.edc
+++ b/themes/widgets/check.edc
@@ -53,6 +53,7 @@
          image: "00_check_bg.png" COMP; \
          image: "00_check_dim_bg.png" COMP; \
          image: "00_check_activated_dim.png" COMP; \
+         image: "00_check_activated_press.png" COMP; \
          image: "00_check_activated.png" COMP; \
          image: "00_check_press_bg.png" COMP; \
          image: "00_check_focus.png" COMP; \
@@ -90,6 +91,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
@@ -120,20 +122,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
-            } \
-         } \
-         part { name: "pressed_effect"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               visible: 0; \
-               image.normal: "00_check_press_bg.png"; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
+               image.normal: "00_check_activated_press.png"; \
             } \
          } \
          part { name: "sequence_clip"; \
@@ -288,7 +277,6 @@
             action: STATE_SET "default" 0.0; \
             target: "bg"; \
             target: "check"; \
-            target: "pressed_effect"; \
          } \
          program { name: "pressed"; \
             signal: "mouse,down,1"; \
@@ -296,7 +284,6 @@
             action: STATE_SET "pressed" 0.0; \
             target: "bg"; \
             target: "check"; \
-            target: "pressed_effect"; \
          } \
          program { name: "mouse,out"; \
             signal: "mouse,out"; \
@@ -457,9 +444,11 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
       images { \
          image: "00_check_bg.png" COMP; \
          image: "00_check_dim_bg.png" COMP; \
-         image: "00_check_press_bg.png" COMP; \
          image: "00_check_activated_dim.png" COMP; \
+         image: "00_check_activated_press.png" COMP; \
          image: "00_check_activated.png" COMP; \
+         image: "00_check_press_bg.png" COMP; \
+         image: "00_check_focus.png" COMP; \
       } \
       script { \
          public check_state = CHECK_STATE_DEFAULT; \
@@ -494,6 +483,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_check_press_bg.png"; \
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
@@ -524,20 +514,7 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
-            } \
-         } \
-         part { name: "pressed_effect"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               visible: 0; \
-               image.normal: "00_check_press_bg.png"; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
+               image.normal: "00_check_activated_press.png"; \
             } \
          } \
          part { name: "sequence_clip"; \
@@ -676,7 +653,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "default", 0.0); \
                  } \
                set_state(PART:"bg", "default", 0.0); \
-               set_state(PART:"pressed_effect", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
@@ -689,7 +665,6 @@ CHECK_STYLE_DEFAULT("default/extended", CHECK_STYLE_DEFAULT_EXTENDED_BG_IMAGE_MI
                     set_state(PART:"check", "pressed", 0.0); \
                  } \
                set_state(PART:"bg", "pressed", 0.0); \
-               set_state(PART:"pressed_effect", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \
@@ -2020,8 +1995,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
          image: "00_check_bg.png" COMP;
          image: "00_check_dim_bg.png" COMP;
          image: "00_check_activated_dim.png" COMP;
+         image: "00_check_activated_press.png" COMP;
          image: "00_check_activated.png" COMP;
          image: "00_check_press_bg.png" COMP;
+         image: "00_check_focus.png" COMP;
       }
       script {
          public check_state = CHECK_STATE_DEFAULT;
@@ -2074,6 +2051,10 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
             }
+            description { state: "pressed" 0.0;
+               inherit: "default" 0.0;
+               image.normal: "00_check_press_bg.png";
+            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                image.normal: "00_check_dim_bg.png";
@@ -2097,6 +2078,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             }
             description { state: "pressed" 0.0;
                inherit: "visible" 0.0;
+               image.normal: "00_check_activated_press.png";
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
@@ -2104,20 +2086,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                image.normal: "00_check_activated_dim.png";
             }
          }
-         part { name: "pressed_effect";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "bg2";
-               rel2.to: "bg2";
-               visible: 0;
-               image.normal: "00_check_press_bg.png";
-            }
-            description { state: "pressed" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "sequence_clip";
             type: RECT;
             mouse_events: 0;
@@ -2257,7 +2225,7 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
             signal: "mouse,up,1";
             source: "events";
             action: STATE_SET "default" 0.0;
-            target: "pressed_effect";
+            target: "bg2";
          }
          program { name: "pressed";
             signal: "mouse,down,1";
@@ -2269,9 +2237,8 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                if (!strcmp(st, "visible"))
                  {
                     set_state(PART:"check", "pressed", 0.0);
-                    set_state(PART:"bg2", "visible", 0.0);
                  }
-              set_state(PART:"pressed_effect", "pressed", 0.0);
+               set_state(PART:"bg2", "pressed", 0.0);
             }
          }
          program { name: "mouse,out";
@@ -2290,7 +2257,6 @@ CHECK_STYLE_FAVORITE("favorite/extended", "00_icon_favorite_on_72x72.png", "00_i
                     set_state(PART:"sequence_clip", "default", 0.0);
                     set_state(PART:"bg2", "default", 0.0);
                  }
-              set_state(PART:"pressed_effect", "default", 0.0);
             }
          }
          program { name: "check_on";

diff --git a/themes/widgets/radio.edc b/themes/widgets/radio.edc
index 38d1e03..1910abd 100644 (file)
--- a/themes/widgets/radio.edc
+++ b/themes/widgets/radio.edc
@@ -45,6 +45,7 @@
       images { \
          image: "00_button_radio_activated_dim.png" COMP; \
          image: "00_button_radio_activated.png" COMP; \
+         image: "00_button_radio_activated_press.png" COMP; \
          image: "00_button_radio_bg.png" COMP; \
          image: "00_button_radio_dim_bg.png" COMP; \
          image: "00_button_radio_press_bg.png" COMP; \
@@ -82,6 +83,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "default" 0.0; \
+               image.normal: "00_button_radio_press_bg.png"; \
             } \
          } \
          part { name: "radio"; \
@@ -109,6 +111,7 @@
             } \
             description { state: "pressed" 0.0; \
                inherit: "visible" 0.0; \
+               image.normal: "00_button_radio_activated_press.png"; \
             } \
          } \
          part { name: "opacity_clip"; \
@@ -122,20 +125,6 @@
                color: 255 255 255 255; \
             } \
          } \
-         part { name: "pressed_bg"; \
-            mouse_events: 0; \
-            scale: 1; \
-            description { state: "default" 0.0; \
-               rel1.to: "bg"; \
-               rel2.to: "bg"; \
-               image.normal: "00_button_radio_press_bg.png"; \
-               visible: 0; \
-            } \
-            description { state: "pressed" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1; \
-            } \
-         } \
          part { name: "elm.swallow.content"; \
             type: SWALLOW; \
             clip_to: "disclip"; \
@@ -265,7 +254,7 @@
                   set_state(PART:"radio", "visible", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"pressed_bg", "default", 0.0); \
+               set_state(PART:"bg", "default", 0.0); \
             } \
          } \
          program { name: "pressed"; \
@@ -276,7 +265,7 @@
                   set_state(PART:"radio", "pressed", 0.0); \
                else \
                   set_state(PART:"radio", "default", 0.0); \
-               set_state(PART:"pressed_bg", "pressed", 0.0); \
+               set_state(PART:"bg", "pressed", 0.0); \
             } \
          } \
          program { name: "mouse,out"; \

diff --git a/themes/widgets/tickernoti.edc b/themes/widgets/tickernoti.edc
index bf852e8..4428ba9 100644 (file)
--- a/themes/widgets/tickernoti.edc
+++ b/themes/widgets/tickernoti.edc
@@ -159,7 +159,7 @@
                   relative: 1.0 1.0;
                   to: "bg";
                }
-               color: SELECTION_INFO_TEXT_COLOR_INC;
+               color: TICKERNOTI_TEXT_COLOR_INC;
                text {
                   font: "Tizen:style=Roman";
                   size: TICKERNOTI_INFO_TEXT_FONT_SIZE_INC;