[Genlist] Add divider style && Arrange 1line style

Change-Id: I1c8c5ee9a890a565e52f7a793e34d3cc0c4e327f

diff --git a/themes/images/tizen-hd/00_winset_divider_line.png b/themes/images/tizen-hd/00_winset_divider_line.png
new file mode 100644 (file)
index 0000000..e287978
Binary files /dev/null and b/themes/images/tizen-hd/00_winset_divider_line.png differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 052e6e6..845f757 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -323,17 +323,12 @@
 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE 32
 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#929292FF"
 
-
-
-
 // This is used??
 #define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE 0 0 0 255
 #define GENLIST_TEXT_COLOR_SWEEP_STYLE 118 118 118 255
 
+#define GENLIST_PART_DISCLIP_COLOR 255 255 255 110 // alpha was 64
 
-
-
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64
 #define GENLIST_PART_REORDER_BG_COLOR 236 240 242 255
 #define GENLIST_PART_FLIP_BG_COLOR 0 0 0 255
 #define GENLIST_PART_DIALOGUE_GROUP_BG_COLOR 0 0 0 255
@@ -349,19 +344,6 @@
 #define GENLIST_PART_BUBBLE_DATE_BG_COLOR_INC 66 66 66 255
 #define GENLIST_PART_BUBBLE_1PIXEL_LINE_COLOR_INC 153 153 153 255
 
-#define GENLIST_PART_INDEX_LIST_BASE_IMAGE_INC \
-         part { name: "base_image";\
-            repeat_events: 1;\
-            description { state: "default" 0.0;\
-               rel1.to: "rect";\
-               rel2.to: "rect";\
-               image {\
-                  normal: "00_index list_bg.png";\
-                  border: 0 0 2 2;\
-               }\
-            }\
-         }
-
 #define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
 
 #define DIALOGUE_PASSWORD_TITLE_COLOR 153 153 153 255

diff --git a/themes/widgets/bubble.edc b/themes/widgets/bubble.edc
index 20959e8..a0b92f8 100644 (file)
--- a/themes/widgets/bubble.edc
+++ b/themes/widgets/bubble.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * PROPRIETARY/CONFIDENTIAL
  *
@@ -56,7 +56,7 @@ group {
                                min: BUBBLE_DATE_PAD BUBBLE_DATE_HEIGHT;
                                fixed: 1 1;
                        }
