[Genlist] Fix some sound macro

1. Only BG (or BG reorder or BG dialogue) make sound.
2. text/image part just repeat it's events to below.
3. Some image part do not need to receive events.

Change-Id: I096c008242728305f8b9cb149ce6054793913cc7

diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc
index a329b57..b5e9219 100644 (file)
--- a/themes/widgets/genlist/genlist_decorate.edc
+++ b/themes/widgets/genlist/genlist_decorate.edc
@@ -49,9 +49,8 @@
          )
       }
       programs {
-         GENLIST_PROGRAM_SOUND("elm.text")
-         GENLIST_PROGRAM_SOUND("bg")
          GENLIST_PROGRAM_DISABLED( target: "elm.icon"; target: "elm.text"; )
+         GENLIST_PROGRAM_SOUND("bg")
       }
    }
 
@@ -95,20 +94,6 @@
                max: DIALOGUE_PADDING_SIZE_RIGHT -1;
             }
          )
-         GENLIST_PART_RECT("sound_left",
-            description { state: "default" 0.0;
-              color: 0 0 0 0;
-              rel2.to_x: "elm.swallow.decorate.content";
-              rel2.relative: 0 1;
-            }
-         )
-         GENLIST_PART_RECT("sound_right",
-            description { state: "default" 0.0;
-              color: 0 0 0 0;
-              rel1.to_x: "elm.swallow.decorate.content";
-              rel1.relative: 1 0;
-            }
-         )
          GENLIST_PART_ICON("elm.edit.icon.1",
             GENLIST_DESCRIPTION_L("elm.padding.left",
                align: 1 0.5;
@@ -162,13 +147,9 @@
             target: "bottom_line";
             target: "bottom_line2";
          )
-         // FIXME: GENLIST_PROGRAM_SOUND("base") makes duplicated clicked sounds because
-         // swallowed edje also makes sound.
-         // I don't know why "base" part can receive "mouse,clicked,1" events
-         // even though it is below the "elm.swallow.decorate.content" and events should
-         // not be repeated!!!!!!!!
-         GENLIST_PROGRAM_SOUND("sound_left")
-         GENLIST_PROGRAM_SOUND("sound_right")
+         // BG of swallowed VIEW(it) is visible 0
+         GENLIST_PROGRAM_SOUND("bg")
+         GENLIST_PROGRAM_SOUND("bg_reorder")
          GENLIST_PROGRAM_REORDER(
            target: "bg_clip";
            target: "bg_reorder_clip";

diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc
index 7d68196..000b4c6 100644 (file)
--- a/themes/widgets/genlist/genlist_expandable.edc
+++ b/themes/widgets/genlist/genlist_expandable.edc
@@ -58,8 +58,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -101,8 +99,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -143,8 +139,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -194,8 +188,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -250,9 +242,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
-         GENLIST_PROGRAM_SOUND("elm.text.3")
       }
    }
 
