[Genlist] Fix for entry

Remove sounds and unneeded programs.

Change-Id: If7a9655275a5beff4e12b0a07ab5ed6041066766

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 5b34d3f..88654d1 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -2230,7 +2230,68 @@
       TARGET \
    }
 
-#define GENLIST_PROGRAMS_ENTRY \
+#define GENLIST_PROGRAMS_ENTRY( TARGET ) \
+   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 ) \
+   GENLIST_PROGRAM_FOCUS \
+   GENLIST_PROGRAM_DECORATE_REORDER("editfield", TARGET \
+      target: "bg_clip"; \
+      target: "bg_reorder_clip"; \
+      target: "bottom_line_clip"; \
+      target: "elm.padding.left"; \
+      target: "elm.padding.right"; \
+   ) \
+   program { \
+      signal: "elm,state,eraser,show"; \
+      action: STATE_SET "show" 0.0; \
+      target: "elm.icon.eraser"; \
+   } \
+   program { \
+      signal: "elm,state,eraser,hide"; \
+      action: STATE_SET "default" 0.0; \
+      target: "elm.icon.eraser"; \
+   } \
+    program { \
+      signal: "elm,state,rename,show"; \
+      action: STATE_SET "default" 0.0; \
+      target: "elm.image.rename"; \
+   } \
+   program { \
+      signal: "elm,state,rename,hide"; \
+      action: STATE_SET "hide" 0.0; \
+      target: "elm.image.rename"; \
+   }
+
+#define GENLIST_PROGRAMS_DIALOGUE_ENTRY( TARGET ) \
+   GENLIST_PROGRAM_DEFAULT( TARGET \
+      target: "bg_dialogue"; \
+      target: "bg_dialogue_clip"; \
+      target: "elm.padding.left"; \
+      target: "elm.padding.right"; \
+   ) \
+   GENLIST_PROGRAM_DISABLED( TARGET ) \
+   GENLIST_PROGRAM_FOCUS_DIALOGUE \
+   program { name: "bg_color_change"; \
+      signal: "bg_color_change"; \
+      source: "elm"; \
+      action: STATE_SET "2depth" 0.0; \
+      target: "bg_dialogue_clip"; \
+   } \
+   GENLIST_PROGRAM_DECORATE_REORDER( "normal", TARGET \
+      target: "elm.padding.left"; \
+      target: "elm.padding.right"; \
+   ) \
+   GENLIST_PROGRAM_FLIP \
+   GENLIST_PROGRAM_EDITMODE \
    program { \
       signal: "elm,state,eraser,show"; \
       action: STATE_SET "show" 0.0; \
@@ -2252,6 +2313,7 @@
       target: "elm.image.rename"; \
    }
 
+
 #define GENLIST_PROGRAMS_THUMB \
    GENLIST_PROGRAM_DECORATE_REORDER( "thumb", target: "elm.thumb"; ) \
    GENLIST_PROGRAM_FLIP_TARGET( target: "elm.thumb.clip"; ) \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 3f605e9..8e6860b 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -121,8 +121,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.image.rename"; )
-      GENLIST_PROGRAMS_ENTRY
+      GENLIST_PROGRAMS_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; )
    }
 
 // 2.2.6.1 (without genlist background)
@@ -198,8 +197,7 @@
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; )
-      GENLIST_PROGRAMS_ENTRY
+      GENLIST_PROGRAMS_ENTRY( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; )
    }
 
 // 2.2.6.2 (without genlist background)
@@ -3090,7 +3088,7 @@
       data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
    }
 
 // 2.2.6.2 (Dialogue)
@@ -3101,7 +3099,7 @@
       data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
    }
 
 // Dialogue Group Separators