[genlist] change email app style(4text.8icon, 2text.1icon.14)

diff --git a/themes/images/tizen-black-hd/M02_button_06_normal.png b/themes/images/tizen-black-hd/M02_button_06_normal.png
new file mode 100755 (executable)
index 0000000..93626cd
Binary files /dev/null and b/themes/images/tizen-black-hd/M02_button_06_normal.png differ

diff --git a/themes/images/tizen-black/M02_button_06_normal.png b/themes/images/tizen-black/M02_button_06_normal.png
new file mode 100755 (executable)
index 0000000..93626cd
Binary files /dev/null and b/themes/images/tizen-black/M02_button_06_normal.png differ

diff --git a/themes/images/tizen-hd/M02_button_06_normal.png b/themes/images/tizen-hd/M02_button_06_normal.png
new file mode 100755 (executable)
index 0000000..93626cd
Binary files /dev/null and b/themes/images/tizen-hd/M02_button_06_normal.png differ

diff --git a/themes/images/tizen/M02_button_06_normal.png b/themes/images/tizen/M02_button_06_normal.png
new file mode 100755 (executable)
index 0000000..93626cd
Binary files /dev/null and b/themes/images/tizen/M02_button_06_normal.png differ

diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc
index c3667dd..83dac77 100644 (file)
--- a/themes/inc/tizen-black-hd-inc.edc
+++ b/themes/inc/tizen-black-hd-inc.edc
@@ -175,7 +175,9 @@
 #define GENLIST_SIZE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
 #define GENLIST_SIZE_42_INC 42
+#define GENLIST_SIZE_44_INC 44
 #define GENLIST_SIZE_45_INC 45
+#define GENLIST_SIZE_46_INC 46
 #define GENLIST_SIZE_48_INC 48
 #define GENLIST_SIZE_54_INC 54
 #define GENLIST_SIZE_56_INC 56

diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc
index b181f3b..3f2ca5e 100644 (file)
--- a/themes/inc/tizen-black-inc.edc
+++ b/themes/inc/tizen-black-inc.edc
@@ -172,7 +172,9 @@
 #define GENLIST_SIZE_38_INC 24
 #define GENLIST_SIZE_40_INC 25
 #define GENLIST_SIZE_42_INC 26
+#define GENLIST_SIZE_44_INC 27
 #define GENLIST_SIZE_45_INC 28
+#define GENLIST_SIZE_46_INC 29
 #define GENLIST_SIZE_48_INC 30
 #define GENLIST_SIZE_54_INC 34
 #define GENLIST_SIZE_56_INC 35

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 04c3d75..8fe284d 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -175,7 +175,9 @@
 #define GENLIST_SIZE_38_INC 38
 #define GENLIST_SIZE_40_INC 40
 #define GENLIST_SIZE_42_INC 42
+#define GENLIST_SIZE_44_INC 44
 #define GENLIST_SIZE_45_INC 45
+#define GENLIST_SIZE_46_INC 46
 #define GENLIST_SIZE_48_INC 48
 #define GENLIST_SIZE_54_INC 54
 #define GENLIST_SIZE_56_INC 56

diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc
index d958024..76f58f7 100644 (file)
--- a/themes/inc/tizen-inc.edc
+++ b/themes/inc/tizen-inc.edc
@@ -172,7 +172,9 @@
 #define GENLIST_SIZE_38_INC 24
 #define GENLIST_SIZE_40_INC 25
 #define GENLIST_SIZE_42_INC 26
+#define GENLIST_SIZE_44_INC 27
 #define GENLIST_SIZE_45_INC 28
+#define GENLIST_SIZE_46_INC 29
 #define GENLIST_SIZE_48_INC 30
 #define GENLIST_SIZE_54_INC 34
 #define GENLIST_SIZE_56_INC 35

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index e070380..3de2d23 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -7685,11 +7685,12 @@
       alias: "elm/genlist/item_compress_odd/4text.8icon/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.subject elm.text.name elm.text.date elm.text.preview";
-      data.item: "contents" "elm.icon.important elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox elm.icon.checkbox.touch elm.icon.priority elm.icon.lastverb elm.icon.appointment";
+      data.item: "texts" "elm.text.subject elm.text.name elm.text.date elm.text.preview elm.text.num";
+      data.item: "contents" "elm.icon.important elm.icon.important.touch elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox elm.icon.checkbox.touch elm.icon.priority elm.icon.lastverb elm.icon.appointment";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
+         image: "M02_button_06_normal.png" COMP;
       }
       parts {
          GENLIST_PART_BASE( GENLIST_SIZE_160_INC )
@@ -7718,10 +7719,10 @@
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_SIZE_42_INC 0;
+               max: GENLIST_PADDING_74_INC GENLIST_SIZE_160_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
@@ -7776,168 +7777,162 @@
             }
          }
 