-               }               
+               }
                part {
                        name: "elm.rect.top.pad";
                        type: RECT;
@@ -75,7 +75,7 @@ group {
                part {
                        name: "elm.rect.right.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -87,10 +87,10 @@ group {
                                rel2 { relative: 1.0 1.0; to: "elm.swallow.content"; }
                        }
                }
-               part { 
+               part {
                        name: "elm.rect.bottom.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -104,7 +104,7 @@ group {
                part {
                        name: "elm.rect.icon.top.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -124,7 +124,7 @@ group {
                part {
                        name: "elm.rect.icon.bottom.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -139,14 +139,14 @@ group {
                                inherit: "default" 0.0;
                                min: 0 BUBBLE_ICON_PAD;
                                fixed: 0 1;
-                       }                       
-               }                               
-               part { 
+                       }
+               }
+               part {
                        name: "elm.text";
                        type: TEXT;
                        mouse_events: 0;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 0.0 0.5;
                                fixed: 1 1;
@@ -167,12 +167,12 @@ group {
                                inherit: "default" 0.0;
                                visible: 1;
                        }
-               }               
-               part { 
+               }
+               part {
                        name: "elm.image.bg";
                        type: IMAGE;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
                                rel1 { relative: 0.0 0.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
@@ -195,24 +195,24 @@ group {
                                rel2 { relative: 1.0 1.0; to_y: "elm.image.bg"; }
                        }
                }
-               part { 
+               part {
                        name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
                                fixed: 1 1;
                                rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
                                rel2 { relative: 0.7 1.0; to_y: "elm.rect.top.pad"; }
                        }
-               }       
-               part { 
+               }
+               part {
                        name: "elm.swallow.icon";
                        type: SWALLOW;
-                       description { 
+                       description {
                                state: "default" 0.0;
-                               min: 0 0; 
+                               min: 0 0;
                                align: 0.0 0.0;
                                rel1 { relative: 0.0 1.0; to: "elm.rect.icon.top.pad"; }
                                rel2 { relative: 0.5 1.0; to_y: "elm.rect.icon.top.pad"; }
@@ -222,7 +222,7 @@ group {
                                inherit : "default" 0.0;
                                min: 0 50; //default height of icon
                                fixed: 0 1;
-                       }                       
+                       }
                }
                part {
                        name: "elm.swallow.sweep";
@@ -233,12 +233,12 @@ group {
                                rel2 { relative: 1.0 1.0; to_y: "elm.image.bg"; }
                        }
                }
-               /*part { 
+               /*part {
                        name: "elm.info";
                        type: TEXT;
                        mouse_events:   0;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 1.0 0.0;
                                fixed: 1 1;
@@ -259,7 +259,7 @@ group {
                                        align: 1.0 0.0;
                                }
                        }
-               }*/             
+               }*/
        }
        programs {
                program {
@@ -284,7 +284,7 @@ group {
                        source: "elm";
                        action: STATE_SET "expand" 0.0;
                        target: "elm.rect.icon.top.pad";
-                       target: "elm.swallow.icon";                     
+                       target: "elm.swallow.icon";
                        target: "elm.rect.icon.bottom.pad";
                }
                program {
@@ -293,14 +293,14 @@ group {
                        source: "elm";
                        action: STATE_SET "default" 0.0;
                        target: "elm.rect.icon.top.pad";
-                       target: "elm.swallow.icon";                     
+                       target: "elm.swallow.icon";
                        target: "elm.rect.icon.bottom.pad";
-               }       
+               }
        }
 }
 
 // deprecated style
-group { 
+group {
        name: "elm/bubble/base/sentmessage";
 
        parts {
@@ -324,11 +324,11 @@ group {
                                min: BUBBLE_DATE_PAD BUBBLE_DATE_HEIGHT;
                                fixed: 1 1;
                        }
-               }               
+               }
                part {
                        name: "elm.rect.top.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -343,7 +343,7 @@ group {
                part {
                        name: "elm.rect.left.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -355,10 +355,10 @@ group {
                                rel2 { relative: 0.0 1.0; to: "elm.swallow.content"; }
                        }
                }
-               part { 
+               part {
                        name: "elm.rect.bottom.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -372,7 +372,7 @@ group {
                part {
                        name: "elm.rect.icon.top.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -392,7 +392,7 @@ group {
                part {
                        name: "elm.rect.icon.bottom.pad";
                        type: RECT;
-                       mouse_events: 0;                        
+                       mouse_events: 0;
                        scale: 1;
                        description {
                                state: "default" 0.0;
@@ -407,14 +407,14 @@ group {
                                inherit: "default" 0.0;
                                min: 0 BUBBLE_ICON_PAD;
                                fixed: 0 1;
-                       }                       
-               }                       
-               part { 
+                       }
+               }
+               part {
                        name: "elm.text";
                        type: TEXT;
                        mouse_events: 0;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 1.0 0.5;
                                fixed: 1 1;
@@ -434,13 +434,13 @@ group {
                                state: "expand" 0.0;
                                inherit: "default" 0.0;
                                visible: 1;
-                       }                       
-               }               
-               part { 
+                       }
+               }
+               part {
                        name: "elm.image.bg";
                        type: IMAGE;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 1.0 0.0;
                                rel1 { relative: 0.0 0.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; }
@@ -451,7 +451,7 @@ group {
                                        border_scale: 1;
                                }
                        }
-               }       
+               }
                part {
                        name: "elm.rect.bg.pad";
                        type: RECT;
@@ -462,25 +462,25 @@ group {
                                rel1 { relative: 0.0 0.0; to_y: "elm.image.bg"; }
                                rel2 { relative: 0.0 1.0; to: "elm.image.bg"; }
                        }
-               }               
-               part { 
+               }
+               part {
                        name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 1.0 0.0;
                                fixed: 1 1;
                                rel1 { relative: 0.3 1.0; to_y: "elm.rect.top.pad"; }
                                rel2 { relative: 0.0 1.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.top.pad"; }
                        }
-               }               
-               part { 
+               }
+               part {
                        name: "elm.swallow.icon";
                        type: SWALLOW;
-                       description { 
+                       description {
                                state: "default" 0.0;
-                               min: 0 0; 
+                               min: 0 0;
                                align: 1.0 0.0;
                                rel1 { relative: 0.5 1.0; to_y: "elm.rect.icon.top.pad"; }
                                rel2 { relative: 1.0 1.0; to: "elm.rect.icon.top.pad"; }
@@ -500,13 +500,13 @@ group {
                                rel1 { relative: 0.0 0.0; to_y: "elm.image.bg"; }
                                rel2 { relative: 1.0 1.0; to_y: "elm.image.bg"; }
                        }
-               }               
-               /*part { 
+               }
+               /*part {
                        name: "elm.info";
                        type: TEXT;
                        mouse_events:   0;
                        scale: 1;
-                       description { 
+                       description {
                                state: "default" 0.0;
                                align: 1.0 0.0;
                                fixed: 1 1;
@@ -527,7 +527,7 @@ group {
                                        align: 1.0 0.0;
                                }
                        }
-               }*/             
+               }*/
        }
        programs {
                program {
@@ -545,7 +545,7 @@ group {
                        action: STATE_SET "default" 0.0;
                        target: "elm.rect.right.pad";
                        target: "elm.text";
-               }       
+               }
                program {
                        name: "icon_add";
                        signal: "elm,state,icon,visible";
@@ -725,7 +725,7 @@ group {
              }
              description { state: "disabled" 0.0;
                 inherit: "default" 0.0;
-                color: GENLIST_PART_DISCLIP_COLOR_INC;
+                color: GENLIST_PART_DISCLIP_COLOR;
              }
          }
       }
@@ -931,7 +931,7 @@ group {
              }
              description { state: "disabled" 0.0;
                 inherit: "default" 0.0;
-                color: GENLIST_PART_DISCLIP_COLOR_INC;
+                color: GENLIST_PART_DISCLIP_COLOR;
              }
          }
       }

diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc
index 38ce843..78a1cbb 100644 (file)
--- a/themes/widgets/genlist/genlist_decorate.edc
+++ b/themes/widgets/genlist/genlist_decorate.edc
@@ -91,7 +91,7 @@
          GENLIST_PART_DISCLIP
       }
       programs {
-         GENLIST_PROGRAM_DISCLIP( ; )
+         GENLIST_PROGRAM_DISCLIP
          GENLIST_PROGRAM_SELECT( ; )
          GENLIST_PROGRAM_REORDER
          program { name: "decorate_enabled_effect";

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index fc277be..facea11 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -313,8 +313,8 @@
             description { state: "default" 0.0; \
                min: 0 HEIGHT; \
                align: 0.5 0.5; \
+               color: 0 0 0 0; \
                rel2.offset: -1 0;\
-               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \
             } \
          }
 
@@ -762,7 +762,15 @@
             } \
             description { state: "disabled" 0.0; \
                inherit: "default" 0.0; \
-               color: GENLIST_PART_DISCLIP_COLOR_INC; \
+               color: GENLIST_PART_DISCLIP_COLOR; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_PART_DISCLIP_COLOR; \
+            } \
+            description { state: "flip_enabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 0; \
             } \
          }
 
@@ -1079,7 +1087,6 @@
             } \
          } \
          part { name: "elm.flip.content"; \
-            clip_to: "disclip"; \
             type: SWALLOW; \
             scale: 1; \
             GENLIST_DESCRIPTION_LR("elm.flip.content.left", "elm.flip.icon.left", fixed: 1 1; visible: 0;) \
@@ -1090,7 +1097,6 @@
          } \
          GENLIST_PART_PADDING_RIGHT_TO("elm.flip.icon.left", "elm.flip.icon", 16) \
          part { name: "elm.flip.icon"; \
-            clip_to: "disclip"; \
             type: SWALLOW; \
             scale: 1; \
             description { state: "default" 0.0; \
@@ -1457,20 +1463,18 @@
 // signal: elm,state,%s,passive
 //   a "check" item named %s went passive
 // default is passive
-#define GENLIST_PROGRAM_DISCLIP( TARGET ) \
+#define GENLIST_PROGRAM_DISCLIP \
          program { name: "enabled"; \
             signal: "elm,state,enabled"; \
             source: "elm"; \
             action: STATE_SET "default" 0.0; \
             target: "disclip"; \
-            TARGET \
          } \
          program { name: "disabled"; \
             signal: "elm,state,disabled"; \
             source: "elm"; \
             action: STATE_SET "disabled" 0.0; \
             target: "disclip"; \
-            TARGET \
          }
 
 #define GENLIST_PROGRAM_SELECT( TARGET ) \
@@ -1561,12 +1565,12 @@
             DISABLE_TARGET \
          }
 
-#define GENLIST_PROGRAM_FLIP( TARGET ) \
+#define GENLIST_PROGRAM_FLIP \
          program { name: "flip_enabled"; \
             signal:  "elm,state,flip,enabled"; \
             source:  "elm"; \
             action:  STATE_SET "flip_enabled" 0.0; \
-            TARGET \
+            target: "disclip"; \
             after:   "flip_enabled_next"; \
          } \
          program { name:    "flip_enabled_next"; \
@@ -1587,6 +1591,196 @@
          program { name:    "flip_disabled_next"; \
             source:  "elm"; \
             action:  STATE_SET "default" 0.0; \
-            TARGET \
+            target: "disclip"; \
          }
 /* genlist multisense macro - end */
+
+
+
+#define GENLIST_PART_TEXT_LISTITEM1(NAME, LEFT, RIGHT, TOP, BOTTOM) \
+   part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: TEXT; \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
+         fixed: 1 1; \
+         color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \
+         align: 0 0.5; \
+         text { \
+            align: 0 0.5; \
+            min: 0 1; \
+            max: 1 0; \
+            font: "SLP:style=Roman"; \
+            size: GENLIST_LIST_MAIN_TEXT_SIZE; \
+            text_class: "list_item"; \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; \
+      } \
+   }
+
+#define GENLIST_PART_TEXT_LISTITEM1_TB(NAME, LEFT, RIGHT, TOP, BOTTOM) \
+   part { name: NAME; \
+      clip_to: "disclip"; \
+      type: TEXTBLOCK; \
+      mouse_events: 0; \
+      scale: 1; \
+      GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
+         fixed: 1 1; \
+         align: 0 0.5; \
+         text { \
+            align: 0 0.5; \
+            min: 0 1; \
+            max: 1 0; \
+            style: "genlist_style_list_main_text_unread"; \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         text.style: "genlist_style_list_main_text_focus"; \
+      } \
+   }
+
+#define GENLIST_PART_TEXT_SUBITEM1_R(NAME) \
+    part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: TEXT; \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", \
+         rel1 { \
+            to_x: "base"; \
+            relative: 0.5 0; \
+         } \
+         color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \
+         fixed: 1 1; \
+         align: 1 0.5; \
+         text { \
+            font: "SLP:style=Medium"; \
+            size: GENLIST_LIST_SUB_TEXT_SIZE; \
+            min: 0 1; \
+            max: 1 0; \
+            align: 1 0.5; \
+            text_class: "slp_medium"; \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR; \
+      } \
+   }
+
+#define GENLIST_PART_TEXT_SUBITEM1_R_FIXED(NAME, SIZE) \
+    part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: TEXT; \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.padding.bottom", \
+         color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \
+         fixed: 1 1; \
+         align: 1 0.5; \
+         min: SIZE 0; \
+         text { \
+            font: "SLP:style=Medium"; \
+            size: GENLIST_LIST_SUB_TEXT_SIZE; \
+            min: 0 1; \
+            align: 0 0.5; \
+            text_class: "slp_medium"; \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR; \
+      } \
+   }
+
+#define GENLIST_PART_TEXT_SUBITEM1_L_FIXED(NAME, SIZE) \
+    part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: TEXT; \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION_LTB("elm.padding.left", "elm.padding.top", "elm.padding.bottom", \
+         color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \
+         fixed: 1 1; \
+         align: 0 0.5; \
+         min: SIZE 0; \
+         text { \
+            font: "SLP:style=Medium"; \
+            size: GENLIST_LIST_SUB_TEXT_SIZE; \
+            min: 0 1; \
+            align: 0 0.5; \
+            text_class: "slp_medium"; \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR; \
+      } \
+   }
+
+#define GENLIST_PART_TEXT_CONVERTOR(NAME, LEFT, RIGHT, TOP, BOTTOM, TEXT_PARAM) \
+   part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: TEXT; \
+      mouse_events: 0; \
+      GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
+         fixed: 1 1; \
+         color: GENLIST_CONVERTOR_STYLE_COLOR; \
+         align: 0 0.5; \
+         text { \
+            align: 0 0.5; \
+            min: 0 1; \
+            font: "SLP:style=Roman"; \
+            size: GENLIST_CONVERTOR_STYLE_SIZE; \
+            text_class: "list_item"; \
+            TEXT_PARAM \
+         } \
+      ) \
+      description { state: "selected" 0.0; \
+         inherit: "default" 0.0; \
+         color: GENLIST_CONVERTOR_STYLE_FOCUS_COLOR; \
+      } \
+   }
+
+
+#define GENLIST_PART_ICON_R(NAME, RIGHT, PARAM) \
+   part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: SWALLOW; \
+      GENLIST_DESCRIPTION_RTB(RIGHT, "elm.padding.top", "elm.padding.bottom", \
+         fixed: 1 1; \
+         PARAM \
+      ) \
+   }
+
+#define GENLIST_PART_ICON_L(NAME, LEFT, PARAM) \
+   part { name: NAME; \
+      scale: 1; \
+      clip_to: "disclip"; \
+      type: SWALLOW; \
+      GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.top", "elm.padding.bottom", \
+         fixed: 1 1; \
+         PARAM \
+      ) \
+   }
+
+//
+#define GENLIST_PART_INDEX_LIST_BASE_IMAGE_INC \
+   part { name: "base_image";\
+      repeat_events: 1;\
+      description { state: "default" 0.0;\
+         rel1.to: "rect";\
+         rel2.to: "rect";\
+         image {\
+            normal: "00_index list_bg.png";\
+            border: 0 0 2 2;\
+         }\
+      }\
+   }
\ No newline at end of file

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 4e51f5e..e207f61 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -254,6 +254,7 @@
       }
    }
 