@@ -293,7 +282,6 @@
       programs {
          GENLIST_PROGRAM_SELECT_ARROW
          GENLIST_PROGRAM_EXPAND_ROOT( target: "arrow"; )
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 #if 0
@@ -328,7 +316,6 @@
       programs {
          GENLIST_PROGRAM_DISABLED
          GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; )
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -363,7 +350,6 @@
       programs {
          GENLIST_PROGRAM_DISABLED
          GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; )
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -569,7 +555,6 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index a6faaa7..2810c86 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -421,6 +421,7 @@
          ) \
          GENLIST_PART_IMAGE("elm.thumb", \
             clip_to: "elm.thumb.clip"; \
+            mouse_events: 0; \
             GENLIST_DESCRIPTION_ENVELOP(PARENT, \
                image.normal: "Content_views/Icon_masking/"SIZE_PREFIX"/00_list_circle_icon_bg_normal.png"; \
                min: MASK_SIZE MASK_SIZE; \
@@ -475,6 +476,7 @@
          ) \
          GENLIST_PART_IMAGE("elm.thumb", \
             clip_to: "elm.thumb.clip"; \
+            mouse_events: 0; \
             GENLIST_DESCRIPTION_ENVELOP(PARENT, \
                image.normal: "Content_views/Icon_masking/"SIZE_PREFIX"/00_list_square_icon_bg_normal.png"; \
                min: MASK_SIZE MASK_SIZE; \
@@ -528,6 +530,7 @@
          ) \
          GENLIST_PART_IMAGE("elm.thumb", \
             clip_to: "elm.thumb.clip"; \
+            mouse_events: 0; \
             GENLIST_DESCRIPTION_ENVELOP(PARENT, \
                image.normal: "Content_views/Icon_masking/"SIZE_PREFIX"/00_dialogue_circle_icon_bg_normal.png"; \
                min: MASK_SIZE MASK_SIZE; \
@@ -571,6 +574,7 @@
          ) \
          GENLIST_PART_IMAGE("elm.thumb", \
             clip_to: "elm.thumb.clip"; \
+            mouse_events: 0; \
             GENLIST_DESCRIPTION_ENVELOP(PARENT, \
                image.normal: "Content_views/Icon_masking/"SIZE_PREFIX"/00_dialogue_square_icon_bg_normal.png"; \
                min: MASK_SIZE MASK_SIZE; \
@@ -628,52 +632,59 @@
 //****************************************************************************//
 #define GENLIST_PART_BG_NORMAL \
       GENLIST_PART_RECT("bg_clip", \
+         mouse_events: 0; \
          description { state: "default" 0.0; \
+            visible: 1; \
             color: 255 255 255 255; \
          } \
          description { state: "decorate" 0.0; \
             inherit: "default" 0.0; \
-            color: 0 0 0 0; \
+            visible: 0; \
          } \
          description { state: "reorder" 0.0; \
             inherit: "default" 0.0; \
-            color: 0 0 0 0; \
+            visible: 0; \
          } \
          description { state: "decorate_reorder" 0.0; \
             inherit: "default" 0.0; \
-            color: 0 0 0 0; \
-         } \
-      ) \
-      GENLIST_PART_RECT("bg",  \
-         clip_to: "bg_clip"; \
-         description { state: "default" 0.0; \
-            color: GENLIST_LIST_BG_COLOR; \
-         } \
-         description { state: "selected" 0.0; \
-            inherit: "default" 0.0; \
-            color: GENLIST_LIST_PRESS_COLOR; \
-         } \
-         description { state: "disabled" 0.0; \
-            inherit: "default" 0.0; \
-            color: GENLIST_LIST_DIM_COLOR; \
+            visible: 0; \
          } \
       ) \
       GENLIST_PART_RECT("bg_reorder_clip", \
+         mouse_events: 0; \
          description { state: "default" 0.0; \
-            color: 0 0 0 0; \
+            visible: 0; \
          } \
          description { state: "reorder" 0.0; \
             inherit: "default" 0.0; \
+            visible: 1; \
             color: 255 255 255 255; \
          } \
          description { state: "decorate_reorder" 0.0; \
             inherit: "default" 0.0; \
+            visible: 0; \
          } \
          description { state: "decorate" 0.0; \
             inherit: "default" 0.0; \
+            visible: 0; \
          } \
          description { state: "reorder_flip" 0.0; \
             inherit: "default" 0.0; \
+            visible: 0; \
+         } \
+      ) \
+      GENLIST_PART_RECT("bg",  \
+         clip_to: "bg_clip"; \
+         description { state: "default" 0.0; \
+            color: GENLIST_LIST_BG_COLOR; \
+         } \
+         description { state: "selected" 0.0; \
+            inherit: "default" 0.0; \
+            color: GENLIST_LIST_PRESS_COLOR; \
+         } \
+         description { state: "disabled" 0.0; \
+            inherit: "default" 0.0; \
+            color: GENLIST_LIST_DIM_COLOR; \
          } \
       ) \
       GENLIST_PART_SPACER("bg_reorder_left", \
@@ -719,6 +730,7 @@
 
 #define GENLIST_PART_BG_NORMAL_OFF \
    GENLIST_PART_RECT("bg_clip", \
+      mouse_events: 0; \
       description { state: "default" 0.0; \
          visible: 0; \
       } \
@@ -748,23 +760,25 @@
       } \
    ) \
    GENLIST_PART_RECT("bg_reorder_clip", \
-         description { state: "default" 0.0; \
-            visible: 0; \
-         } \
-         description { state: "reorder" 0.0; \
-            visible: 0; \
-         } \
-         description { state: "decorate_reorder" 0.0; \
-            visible: 0; \
-         } \
-         description { state: "decorate" 0.0; \
-            visible: 0; \
-         } \
-         description { state: "reorder_flip" 0.0; \
-            visible: 0; \
-         } \
-      ) \
+      mouse_events: 0; \
+      description { state: "default" 0.0; \
+         visible: 0; \
+      } \
+      description { state: "reorder" 0.0; \
+         visible: 0; \
+      } \
+      description { state: "decorate_reorder" 0.0; \
+         visible: 0; \
+      } \
+      description { state: "decorate" 0.0; \
+         visible: 0; \
+      } \
+      description { state: "reorder_flip" 0.0; \
+         visible: 0; \
+      } \
+   ) \
    GENLIST_PART_IMAGE("bg_reorder", \
+      mouse_events: 0; \
       description {state: "default" 0.0;\
          visible: 0;\
       }\
@@ -913,7 +927,6 @@
 #define GENLIST_PART_BASE \
          GENLIST_PART_BASE_SIZE(0)
 
-
 #define GENLIST_PART_FOCUS \
    GENLIST_PART_IMAGE("focus_part", \
       mouse_events: 0; \
@@ -1769,20 +1782,20 @@
       }
 
 #define GENLIST_PROGRAM_SOUND( SRC ) \
-         program { name: "play_sound"SRC; \
-            signal: "mouse,clicked,1"; \
-            source: SRC; \
-            script { \
-               new st[31]; \
-               new Float:vl; \
-               get_state(PART:"base", st, 30, vl); \
-               if (strcmp(st, "disabled")) \
-                  run_program(PROGRAM:"play_button_press"SRC); \
-            } \
+      program { name: "play_sound"SRC; \
+         signal: "mouse,clicked,1"; \
+         source: SRC; \
+         script { \
+            new st[31]; \
+            new Float:vl; \
+            get_state(PART:"base", st, 30, vl); \
+            if (strcmp(st, "disabled")) \
+               run_program(PROGRAM:"play_button_press"SRC); \
          } \
-         program { name: "play_button_press"SRC; \
-            action: PLAY_SAMPLE "button-pressed" 1.0; \
-         }
+      } \
+      program { name: "play_button_press"SRC; \
+         action: PLAY_SAMPLE "button-pressed" 1.0; \
+      }
 
 #define GENLIST_PROGRAM_SELECT( TARGET ) \
          program { name: "selected"; \
@@ -2166,8 +2179,8 @@
          target: "bottom_line2"; \
          target: "bg_reorder"; \
       ) \
-      GENLIST_PROGRAM_SOUND( "bg" ) \
-      GENLIST_PROGRAM_SOUND( "bg_reorder" ) \
+      GENLIST_PROGRAM_SOUND("bg") \
+      GENLIST_PROGRAM_SOUND("bg_reorder") \
       GENLIST_PROGRAM_DECORATE_REORDER("normal", TARGET \
          target: "bg_clip"; \
          target: "bg_reorder_clip"; \
@@ -2207,79 +2220,6 @@
       GENLIST_PROGRAM_EDITMODE \
    }
 
-#define GENLIST_PROGRAMS_READ_TEXT( TARGET ) \
-   programs { \
-      GENLIST_PROGRAM_DEFAULT( TARGET \
-         target: "bg"; \
-         target: "bg_clip"; \
-         target: "bottom_line"; \
-         target: "bottom_line2"; \
-         target: "bottom_line_clip"; \
-         target: "bg_reorder"; \
-         target: "elm.padding.left"; \
-         target: "elm.padding.right"; \
-      ) \
-      GENLIST_PROGRAM_DISABLED( TARGET \
-         target: "bg"; \
-         target: "bottom_line"; \
-         target: "bottom_line2"; \
-         target: "bg_reorder"; \
-      ) \
-      GENLIST_PROGRAM_FOCUS \
-      GENLIST_PROGRAM_SELECT( TARGET \
-         target: "bg"; \
-         target: "bottom_line"; \
-         target: "bottom_line2"; \
-         target: "bg_reorder"; \
-      ) \
-      GENLIST_PROGRAM_SOUND("bg") \
-      GENLIST_PROGRAM_DECORATE_REORDER( "normal", \
-         target: "bg_clip"; \
-         target: "bg_reorder_clip"; \
-         target: "bottom_line_clip"; \
-         target: "elm.padding.left"; \
-         target: "elm.padding.right"; \
-      ) \
-      program { name: "unselected_target"; \
-         action: STATE_SET "default" 0.0; \
-         TARGET \
-      } \
-      program { name: "unselected_read"; \
-         signal: "elm,state,unselected"; \
-         source: "elm"; \
-         script { \
-            if (get_int(readed) == 1) \
-               run_program(PROGRAM:"go_read_target"); \
-            else \
-               run_program(PROGRAM:"unselected_target"); \
-         } \
-      } \
-      program { name: "go_read"; \
-         signal: "elm,state,read"; \
-         source: "*"; \
-         script { \
-           set_int(readed, 1); \
-           run_program(PROGRAM:"go_read_target"); \
-         } \
-      } \
-      program { name: "go_unread"; \
-         signal: "elm,state,unread"; \
-         source: "*"; \
-         script { \
-           set_int(readed, 0); \
-           run_program(PROGRAM:"go_unread_target"); \
-         } \
-      } \
-      program { name: "go_read_target"; \
-         action: STATE_SET "read" 0.0; \
-         TARGET \
-      } \
-      program { name: "go_unread_target"; \
-         action: STATE_SET "unread" 0.0; \
-         TARGET \
-      } \
-   }
-
 #define GENLIST_PROGRAMS_DECORATE_EFFECT( TARGET ) \
    program { name: "decorate_enabled_effect_ef"; \
       signal: "elm,state,decorate,enabled,effect";\
@@ -2612,6 +2552,7 @@
 #define GENLIST_PART_TEXT(NAME, DESCRIPION) \
     part { name: NAME; \
       scale: 1; \
+      repeat_events: 1; \
       type: TEXT; \
       DESCRIPION \
    }
@@ -2619,6 +2560,7 @@
 #define GENLIST_PART_TEXTBLOCK(NAME, DESCRIPION) \
     part { name: NAME; \
       scale: 1; \
+      repeat_events: 1; \
       type: TEXTBLOCK; \
       DESCRIPION \
    }
@@ -3226,6 +3168,7 @@
 // FIXME: Need to find why rel2.offset: 9 -1 will not fix the alignment of bubble text ?
 #define GENLIST_PART_LIST_BUBBLE_TEXT_RTB(NAME, HEIGHT, RIGHT, TOP, BOTTOM) \
          GENLIST_PART_IMAGE("elm.bubble", \
+            mouse_events: 0; \
             GENLIST_DESCRIPTION_ENVELOP(NAME, \
                image { \
                   normal: "00_list_bubble_bg.png"; \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index fb96238..4e8e77a 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -57,7 +57,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.swallow.icon"; target: "elm.swallow.end"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // -------------------------------------------------------------------
@@ -91,6 +90,7 @@
             )
          )
          GENLIST_PART_IMAGE("elm.image.rename",
+            mouse_events: 0;
             GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
                fixed: 1 0;
                visible: 1;
@@ -167,6 +167,7 @@
             )
          )
          GENLIST_PART_IMAGE("elm.image.rename",
+            mouse_events: 0;
             GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
                visible: 1;
                fixed: 1 0;
@@ -311,7 +312,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 // 2.2.1.1 (textblock)
    group { GENLIST_NAME("1text.tb/default")
@@ -334,7 +334,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.2
@@ -362,8 +361,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.1.3
@@ -408,7 +405,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.5
@@ -498,7 +494,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.9 (textblock)
@@ -534,7 +529,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.10
@@ -577,7 +571,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.10.1 (circle)
@@ -620,7 +613,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.11
@@ -646,8 +638,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.1.12
@@ -688,7 +678,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.13 (textblock)
@@ -715,7 +704,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.14
@@ -811,7 +799,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.19
@@ -842,7 +829,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.21
@@ -892,7 +878,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.1.26
@@ -923,8 +908,6 @@
       GENLIST_PROGRAMS_NORMAL(
          target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target: "elm.divider2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.1.26 (textblock)
@@ -953,8 +936,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target: "elm.divider2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.1.27
@@ -982,8 +963,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.1.28
@@ -1041,8 +1020,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.1 (textblock)
@@ -1070,8 +1047,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.2
@@ -1099,8 +1074,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.3
@@ -1130,9 +1103,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.3 (textblock)
@@ -1163,9 +1133,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.4
@@ -1195,8 +1162,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.4 (textblock)
@@ -1226,8 +1191,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 
@@ -1268,8 +1231,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.6
@@ -1312,8 +1273,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.7
@@ -1352,9 +1311,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.7 (textblock)
@@ -1394,9 +1350,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.8
@@ -1435,8 +1388,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.9
@@ -1496,8 +1447,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.11
@@ -1556,8 +1505,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.13
@@ -1588,8 +1535,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.14
@@ -1619,8 +1564,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.14.1 (circle)
@@ -1670,8 +1613,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.15
@@ -1703,9 +1644,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.16
@@ -1764,8 +1702,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.17 (textblock)
@@ -1810,8 +1746,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.18
@@ -1844,8 +1778,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 
@@ -1879,8 +1811,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.19
@@ -1914,8 +1844,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.19 (textblock)
@@ -1950,8 +1878,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.20
@@ -1984,8 +1910,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.20 (textblock)
@@ -2018,8 +1942,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.21
@@ -2064,8 +1986,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.swallow.progress";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.22
@@ -2130,9 +2050,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.swallow.progress"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.23
@@ -2165,8 +2082,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; target: "elm.divider1"; target: "elm.divider2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.30
@@ -2214,8 +2129,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.31
@@ -2323,8 +2236,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.35
@@ -2358,8 +2269,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 
@@ -2403,10 +2312,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1"; target: "elm.bubble"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
    }
 
 // 2.2.2.38 textblock
@@ -2453,10 +2358,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1"; target: "elm.bubble"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
    }
 
 // 2.2.2.39
@@ -2495,10 +2396,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
    }
 // 2.2.2.39 (TEXTBLOCK)
    group { GENLIST_NAME("4text.1icon.2.tb/default")
@@ -2536,10 +2433,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
    }
 
 // 2.2.2.40
@@ -2577,11 +2470,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.bubble"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
-
    }
 
 // 2.2.2.41
@@ -2631,9 +2519,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon.1";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.42
@@ -2669,9 +2554,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon.1";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 
@@ -2713,8 +2595,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.44
@@ -2760,10 +2640,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.bubble"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
-      GENLIST_PROGRAM_SOUND("elm.text.4")
    }
 
 // 2.2.2.45
@@ -2795,9 +2671,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
-      GENLIST_PROGRAM_SOUND("elm.text.3")
    }
 
 // 2.2.2.46
@@ -2830,8 +2703,6 @@
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.2.47
@@ -2892,7 +2763,6 @@
          target: "elm.divider1"; target:"elm.divider2";
          target: "center_line"; target:"center_line2";
       )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
    }
 
 // 2.2.4.2
@@ -2936,7 +2806,6 @@
          target: "elm.text";
          target: "elm.divider1"; target:"elm.divider2";
       )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.2.4.3
@@ -2973,8 +2842,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.2.4.4
@@ -3028,8 +2895,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.4.5
@@ -3066,8 +2931,6 @@
          GENLIST_PART_FOCUS
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 /************************************************************/
@@ -3164,7 +3027,6 @@
       */
       GENLIST_DIALOGUE_INHERIT_BODY(;)
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.4.1.2
@@ -3356,7 +3218,6 @@
          GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.4.1.10
@@ -3394,8 +3255,6 @@
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.1.10 (Textblock)
@@ -3433,8 +3292,6 @@
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.1.12
@@ -3452,8 +3309,6 @@
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.1.13
@@ -3766,6 +3621,7 @@
 
 #define GENLIST_PART_PASSWORD_RTB(NAME, BG_NAME, RIGHT, TOP, BOTTOM) \
    GENLIST_PART_IMAGE(BG_NAME, \
+      mouse_events: 0; \
       GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \
          GENLIST_PARAM_PASSWORD_IMAGE \
          fixed: 1 0; \
@@ -3780,6 +3636,7 @@
 
 #define GENLIST_PART_PASSWORD_LTB(NAME, BG_NAME, LEFT, TOP, BOTTOM) \
    GENLIST_PART_IMAGE(BG_NAME, \
+      mouse_events: 0; \
       GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \
          GENLIST_PARAM_PASSWORD_IMAGE \
          fixed: 1 0; \
@@ -3851,7 +3708,6 @@
       }
       programs {
          GENLIST_PROGRAM_DISABLED( target: "elm.text"; )
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -3955,8 +3811,6 @@
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1";
          target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.2.18
@@ -4012,8 +3866,6 @@
          GENLIST_PART_FOCUS_DIALOGUE
       }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
-      GENLIST_PROGRAM_SOUND("elm.text.1")
-      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.2.20
@@ -4110,7 +3962,6 @@
       }
       GENLIST_PROGRAM_DISABLED( target: "elm.text"; )
       GENLIST_PROGRAM_FOCUS
-      GENLIST_PROGRAM_SOUND("elm.text")
    }
 
 // 2.4.4.3
