elm genlist/gengrid: Applied genlist/gengrid icons -> contents changes

to themes. Changed detour-elm and darkness theme as well.
Tips) Change genlist/gengrid's "icons" to "contents" in edc.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64345 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/data/themes/widgets/gengrid.edc b/data/themes/widgets/gengrid.edc
index 04d6218..adf40fa 100644 (file)
--- a/data/themes/widgets/gengrid.edc
+++ b/data/themes/widgets/gengrid.edc
@@ -1,6 +1,6 @@
 group { name: "elm/gengrid/item/default/default";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    images {
       image: "bt_sm_base1.png" COMP;
       image: "bt_sm_shine.png" COMP;
@@ -314,7 +314,7 @@ group { name: "elm/gengrid/item/default_style/default";
       }
    }
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    images {
       image: "bt_sm_base1.png" COMP;
       image: "bt_sm_shine.png" COMP;
@@ -742,7 +742,7 @@ group { name: "elm/gengrid/item/up/default";
 
 group { name: "elm/gengrid/item/album-preview/default";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4";
+   data.item: "contents" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4";
    data.item: "states" "have_files";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -1029,7 +1029,7 @@ group { name: "elm/gengrid/item/album-preview/default";
 
 group { name: "elm/gengrid/item/thumb/default";
    data {
-      item: "icons" "elm.swallow.icon";
+      item: "contents" "elm.swallow.icon";
       item: "labels" "elm.text";
    }
    images {
@@ -1202,7 +1202,7 @@ group { name: "elm/gengrid/item/thumb/default";
 group { name: "elm/gengrid/item/group_index/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    //      data.item: "states" "";
    images {
       image: "bt_sm_base1.png" COMP;

diff --git a/data/themes/widgets/genlist.edc b/data/themes/widgets/genlist.edc
index 4ed04a4..11b2d3f 100644 (file)
--- a/data/themes/widgets/genlist.edc
+++ b/data/themes/widgets/genlist.edc
@@ -1,7 +1,7 @@
 group { name: "elm/genlist/item/default/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -369,7 +369,7 @@ group { name: "elm/genlist/item/group_index/default";
    alias: "elm/genlist/item_compress/group_index/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -643,7 +643,7 @@ group { name: "elm/genlist/item/group_index/default";
 group { name: "elm/genlist/item_compress/message/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.title.1 elm.title.2 elm.text";
-   //      data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   //      data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -997,7 +997,7 @@ group { name: "elm/genlist/item_compress/default/default";
 group { name: "elm/genlist/tree/default/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -1426,7 +1426,7 @@ group { name: "elm/genlist/tree_compress/default/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -1833,7 +1833,7 @@ group { name: "elm/genlist/item/default_style/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -2105,7 +2105,7 @@ group { name: "elm/genlist/item_odd/default_style/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -2352,7 +2352,7 @@ group { name: "elm/genlist/tree/default_style/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -2671,7 +2671,7 @@ group { name: "elm/genlist/tree_odd/default_style/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -2967,7 +2967,7 @@ group { name: "elm/genlist/item/double_label/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -3279,7 +3279,7 @@ group { name: "elm/genlist/item_compress/double_label/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -3591,7 +3591,7 @@ group { name: "elm/genlist/item_odd/double_label/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -3877,7 +3877,7 @@ group { name: "elm/genlist/item_compress_odd/double_label/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -4164,7 +4164,7 @@ group { name: "elm/genlist/tree/double_label/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -4522,7 +4522,7 @@ group { name: "elm/genlist/tree_compress/double_label/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -4880,7 +4880,7 @@ group { name: "elm/genlist/tree_odd/double_label/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -5214,7 +5214,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon";
+   data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -5470,7 +5470,7 @@ group { name: "elm/genlist/item_odd/icon_top_text_bottom/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon";
+   data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -5701,7 +5701,7 @@ group { name: "elm/genlist/tree/icon_top_text_bottom/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon";
+   data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -6002,7 +6002,7 @@ group { name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text";
-   data.item: "icons" "elm.swallow.icon";
+   data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -6281,7 +6281,7 @@ group { name: "elm/genlist/tree_compress_odd/double_label/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text elm.text.sub";
-   data.item: "icons" "elm.swallow.icon elm.swallow.end";
+   data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
    images {
@@ -7849,7 +7849,7 @@ group { name: "elm/genlist/item_compress/media-preview/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text.title elm.text.artist";
-   data.item: "icons" "elm.swallow.preview";
+   data.item: "contents" "elm.swallow.preview";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -8136,7 +8136,7 @@ group { name: "elm/genlist/item_compress_odd/media-preview/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text.title elm.text.artist";
-   data.item: "icons" "elm.swallow.preview";
+   data.item: "contents" "elm.swallow.preview";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -8397,7 +8397,7 @@ group { name: "elm/genlist/item_compress_odd/media-preview/default";
 group { name: "elm/genlist/item/mode/default";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text.mode";
-   data.item: "icons" "elm.swallow.mode";
+   data.item: "contents" "elm.swallow.mode";
    data.item: "mode_part" "elm.swallow.origin";
    data.item: "treesize" "20";
    images {
@@ -8796,7 +8796,7 @@ group { name: "elm/genlist/item_odd/mode/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
    data.item: "labels" "elm.text.mode";
-   data.item: "icons" "elm.swallow.mode";
+   data.item: "contents" "elm.swallow.mode";
    data.item: "mode_part" "elm.swallow.origin";
    data.item: "treesize" "20";
    images {

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 007bee1..8ac7c1d 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -965,7 +965,7 @@ _item_realize(Elm_Gen_Item *it)
 
         it->contents =
            elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
-                                                          "icons"));
+                                                          "contents"));
         EINA_LIST_FOREACH(it->contents, l, key)
           {
              if (it->itc->func.content_get)

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 2d9959f..ad13d92 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1702,7 +1702,7 @@ _item_content_realize(Elm_Gen_Item *it,
         const char *key;
         Evas_Object *ic = NULL;
 
-        *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
+        *source = elm_widget_stringlist_get(edje_object_data_get(target, "contents"));
         EINA_LIST_FOREACH(*source, l, key)
           {
              if (it->itc->func.content_get)