+
 // Tizen Theme -------------------------------------------------------------------
 // 2.2.1.1
    group { name: "elm/genlist/item/1text/default";
@@ -265,168 +266,161 @@
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
       data.item: "flips" "elm.flip.icon elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
       parts {
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BASE_REORDER( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
-
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right", \
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0 0.5;
-                  text_class: "list_item";
-               }
-            )
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            //GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
          GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.left", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom")
       }
       programs {
-         GENLIST_PROGRAM_DISCLIP( ; )
+         GENLIST_PROGRAM_DISCLIP
          GENLIST_PROGRAM_SELECT( target: "elm.text"; )
          GENLIST_PROGRAM_REORDER
-         GENLIST_PROGRAM_FLIP( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 // 2.2.1.1 (textblock)
    group { name: "elm/genlist/item_compress/1text.tb/default";
-      inherit: "elm/genlist/item/1text/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right",
-               align: 0.0 0.5;
-               text {
-                  min: 0 1;
-                  style: "genlist_style_list_main_text_unread";
-               }
-            )
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               // FIXME: Why color textblock of is not changed by text.style?
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-               text.style: "genlist_style_list_main_text_focus";
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE_REORDER( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_LISTITEM1_TB("elm.text",
+            "elm.padding.left", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom")
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_REORDER
+         GENLIST_PROGRAM_FLIP
+      }
+   }
+
+// 2.2.1.2
+   group { name: "elm/genlist/item/2text/default";
+      alias: "elm/genlist/item_odd/2text/default";
+      alias: "elm/genlist/item_compress/2text/default";
+      alias: "elm/genlist/item_compress_odd/2text/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "flips" "elm.flip.icon elm.flip.content";
+      parts {
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_LISTITEM1("elm.text.1",
+            "elm.padding.left", "elm.text.2.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_SUBITEM1_R("elm.text.2")
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text.1"; target: "elm.text.2"; )
+         GENLIST_PROGRAM_FLIP
+      }
+   }
+
+// 2.2.1.3
+   group { name: "elm/genlist/item/2text.6/default";
+      alias: "elm/genlist/item_odd/2text.6/default";
+      alias: "elm/genlist/item_compress/2text.6/default";
+      alias: "elm/genlist/item_compress_odd/2text.6/default";
+      inherit: "elm/genlist/item/2text/default";
+
+      parts {
+         part { name: "elm.text.2";
+            description { state: "default" 0.0;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
       }
    }
-// scaled automatically by icon size
-// 2.2.1.5
-// 2.2.1.6
-// 2.2.1.7
+
+// 2.2.1.5 (scalable icon)
    group { name: "elm/genlist/item/1text.1icon/default";
       alias: "elm/genlist/item_odd/1text.1icon/default";
       alias: "elm/genlist/item_compress/1text.1icon/default";
       alias: "elm/genlist/item_compress_odd/1text.1icon/default";
-      alias: "elm/genlist/item/1text.1icon.4/default";
-      alias: "elm/genlist/item_odd/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.4/default";
-
-      inherit: "elm/genlist/item/1text/default";
 
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "flips" "elm.flip.icon elm.flip.content";
       data.item: "contents" "elm.icon";
+
       parts {
-         part { name: "elm.text";
-            description { state: "default" 0.0;
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
-               }
-            }
-            description { state: "selected" 0.0;
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
-               }
-            }
-         }
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE_REORDER( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.left", "elm.padding.icon.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.left",
+            "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right", )
       }
       programs {
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_REORDER
+         GENLIST_PROGRAM_FLIP
       }
    }
-// 2.2.1.28
-   group { name: "elm/genlist/item/1text.1icon.divider/default";
-      alias: "elm/genlist/item_odd/1text.1icon.divider/default";
+
+// 2.2.1.6 (Onoff icon)
+   group { name: "elm/genlist/item/1text.1icon.7/default";
+      alias: "elm/genlist/item_odd/1text.1icon.7/default";
       inherit: "elm/genlist/item/1text.1icon/default";
+
       parts {
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            GENLIST_DESCRIPTION_R("elm.padding.right", fixed: 1 1;)
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         /*
-         part { name: "elm.icon.touch";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            repeat_events: 1;
-            mouse_events: 1;
-            GENLIST_DESCRIPTION_R("elm.padding.right", color: 255 0 0 50; fixed: 1 0; min: 112 112;)
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         */
-      }
-      programs {
-         program {
-            name: "icon_touch";
-            signal: "mouse,up,1";
-            source: "elm.icon.touch";
-            action: SIGNAL_EMIT "mouse,up,1" "elm.icon";
-         }
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT + 10 )
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right",
+            min: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+            max: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+         )
       }
    }
 
-// 2.2.1.4
+// 2.2.1.4 (Text button)
    group { name: "elm/genlist/item/1text.1icon.6/default";
       alias: "elm/genlist/item_odd/1text.1icon.6/default";
       alias: "elm/genlist/item_compress/1text.1icon.6/default";
@@ -434,73 +428,40 @@
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
-         part { name: "elm.icon";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 0 GENLIST_TEXT_BTN_HEIGHT;
-                          max: 0 GENLIST_TEXT_BTN_HEIGHT;
-
-            }
-         }
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right",
+            min: 0 GENLIST_TEXT_BTN_HEIGHT;
+            max: 0 GENLIST_TEXT_BTN_HEIGHT;
+         )
       }
    }