@@ -4716,9 +4567,6 @@
             action: STATE_SET "urgency_read" 0.0;
             target: "elm.text.subject";
          }
-         GENLIST_PROGRAM_SOUND("elm.text.subject")
-         GENLIST_PROGRAM_SOUND("elm.text.name")
-         GENLIST_PROGRAM_SOUND("elm.text.date")
       }
    }
 
@@ -4858,8 +4706,6 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_SOUND("msgcount")
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -5040,8 +4886,6 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_SOUND("elm.text.msgcount")
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -6036,8 +5880,6 @@
             target: "disclip";
          }
          GENLIST_PROGRAM_FLIP_2TEXT
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -6199,8 +6041,6 @@
             target: "disclip";
          }
          GENLIST_PROGRAM_FLIP_2TEXT_1ICON
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -6362,8 +6202,6 @@
             target: "disclip";
          }
          GENLIST_PROGRAM_FLIP_2TEXT_1ICON
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -6577,8 +6415,6 @@
             target: "disclip";
          }
          GENLIST_PROGRAM_FLIP_2TEXT_2ICON
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -6783,8 +6619,6 @@
             target: "disclip";
          }
          GENLIST_PROGRAM_FLIP_2TEXT_2ICON
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -6964,7 +6798,6 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_SOUND("elm.text")
       }
    }
 
@@ -7142,8 +6975,6 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_SOUND("elm.text.1")
-         GENLIST_PROGRAM_SOUND("elm.text.2")
       }
    }
 
@@ -13105,7 +12936,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; )
@@ -13166,7 +12997,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; )
@@ -13225,7 +13056,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; )
@@ -13282,7 +13113,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; )

diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc
index 83e7e65..be22df9 100644 (file)
--- a/themes/widgets/genlist/genlist_sweep.edc
+++ b/themes/widgets/genlist/genlist_sweep.edc
@@ -36,6 +36,7 @@
 
       parts {
          GENLIST_PART_IMAGE("bg_sweep",
+            mouse_events: 0;
             description { state: "default" 0.0;
                image {
                   normal: "00_quick_menu_bg.png";
@@ -56,6 +57,7 @@
                max: -1 GENLIST_BTN_01_HEIGHT; )
          )
          GENLIST_PART_RECT("overlay",
+            mouse_events: 0;
             description { state: "default" 0.0;
                color: 0 0 0 128;
             }