-         part { name: "elm.icon.attach";
+         part { name: "elm.icon.important";
             clip_to: "disclip";
             type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
-               align: 0.0 0.0;
-            }
-            description { state: "attach_enable" 0.0;
-               inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_SLIDE_60_INC;
+               align: 1.0 0.0;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
 
-         part { name: "elm.padding.intermediate";
+         part { name: "elm.icon.important.touch";
             clip_to: "disclip";
-            type: RECT;
+            type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_PADDING_4_INC;
-               fixed: 0 1;
+               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.attach";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x:  "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.attach";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
-               visible: 0;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
 
-         part { name: "elm.icon.priority";
+         part { name: "elm.padding.icon.important.left";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.intermediate";
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1{
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.important";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.intermediate";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.important";
                }
-               align: 0.0 0.0;
-            }
-            description { state: "priority_enable" 0.0;
-               inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
+               align: 1.0 0.0;
+               visible: 0;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.lastverb";
+         part { name: "elm.icon.num";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: IMAGE;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
+               max: 0 GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.priority";
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.priority";
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.0;
+               align: 1.0 0.0;
+               image.normal: "M02_button_06_normal.png";
+               image.border: 5 5 5 5;
             }
-            description { state: "lastverb_enable" 0.0;
+            description { state: "num_enable" 0.0;
                inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
+               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.important";
+
+         part { name: "elm.text.num";
             clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
+               max: 0 GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
                   to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.important.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1{
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
+            description { state: "num_enable" 0.0;
+               inherit: "default" 0.0;
+               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 1 1;
+                  align: 0.5 0.5;
                }
-               align: 1.0 0.0;
-               visible: 0;
+               color: GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.num";
+
+         part { name: "elm.icon.attach";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.important.left";
+                  to_x: "elm.icon.num";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.important.left";
+                  to_x: "elm.icon.num";
                   to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
             }
-            description { state: "num_enable" 0.0;
+            description { state: "attach_enable" 0.0;
                inherit: "default" 0.0;
-               min: GENLIST_PADDING_124_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_SLIDE_60_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7951,12 +7946,12 @@
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.icon.attach";
+                  to_x: "elm.padding.icon.checkbox.right";
                   to_y: "elm.padding.top";
                }
                rel2{
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
+                  to_x: "elm.icon.attach";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -7981,6 +7976,80 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+
+         part { name: "elm.padding.intermediate";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_PADDING_4_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.attach";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x:  "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.attach";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+
+         part { name: "elm.icon.priority";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_40_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.padding.intermediate";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.padding.intermediate";
+               }
+               align: 0.0 0.0;
+            }
+            description { state: "priority_enable" 0.0;
+               inherit: "default" 0.0;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.icon.lastverb";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_40_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.priority";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.priority";
+               }
+               align: 0.0 0.0;
+            }
+            description { state: "lastverb_enable" 0.0;
+               inherit: "default" 0.0;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+
          part { name: "elm.text.date";
             clip_to: "disclip";
             type: TEXT;
@@ -8199,6 +8268,7 @@
             source: "elm";
             action: STATE_SET "num_enable" 0.0;
             target: "elm.icon.num";
+            target: "elm.text.num";
          }
          program { name: "click";
             signal: "mouse,up,1";
@@ -9614,15 +9684,12 @@
                min: GENLIST_SIZE_64_INC GENLIST_SIZE_64_INC;
                max: GENLIST_SIZE_64_INC GENLIST_SIZE_64_INC;
                fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-               }
+               rel1.to_x: "elm.padding.right";
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9647,7 +9714,7 @@
                align: 0.0 0.5;
             }
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
@@ -9655,11 +9722,12 @@
                state: "default" 0.0;
                min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
+               rel1.to_x: "elm.icon";
+               rel2 {
+                  relative: 0.0 1.0;
                   to_x: "elm.icon";
                }
-               rel2.to_x: "elm.icon";
+               align: 1.0 0.0;
                visible: 0;
             }
          }
@@ -9671,11 +9739,11 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.icon.checkbox.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                }
                align: 0.0 0.5;
                text {