-// 2.2.1.8
-   group { name: "elm/genlist/item/1text.1icon.5/default";
-      alias: "elm/genlist/item_odd/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.5/default";
+
+// 2.2.1.7
+      group { name: "elm/genlist/item/1text.1icon.4/default";
+      alias: "elm/genlist/item_odd/1text.1icon.4/default";
+      alias: "elm/genlist/item_compress/1text.1icon.4/default";
+      alias: "elm/genlist/item_compress_odd/1text.1icon.4/default";
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
-         part { name: "elm.icon";
-            description { state: "default" 0.0;
-               rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
-               rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
-            }
-         }
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
       }
    }
 
-// Scalable icon
-   group { name: "elm/genlist/item/1text.1icon.1/default";
-      alias: "elm/genlist/item_odd/1text.1icon.1/default";
-      alias: "elm/genlist/item_compress/1text.1icon.1/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.1/default";
+// 2.2.1.8
+   group { name: "elm/genlist/item/1text.1icon.5/default";
+      alias: "elm/genlist/item_odd/1text.1icon.5/default";
+      alias: "elm/genlist/item_compress/1text.1icon.5/default";
+      alias: "elm/genlist/item_compress_odd/1text.1icon.5/default";
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
-         part { name: "elm.text";
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-
-         }
-         part { name: "elm.icon";
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right",
+            rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+            rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+         )
       }
    }
 
