projects / framework / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ecea0a)
[elm_colorpalette]: 1. CQs fix: H0100135922, H0100135923, H0100135811.
authorShilpa Singh <shilpa.singh@samsung.com>
Fri, 28 Oct 2011 04:13:22 +0000 (13:13 +0900)
committerShilpa Singh <shilpa.singh@samsung.com>
Fri, 28 Oct 2011 04:13:22 +0000 (13:13 +0900)
2. Guideline implemented properly. [ color palette does not have its
own background]
3. formatting fix.

Change-Id: I3457e492582c6797dbb18b89559fa91bf646443f

themes/groups/colorpalette.edc patch | blob | history

diff --git a/themes/groups/colorpalette.edc b/themes/groups/colorpalette.edc
index 2cb6156..528a0dc 100644 (file)
--- a/themes/groups/colorpalette.edc
+++ b/themes/groups/colorpalette.edc
@@ -21,105 +21,30 @@
  *
  */
 
-   group{
+   group {
       name: "elm/colorpalette/base/default";
+      alias: "elm/colorpalette/base/no_bgimg";
       data.item: "color_num" "10";
       data.item: "row" "2";
       data.item: "col" "5";
       data.item: "colors" "#375A12 #FFD500 #92FF0B #09BA0A #56C9F2 #125380 #8C35EE #FF9191 #FF3B77 #856445";
-      parts{
-         part{
+      parts {
+         part {
             name: "bg_rect";
             type: RECT;
             scale: 1;
             mouse_events: 1;
-            description{
-            state: "default" 0.0;
-            min: COLORPALETTE_BASE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
-            color: COLORPALETTE_BASE_COLOR_INC;
-            }
-         }
-         part{
-            name: "padding_rect_u";
-            type: RECT;
-            scale: 1;
-            description{
-               state: "default" 0.0;
+            description {
                visible: 0;
-               min: 0 COLORPALETTE_PADDING_UP_INC;
-               fixed: 0 1;
-               rel2.relative: 1.0 0.0;
-               align: 0.5 0.0;
-            }
-         }
-         part{
-            name: "padding_rect_d";
-            type: RECT;
-            scale: 1;
-            description{
                state: "default" 0.0;
-               visible: 0;
-               min: 0 COLORPALETTE_PADDING_DOWN_INC;
-               fixed: 0 1;
-               rel1.relative: 0.0 1.0;
-               align: 0.5 1.0;
-            }
-         }
-         part{
-            name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 1;
-            description{
-            state: "default" 0.0;
-            min: COLORPALETTE_BASE_WIDTH_INC 0;
-            max: COLORPALETTE_BASE_WIDTH_INC 9999;
-            fixed: 1 0;
-            visible:0;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0.5;
-            rel1.to_x: bg_rect;
-            rel1.to_y: padding_rect_u;
-            rel2.to_x: bg_rect;
-            rel2.to_y: padding_rect_d;
+               min: COLORPALETTE_BASE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
             }
          }
-         part{
-            name: "palette";
-            type: SWALLOW;
-            description{
-               state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-      }
-   }
-
-   group{
-      name: "elm/colorpalette/base/no_bgimg";
-      data.item: "color_num" "10";
-      data.item: "row" "2";
-      data.item: "col" "5";
-      data.item: "colors" "#375A12 #FFD500 #92FF0B #09BA0A #56C9F2 #125380 #8C35EE #FF9191 #FF3B77 #856445";
-      parts{
-         part{
-            name: "bg_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 1;
-            description{
-            state: "default" 0.0;
-            min: COLORPALETTE_BASE_WIDTH_INC COLORPALETTE_HEIGHT_INC;
-            color: 0 0 0 0;
-            }
-         }
-         part{
+         part {
             name: "padding_rect_u";
             type: RECT;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                visible: 0;
                min: 0 COLORPALETTE_PADDING_UP_INC;
@@ -128,11 +53,11 @@
                align: 0.5 0.0;
             }
          }
-         part{
+         part {
             name: "padding_rect_d";
             type: RECT;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                visible: 0;
                min: 0 COLORPALETTE_PADDING_DOWN_INC;
@@ -141,106 +66,30 @@
                align: 0.5 1.0;
             }
          }
-         part{
+         part {
             name: "bg";
             type: RECT;
             scale: 1;
             mouse_events: 1;
-            description{
-            state: "default" 0.0;
-            min: COLORPALETTE_BASE_WIDTH_INC 0;
-            max: COLORPALETTE_BASE_WIDTH_INC 9999;
-            fixed: 1 0;
-            visible:0;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0.5;
-            rel1.to_x: bg_rect;
-            rel1.to_y: padding_rect_u;
-            rel2.to_x: bg_rect;
-            rel2.to_y: padding_rect_d;
-            }
-         }
-         part{
-            name: "palette";
-            type: SWALLOW;
-            description{
-               state: "default" 0.0;
-               rel1.to: "bg";
-               rel2.to: "bg";
-            }
-         }
-      }
-   }
-
-   group{
-      name: "elm/colorpalette/base/landscape";
-      data.item: "color_num" "10";
-      data.item: "row" "1";
-      data.item: "col" "10";
-      data.item: "colors" "#375A12 #FFD500 #92FF0B #09BA0A #56C9F2 #125380 #8C35EE #FF9191 #FF3B77 #856445";
-      parts{
-         part{
-            name: "bg_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 1;
-            description{
-               state: "default" 0.0;
-               min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
-               color: COLORPALETTE_BASE_COLOR_INC;
-            }
-         }
-         part{
-            name: "padding_rect_u";
-            type: RECT;
-            scale: 1;
-            description{
-               state: "default" 0.0;
-               visible: 0;
-               min: 0 COLORPALETTE_PADDING_UP_LANDSCAPE_INC;
-               fixed: 0 1;
-               rel2.relative: 1.0 0.0;
-               align: 0.5 0.0;
-            }
-         }
-         part{
-            name: "padding_rect_d";
-            type: RECT;
-            scale: 1;
-            description{
+            description {
                state: "default" 0.0;
-               visible: 0;
-               min: 0 COLORPALETTE_PADDING_DOWN_LANDSCAPE_INC;
-               fixed: 0 1;
+               min: COLORPALETTE_BASE_WIDTH_INC 0;
+               max: COLORPALETTE_BASE_WIDTH_INC 9999;
+               fixed: 1 0;
+               visible:0;
                rel1.relative: 0.0 1.0;
-               align: 0.5 1.0;
-            }
-         }
-         part{
-            name: "bg";
-            type: RECT;
-            scale: 1;
-            mouse_events: 1;
-            description{
-            state: "default" 0.0;
-            min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 0;
-            max: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 9999;
-            fixed: 1 0;
-            visible:0;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0.5;
-            rel1.to_x: bg_rect;
-            rel1.to_y: padding_rect_u;
-            rel2.to_x: bg_rect;
-            rel2.to_y: padding_rect_d;
+               rel2.relative: 1.0 0.0;
+               align: 0.5 0.5;
+               rel1.to_x: bg_rect;
+               rel1.to_y: padding_rect_u;
+               rel2.to_x: bg_rect;
+               rel2.to_y: padding_rect_d;
             }
          }
-         part{
+         part {
             name: "palette";
             type: SWALLOW;
-            description{
+            description {
                state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
@@ -249,29 +98,30 @@
       }
    }
 
-   group{
-      name: "elm/colorpalette/base/landscape_no_bgimg";
+   group {
+      name: "elm/colorpalette/base/landscape";
+      alias: "elm/colorpalette/base/landscape_no_bgimg";
       data.item: "color_num" "10";
       data.item: "row" "1";
       data.item: "col" "10";
       data.item: "colors" "#375A12 #FFD500 #92FF0B #09BA0A #56C9F2 #125380 #8C35EE #FF9191 #FF3B77 #856445";
-      parts{
-         part{
+      parts {
+         part {
             name: "bg_rect";
             type: RECT;
             scale: 1;
             mouse_events: 1;
-            description{
+            description {
+               visible: 0;
                state: "default" 0.0;
                min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC COLORPALETTE_HEIGHT_LANDSCAPE_INC;
-               color: 0 0 0 0;
             }
          }
-         part{
+         part {
             name: "padding_rect_u";
             type: RECT;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                visible: 0;
                min: 0 COLORPALETTE_PADDING_UP_LANDSCAPE_INC;
@@ -280,11 +130,11 @@
                align: 0.5 0.0;
             }
          }
-         part{
+         part {
             name: "padding_rect_d";
             type: RECT;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                visible: 0;
                min: 0 COLORPALETTE_PADDING_DOWN_LANDSCAPE_INC;
@@ -293,12 +143,12 @@
                align: 0.5 1.0;
             }
          }
-         part{
+         part {
             name: "bg";
             type: RECT;
             scale: 1;
             mouse_events: 1;
-            description{
+            description {
                state: "default" 0.0;
                min: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 0;
                max: COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 9999;
@@ -313,10 +163,10 @@
                rel2.to_y: padding_rect_d;
             }
          }
-         part{
+         part {
             name: "palette";
             type: SWALLOW;
-            description{
+            description {
                state: "default" 0.0;
                rel1.to: "bg";
                rel2.to: "bg";
@@ -325,44 +175,44 @@
       }
    }
 
-   group{
+   group {
       name: "elm/colorpalette/base/bg";
-      images{
+      images {
          image: "00_color_picker_palette_bg.png" COMP;
          image: "00_color_picker_palette_focus.png" COMP;
       }      
-      parts{
-         part{
+      parts {
+         part {
             name: "bg";
             mouse_events:1;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                min: COLORPALETTE_COLORBG_MIN_WIDTH_INC COLORPALETTE_COLORBG_MIN_HEIGHT_INC;
                image.normal: "00_color_picker_palette_bg.png";
                image.border: 10 10 10 10;
                image.border_scale: 1;
             }
-            description{
+            description {
                state: "focused" 0.0;
                inherit: "default" 0.0;
                image.normal: "00_color_picker_palette_focus.png";
             }
          }
-         part{
+         part {
             name: "color_rect";
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
             }
          }
-         part{
+         part {
             name: "focus_image";
             mouse_events:1;
             scale: 1;
-            description{
+            description {
                state: "default" 0.0;
                visible: 0;
                min: COLORPALETTE_COLORBG_FOCUS_MIN_WIDTH_INC COLORPALETTE_COLORBG_FOCUS_MIN_HEIGHT_INC;
@@ -372,22 +222,22 @@
                rel1.to: "bg";
                rel2.to: "bg";
             }
-            description{
+            description {
                state: "focused" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
          }
       }
-      programs{
-         program{
+      programs {
+         program {
             name: "focus_visible";
             source: "elm";
             signal: "focus_visible";
             action: STATE_SET "focused" 0.0;
             target: "focus_image";
          }
-         program{
+         program {
             name: "focus_invisible";
             source: "elm";
             signal: "focus_invisible";
@@ -397,13 +247,13 @@
       }
    }
 
-   group{
+   group {
       name: "elm/colorpalette/base/color";
-      images{
+      images {
          image: "00_color_picker_palette.png" COMP;
       }     
-      parts{
-         part{
+      parts {
+         part {
             name: "color_rect";
             type: IMAGE;
             mouse_events: 1;
Domain: UI Framework / Uncategorized;