genlist: Remove all of elm.image.rename, elm.icon.eraser parts, programs. These parts...

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 88654d1..4e573d5 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -2249,27 +2249,7 @@
       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 \
@@ -2291,27 +2271,7 @@
       target: "elm.padding.right"; \
    ) \
    GENLIST_PROGRAM_FLIP \
-   GENLIST_PROGRAM_EDITMODE \
-   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"; \
-   }
+   GENLIST_PROGRAM_EDITMODE
 
 
 #define GENLIST_PROGRAMS_THUMB \

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 8e6860b..50358b0 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -68,11 +68,8 @@
       alias: "elm/layout/item/editfield/default";
 
       GENLIST_PROLOG_NORMAL
-      images {
-         image: "00_edit_field_rename.png" COMP;
-      }
 
-      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+      data.item: "contents" "elm.icon.entry";
 
       parts {
          GENLIST_PART_BASE
@@ -85,43 +82,15 @@
 
          GENLIST_PART_ICON("elm.icon.entry",
             GENLIST_DESCRIPTION(
-               "elm.padding.left", "elm.icon.eraser",
+               "elm.padding.left", "elm.padding.right",
                "elm.padding.top", "elm.padding.bottom",
                min: 0 48; // This is tuned value for exact entry size.
             )
          )
-         GENLIST_PART_IMAGE("elm.image.rename",
-            mouse_events: 0;
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
-               fixed: 1 0;
-               visible: 1;
-               image.normal: "00_edit_field_rename.png";
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
-            )
-            description { state: "hide" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
-               "elm.padding.top", "elm.padding.bottom",
-               fixed: 1 0;
-               visible: 0;
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-            )
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         )
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; )
+      GENLIST_PROGRAMS_ENTRY( target: "elm.icon.entry"; )
    }
 
 // 2.2.6.1 (without genlist background)
@@ -142,10 +111,7 @@
       alias: "elm/layout/editfield/title/default";
 
       GENLIST_PROLOG_NORMAL
-      images {
-         image: "00_edit_field_rename.png" COMP;
-      }
-      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+      data.item: "contents" "elm.icon.entry";
       data.item: "texts" "elm.text";
       parts {
          GENLIST_PART_BASE
@@ -161,43 +127,15 @@
          )
          GENLIST_PART_ICON("elm.icon.entry",
             GENLIST_DESCRIPTION(
-               "elm.padding.left", "elm.icon.eraser",
+               "elm.padding.left", "elm.padding.right",
                "elm.text", "elm.padding.bottom",
                min: 0 48; // This is tuned value for exact entry size.
             )
          )
-         GENLIST_PART_IMAGE("elm.image.rename",
-            mouse_events: 0;
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
-               visible: 1;
-               fixed: 1 0;
-               image.normal: "00_edit_field_rename.png";
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
-            )
-            description { state: "hide" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
-               "elm.text", "elm.padding.bottom",
-               fixed: 1 0;
-               visible: 0;
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-            )
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         )
          GENLIST_PART_FLIP
          GENLIST_PART_FOCUS
       }
-      GENLIST_PROGRAMS_ENTRY( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; )
+      GENLIST_PROGRAMS_ENTRY( target: "elm.text"; target: "elm.icon.entry"; )
    }
 
 // 2.2.6.2 (without genlist background)
@@ -3085,10 +3023,10 @@
       alias: "elm/layout/dialogue/editfield/default";
       inherit: "elm/genlist/item/editfield/default";
 
-      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";)
    }
 
 // 2.2.6.2 (Dialogue)
@@ -3096,10 +3034,10 @@
       alias: "elm/layout/dialogue/editfield/title/default";
       inherit: "elm/genlist/item/editfield/title/default";
 
-      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";)
    }
 
 // Dialogue Group Separators