@@ -514,1383 +475,482 @@
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.left", "elm.icon2.rect",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", GENLIST_PADDING_SIZE_DEFAULT)
+         // ICON for RIGHT side of the TEXT
+         part { name: "elm.icon.2";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
-               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+            GENLIST_DESCRIPTION_LTB("elm.padding.text.right", "elm.padding.top", "elm.padding.bottom",
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.left";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1.to_x: "elm.icon.1";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
-               }
-               align: 1.0 0.0;
-            }
-         }
-         part { name: "elm.padding.icon1.left2";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_64_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1.to_x: "elm.icon.1";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
-               }
-               align: 1.0 0.0;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left2";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.text.right";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text";
-               }
-               rel2.to_x: "elm.text";
-               align: 0.0 0.0;
-               visible: 0;
-            }
+            )
          }
-         part { name: "elm.icon.2.rect";
+         // Maxmimum right X axis for TEXT
+         part { name: "elm.icon2.rect";
             type: RECT;
-            clip_to: "disclip";
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.2";
-            type: SWALLOW;
-            clip_to: "disclip";
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_RTB("elm.padding.icon1.left", "elm.padding.top", "elm.padding.bottom",
+               min: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE;
+               max: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
-               rel1.to: "elm.icon.2.rect";
-               rel2.to: "elm.icon.2.rect";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+               visible: 0;
+            )
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.1", "elm.padding.right",
+            rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+            rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+         )
       }
       programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-   group { name: "elm/genlist/item_compress/1text.2icon.3.tb/default";
-      inherit: "elm/genlist/item/1text.2icon.3/default";
+// 2.2.1.9 (textblock)
+   group { name: "elm/genlist/item/1text.2icon.3.tb/default";
+      alias: "elm/genlist/item_compress/1text.2icon.3.tb/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "flips" "elm.flip.content";
       parts {
-         part { name: "elm.text";
-            type: TEXTBLOCK;
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_LISTITEM1_TB("elm.text",
+            "elm.padding.left", "elm.icon2.rect",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", GENLIST_PADDING_SIZE_DEFAULT)
+         // ICON for RIGHT side of the TEXT
+         part { name: "elm.icon.2";
+            type: SWALLOW;
             clip_to: "disclip";
-            mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left2";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_style_list_main_text_unread";
-                  min: 0 1;
-                  max: 1 0;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_style_list_main_text_focus";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+            GENLIST_DESCRIPTION_LTB("elm.padding.text.right", "elm.padding.top", "elm.padding.bottom",
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+            )
+         }
+         // Maxmimum right X axis for TEXT
+         part { name: "elm.icon2.rect";
+            type: RECT;
+            scale: 1;
+            GENLIST_DESCRIPTION_RTB("elm.padding.icon1.left", "elm.padding.top", "elm.padding.bottom",
+               min: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE;
+               max: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               visible: 0;
+            )
          }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.1", "elm.padding.right",
+            rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+            rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+         )
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-
 // 2.2.1.10
-// 2.2.1.20
-   group { name: "elm/genlist/item/1text.1icon.2/default";
+   group { name: "elm/genlist/item/1text.1icon.1/default";
+      alias: "elm/genlist/item_odd/1text.1icon.1/default";
+      alias: "elm/genlist/item_compress/1text.1icon.1/default";
+      alias: "elm/genlist/item_compress_odd/1text.1icon.1/default";
+      alias: "elm/genlist/item/1text.1icon.2/default";
       alias: "elm/genlist/item_odd/1text.1icon.2/default";
       alias: "elm/genlist/item_compress/1text.1icon.2/default";
       alias: "elm/genlist/item_compress_odd/1text.1icon.2/default";
-      inherit: "elm/genlist/item/1text.1icon.1/default";
 
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content";
       parts {
-         part { name: "elm.icon";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+          GENLIST_PART_ICON_L("elm.icon", "elm.padding.left",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon.right", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom")
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 2.2.1.10 textblock
+// 2.2.1.10 (textblock)
    group { name: "elm/genlist/item_compress/1text.1icon.2.tb/default";
-      inherit: "elm/genlist/item/1text.1icon.2/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content";
       parts {
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               text {
-                  style: "genlist_style_list_main_text_unread";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               // FIXME: Why is not textblock changed by text.style?
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-               text.style: "genlist_style_list_main_text_focus";
-            }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_ICON_L("elm.icon", "elm.padding.left",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1_TB("elm.text",
+            "elm.padding.icon.right", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom")
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 2.2.1.16
-   group { name: "elm/genlist/item/1text.1icon.3/default";
-      alias: "elm/genlist/item_odd/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.3/default";
-      inherit: "elm/genlist/item/1text.1icon.1/default";
+// 2.2.1.11
+   group { name: "elm/genlist/item/2text.1icon/default";
+      alias: "elm/genlist/item_odd/2text.1icon/default";
+      alias: "elm/genlist/item_compress/2text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content";
 
       parts {
-         part { name: "elm.icon";
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+          GENLIST_PART_ICON_L("elm.icon", "elm.padding.left",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text.1",
+            "elm.padding.icon.right", "elm.padding.text2.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_SUBITEM1_R("elm.text.2")
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text.1"; target: "elm.text.2"; )
+         GENLIST_PROGRAM_FLIP
+      }
+   }
+
+// 2.2.1.12
+   group { name: "elm/genlist/item/2text.1icon.6/default";
+      alias: "elm/genlist/item_odd/2text.1icon.6/default";
+      alias: "elm/genlist/item_compress/2text.1icon.6/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon.6/default";
+      inherit: "elm/genlist/item/2text.1icon/default";
+
+      parts {
+         part { name: "elm.text.2";
             description { state: "default" 0.0;
-               fixed: 1 1;
-               min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
-               max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
       }
    }
 
-
-// 2.2.1.13
 // 2.2.1.14
-// 2.2.1.15
+// 2.2.1.17
+// 2.2.1.21
+// 2.2.1.22
    group { name: "elm/genlist/item/1text.2icon/default";
       alias: "elm/genlist/item_odd/1text.2icon/default";
       alias: "elm/genlist/item_compress/1text.2icon/default";
       alias: "elm/genlist/item_compress_odd/1text.2icon/default";
+      alias: "elm/genlist/item/1text.2icon.6/default";
+      alias: "elm/genlist/item_odd/1text.2icon.6/default";
+      alias: "elm/genlist/item_compress/1text.2icon.6/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.6/default";
+      alias: "elm/genlist/item/1text.2icon.4/default";
+      alias: "elm/genlist/item_odd/1text.2icon.4/default";
+      alias: "elm/genlist/item_compress/1text.2icon.4/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.4/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
          GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+
+         GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon1.right", "elm.padding.icon2.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right", )
       }
       programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 2.2.1.18
-   group { name: "elm/genlist/item/1text.2icon.2/default";
-      alias: "elm/genlist/item_odd/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.2/default";
+// 2.2.1.15
+   group { name: "elm/genlist/item/1text.2icon.7/default";
+      alias: "elm/genlist/item_odd/1text.2icon.7/default";
+      inherit: "elm/genlist/item/1text.2icon/default";
+
+      parts {
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT + 16)
+         GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right",
+            min: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+            max: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+         )
+      }
+   }
+
+// Textblock
+// 2.2.1.14
+// 2.2.1.17
+// 2.2.1.21
+// 2.2.1.22
+   group { name: "elm/genlist/item/1text.2icon.tb/default";
+      alias: "elm/genlist/item_odd/1text.2icon.tb/default";
+      alias: "elm/genlist/item_compress/1text.2icon.tb/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.tb/default";
+      alias: "elm/genlist/item/1text.2icon.6.tb/default";
+      alias: "elm/genlist/item_odd/1text.2icon.6.tb/default";
+      alias: "elm/genlist/item_compress/1text.2icon.6.tb/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.6.tb/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2.to_x: "elm.padding.icon1.right";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 3.1.14
-   group { name: "elm/genlist/item/1text.2icon.6/default";
-      alias: "elm/genlist/item_odd/1text.2icon.6/default";
-      alias: "elm/genlist/item_compress/1text.2icon.6/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.6/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-   group { name: "elm/genlist/item_compress/1text.2icon.6.tb/default";
-      inherit: "elm/genlist/item/1text.2icon.6/default";
-      parts {
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_style_list_main_text_unread";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_style_list_main_text_focus";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
-
-// 2Text -------------------------------------------------------------------------
-// 2.2.1.2
-   group { name: "elm/genlist/item/2text/default";
-      alias: "elm/genlist/item_odd/2text/default";
-      alias: "elm/genlist/item_compress/2text/default";
-      alias: "elm/genlist/item_compress_odd/2text/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "flips" "elm.flip.icon elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_DISCLIP
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         GENLIST_PART_FLIP
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.text.2.left",
-               align: 0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               )
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", 16)
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_R("elm.padding.right",
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_LIST_SUB_TEXT_SIZE;
-                  // FIXME: This text never stop in X axis
-                  min: 1 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            )
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-      programs {
-       program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_2TEXT
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 2.2.1.3
-   group { name: "elm/genlist/item/2text.6/default";
-      alias: "elm/genlist/item_odd/2text.6/default";
-      alias: "elm/genlist/item_compress/2text.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.6/default";
-      inherit: "elm/genlist/item/2text/default";
-
-      parts {
-         part { name: "elm.text.2";
-            description { state: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
-            }
-         }
-      }
-   }
-
-
-// 2.2.1.11
-// 3.1.11
-   group { name: "elm/genlist/item/2text.1icon/default";
-      alias: "elm/genlist/item_odd/2text.1icon/default";
-      alias: "elm/genlist/item_compress/2text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            GENLIST_DESCRIPTION_L("elm.padding.left",
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-            )
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT)
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_R("elm.padding.right",
-               min: 300 0;
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_LIST_SUB_TEXT_SIZE;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            )
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            GENLIST_DESCRIPTION_LR("elm.padding.icon.right", "elm.text.2",
-               align: 0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            )
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_2TEXT
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 2.2.1.12
-   group { name: "elm/genlist/item/2text.1icon.6/default";
-      alias: "elm/genlist/item_odd/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.6/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.text2.left";
-            clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.text.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-               }
-               visible: 0;
-               align: 1.0 0.5;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1_TB("elm.text",
+            "elm.padding.icon1.right", "elm.padding.icon2.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right", )
+      }
+      programs {
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
+      }
+   }
+
+// 2.2.1.13
+   group { name: "elm/genlist/item/1text.2icon.1/default";
+      alias: "elm/genlist/item_odd/1text.2icon/1/default";
+      alias: "elm/genlist/item_compress/1text.2icon.1/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.1/default";
+      inherit: "elm/genlist/item/1text.2icon/default";
+
+      parts {
+         GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right",
+            min: 0 GENLIST_TEXT_BTN_HEIGHT;
+            max: 0 GENLIST_TEXT_BTN_HEIGHT;
+         )
+      }
+   }
+
+// 2.2.1.16
+// 2.2.1.20
+   group { name: "elm/genlist/item/1text.1icon.3/default";
+      alias: "elm/genlist/item_odd/1text.1icon.3/default";
+      alias: "elm/genlist/item_compress/1text.1icon.3/default";
+      alias: "elm/genlist/item_compress_odd/1text.1icon.3/default";
+      inherit: "elm/genlist/item/1text.1icon.1/default";
+
+      parts {
+         part { name: "elm.icon";
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               fixed: 1 1;
+               min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+               max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
+      }
+   }
+
+// 2.2.1.18
+// 2.2.1.23
+   group { name: "elm/genlist/item/1text.2icon.2/default";
+      alias: "elm/genlist/item_odd/1text.2icon.2/default";
+      alias: "elm/genlist/item_compress/1text.2icon.2/default";
+      alias: "elm/genlist/item_compress_odd/1text.2icon.2/default";
+
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "flips" "elm.flip.content";
+
+      parts {
          GENLIST_PART_DISCLIP
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left",
+            min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+            max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_L("elm.icon.2", "elm.padding.icon1.right",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon2.right", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom")
       }
       programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-
-// 3.1.19
+// 2.2.1.19
+// 2.2.1.25
    group { name: "elm/genlist/item/1text.3icon/default";
       alias: "elm/genlist/item_odd/1text.3icon/default";
       alias: "elm/genlist/item_compress/1text.3icon/default";
       alias: "elm/genlist/item_compress_odd/1text.3icon/default";
+
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2.to_x: "elm.padding.icon1.right";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon3.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.3";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
          GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+
+         GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left",
+            min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+            max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_L("elm.icon.2", "elm.padding.icon1.right",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon2.right", "elm.padding.icon3.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.3", "elm.padding.right", )
       }
       programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_3ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 3.1.24
+// 2.2.1.24
    group { name: "elm/genlist/item/1text.3icon.2/default";
       alias: "elm/genlist/item_odd/1text.3icon.2/default";
       alias: "elm/genlist/item_compress/1text.3icon.2/default";
@@ -1900,537 +960,176 @@
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon3.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 0.0;
-                  to_x: "elm.icon.3";
-               }
-               rel2.to_x: "elm.icon.3";
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.icon3.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.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 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
          GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+
+         GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left",
+            min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+            max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+         )
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon1.right", "elm.padding.icon2.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.icon3.left",
+            min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+            max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+         )
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_ICON_R("elm.icon.3", "elm.padding.right", )
       }
       programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_3ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 3.1.26
+// 2.2.1.26
    group { name: "elm/genlist/item/2text.4/default";
       alias: "elm/genlist/item_odd/2text.4/default";
       alias: "elm/genlist/item_compress/2text.4/default";
       alias: "elm/genlist/item_compress_odd/2text.4/default";
+
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_97_INC )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( 98 )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_206_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.text2.left";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.text.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-               }
-               align: 1.0 0.5;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_CONVERTOR("elm.text.1",
+            "elm.padding.left", "elm.vertical_line.left",
+            "elm.padding.top", "elm.padding.bottom", align: 1 0.5; )
+         GENLIST_PART_PADDING_RIGHT_TO("elm.vertical_line.left", "vertical_line", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "vertical_line";
             type: RECT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_RTB("elm.text.2.left", "elm.padding.top", "elm.padding.bottom",
                min: 1 0;
                fixed: 1 0;
-               rel1.to_x: "elm.padding.text2.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               align: 1.0 0.5;
                color: GENLIST_PART_LIST_LINE_COLOR_INC;
-            }
-         }
-         part { name: "elm.padding.text1.right";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "vertical_line";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "vertical_line";
-               }
-               align: 1.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  to_x: "elm.padding.text1.right";
-               }
-               color: GENLIST_CONVERTOR_STYLE_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_CONVERTOR_STYLE_SIZE;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_CONVERTOR_STYLE_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+            )
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+         GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_SUBITEM1_R_FIXED("elm.text.2", 222)
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.flip.content";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.flip.content";
-         }
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text.1"; target: "elm.text.2"; )
+         GENLIST_PROGRAM_FLIP
       }
    }
 
-// 3.1.27
+// 2.2.1.27
    group { name: "elm/genlist/item/2text.5/default";
       alias: "elm/genlist/item_odd/2text.5/default";
       alias: "elm/genlist/item_compress/2text.5/default";
       alias: "elm/genlist/item_compress_odd/2text.5/default";
+
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DISCLIP
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
-         }
-         part { name: "elm.padding.text1.right";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "elm.text.1";
-               }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_TOP( 1 )
+         GENLIST_PART_PADDING_BOTTOM( 1 )
+         GENLIST_PART_FLIP
+
+         GENLIST_PART_TEXT_SUBITEM1_L_FIXED("elm.text.2", 154)
+         GENLIST_PART_PADDING_LEFT_TO("elm.text.2.right", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT)
          part { name: "vertical_line";
             type: RECT;
             mouse_events: 0;
-            description { state: "default" 0.0;
+            GENLIST_DESCRIPTION_LTB("elm.text.2.right", "elm.padding.top", "elm.padding.bottom",
                min: 1 0;
                fixed: 1 0;
-               rel1.to_x: "elm.padding.text1.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text1.right";
-               }
-               align: 0.0 0.5;
                color: GENLIST_PART_LIST_LINE_COLOR_INC;
-            }
-         }
-         part { name: "elm.padding.text2.left";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "vertical_line";
-               }
-               rel2.to_x: "vertical_line";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               rel2 {
-                  relative: 0.0  1.0;
-                  to_x: "elm.padding.right";
-               }
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+            )
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
+         GENLIST_PART_PADDING_LEFT_TO("elm.vertical_line.right", "vertical_line", GENLIST_PADDING_SIZE_DEFAULT)
+         GENLIST_PART_TEXT_CONVERTOR("elm.text.1",
+            "elm.vertical_line.right", "elm.padding.right",
+            "elm.padding.top", "elm.padding.bottom", )
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.2";
-            target: "elm.flip.content";
+         GENLIST_PROGRAM_DISCLIP
+         GENLIST_PROGRAM_SELECT( target: "elm.text.1"; target: "elm.text.2"; )
+         GENLIST_PROGRAM_FLIP
+      }
+   }
+
+// 2.2.1.28
+   group { name: "elm/genlist/item/1text.1icon.divider/default";
+      alias: "elm/genlist/item_odd/1text.1icon.divider/default";
+      inherit: "elm/genlist/item/1text.1icon.7/default";
+      images.image: "00_winset_divider_line.png" COMP;
+
+      parts {
+         GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.left", "elm.padding.divider.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.divider.left", "elm.divider", GENLIST_PADDING_SIZE_DEFAULT)
+         part { name: "elm.divider";
+            GENLIST_DESCRIPTION_RTB("elm.padding.icon.left", "elm.padding.top", "elm.padding.bottom",
+               min: 2 72;
+               max: 2 72;
+               fixed: 1 1;
+               image.normal: "00_winset_divider_line.png";
+            )
          }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.2";
-            target: "elm.flip.content";
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.left", "elm.icon", 26)
+         GENLIST_PART_ICON_R("elm.icon", "elm.padding.right",
+            min: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+            max: GENLIST_ICON_ONOFF_WIDTH GENLIST_ICON_ONOFF_HEIGHT;
+         )
+      }
+   }
+
+// 2.2.1.29
+   group { name: "elm/genlist/item/1text.2icon.divider/default";
+      alias: "elm/genlist/item_odd/1text.2icon.divider/default";
+      inherit: "elm/genlist/item/1text.2icon.7/default";
+
+      parts {
+        GENLIST_PART_TEXT_LISTITEM1("elm.text",
+            "elm.padding.icon1.right", "elm.padding.divider.left",
+            "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.divider.left", "elm.divider", GENLIST_PADDING_SIZE_DEFAULT)
+         part { name: "elm.divider";
+            GENLIST_DESCRIPTION_RTB("elm.padding.icon2.left", "elm.padding.top", "elm.padding.bottom",
+               min: 2 72;
+               max: 2 72;
+               fixed: 1 1;
+               image.normal: "00_winset_divider_line.png";
+            )
          }
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
@@ -8402,245 +7101,40 @@
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 3.2.26
-   group { name: "elm/genlist/item/2text.2icon.6/default";
-      alias: "elm/genlist/item_odd/2text.2icon.6/default";
-      alias: "elm/genlist/item_compress/2text.2icon.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.6/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 0.0 0.0;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -8654,7 +7148,6 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  offset: 0 0;
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
@@ -8717,75 +7210,6 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2icon.6.tb/default";
-      inherit: "elm/genlist/item/2text.2icon.6/default";
-      parts {
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_style_list_main_text_unread";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_style_list_main_text_focus";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               text {
-                  style: "genlist_style_list_main_text_unread";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_style_list_main_text_focus";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
 
 // 3.2.27
    group { name: "elm/genlist/item/2text.1icon.12/default";
@@ -23821,6 +22245,7 @@
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_COLORBAR
+
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -25659,158 +24084,3 @@
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
-
-// 3.1.17
-   group { name: "elm/genlist/item/1text.2icon.4/default";
-      alias: "elm/genlist/item_odd/1text.2icon.4/default";
-      alias: "elm/genlist/item_compress/1text.2icon.4/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.4/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-

diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc
index 3232e4c..89386af 100644 (file)
--- a/themes/widgets/genlist/genlist_sweep.edc
+++ b/themes/widgets/genlist/genlist_sweep.edc
@@ -375,7 +375,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
+               color: GENLIST_PART_DISCLIP_COLOR;
             }
          }
       }
@@ -622,7 +622,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
+               color: GENLIST_PART_DISCLIP_COLOR;
             }
          }
       }
@@ -900,7 +900,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
+               color: GENLIST_PART_DISCLIP_COLOR;
             }
          }
       }
@@ -1215,7 +1215,7 @@
             }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
+               color: GENLIST_PART_DISCLIP_COLOR;
             }
          }
       }