elm genlist/gengrid: Changed 'labels' to 'texts' in edc.

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

diff --git a/data/themes/widgets/gengrid.edc b/data/themes/widgets/gengrid.edc
index adf40fa..44b02f6 100644 (file)
--- a/data/themes/widgets/gengrid.edc
+++ b/data/themes/widgets/gengrid.edc
@@ -1,5 +1,5 @@
 group { name: "elm/gengrid/item/default/default";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -313,7 +313,7 @@ group { name: "elm/gengrid/item/default_style/default";
          tag:  "tab" "\t";
       }
    }
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -573,7 +573,7 @@ group { name: "elm/gengrid/item/default_style/default";
 }
 
 group { name: "elm/gengrid/item/up/default";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    images {
       image: "bt_sm_base1.png" COMP;
       image: "bt_sm_shine.png" COMP;
@@ -741,7 +741,7 @@ group { name: "elm/gengrid/item/up/default";
 }
 
 group { name: "elm/gengrid/item/album-preview/default";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    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 {
@@ -1030,7 +1030,7 @@ group { name: "elm/gengrid/item/album-preview/default";
 group { name: "elm/gengrid/item/thumb/default";
    data {
       item: "contents" "elm.swallow.icon";
-      item: "labels" "elm.text";
+      item: "texts" "elm.text";
    }
    images {
       image: "bt_sm_base1.png" COMP;
@@ -1201,7 +1201,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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    //      data.item: "states" "";
    images {

diff --git a/data/themes/widgets/genlist.edc b/data/themes/widgets/genlist.edc
index 600af61..2be6b25 100644 (file)
--- a/data/themes/widgets/genlist.edc
+++ b/data/themes/widgets/genlist.edc
@@ -1,6 +1,6 @@
 group { name: "elm/genlist/item/default/default";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -368,7 +368,7 @@ group { name: "elm/genlist/item/default/default";
 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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -642,7 +642,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: "texts" "elm.title.1 elm.title.2 elm.text";
    //      data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -982,7 +982,7 @@ group { name: "elm/genlist/item_compress/message/default";
 
 group { name: "elm/genlist/item_compress/default/default";
    inherit: "elm/genlist/item/default/default";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    parts {
       part { name: "elm.text";
          description { state: "default" 0.0;
@@ -996,7 +996,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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -1425,7 +1425,7 @@ group { name: "elm/genlist/tree/default/default";
 group { name: "elm/genlist/tree_compress/default/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -1832,7 +1832,7 @@ group { name: "elm/genlist/item/default_style/default";
    }
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
@@ -2104,7 +2104,7 @@ group { name: "elm/genlist/item/default_style/default";
 group { name: "elm/genlist/item_odd/default_style/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
@@ -2351,7 +2351,7 @@ group { name: "elm/genlist/item_odd/default_style/default";
 group { name: "elm/genlist/tree/default_style/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
@@ -2670,7 +2670,7 @@ group { name: "elm/genlist/tree/default_style/default";
 group { name: "elm/genlist/tree_odd/default_style/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text";
+   data.item: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    images {
@@ -2966,7 +2966,7 @@ group { name: "elm/genlist/tree_odd/default_style/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -3278,7 +3278,7 @@ group { name: "elm/genlist/item/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -3590,7 +3590,7 @@ group { name: "elm/genlist/item_compress/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -3876,7 +3876,7 @@ group { name: "elm/genlist/item_odd/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -4163,7 +4163,7 @@ group { name: "elm/genlist/item_compress_odd/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -4521,7 +4521,7 @@ group { name: "elm/genlist/tree/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -4879,7 +4879,7 @@ group { name: "elm/genlist/tree_compress/double_label/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -5213,7 +5213,7 @@ group { name: "elm/genlist/tree_odd/double_label/default";
 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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -5469,7 +5469,7 @@ group { name: "elm/genlist/item/icon_top_text_bottom/default";
 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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -5700,7 +5700,7 @@ group { name: "elm/genlist/item_odd/icon_top_text_bottom/default";
 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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -6001,7 +6001,7 @@ group { name: "elm/genlist/tree/icon_top_text_bottom/default";
 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: "texts" "elm.text";
    data.item: "contents" "elm.swallow.icon";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -6280,7 +6280,7 @@ group { name: "elm/genlist/tree_odd/icon_top_text_bottom/default";
 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: "texts" "elm.text elm.text.sub";
    data.item: "contents" "elm.swallow.icon elm.swallow.end";
    data.item: "treesize" "20";
    //      data.item: "states" "";
@@ -6614,7 +6614,7 @@ group { name: "elm/genlist/tree_compress_odd/double_label/default";
 group { name: "elm/genlist/item_compress/media/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text.title elm.text.album-artist";
+   data.item: "texts" "elm.text.title elm.text.album-artist";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -6878,7 +6878,7 @@ group { name: "elm/genlist/item_compress/media/default";
 group { name: "elm/genlist/item_compress_odd/media/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text.title elm.text.album-artist";
+   data.item: "texts" "elm.text.title elm.text.album-artist";
    data.item: "treesize" "20";
    images {
       image: "bt_sm_base1.png" COMP;
@@ -7117,7 +7117,7 @@ group { name: "elm/genlist/item_compress_odd/media/default";
 group { name: "elm/genlist/item_compress/media-album/default";
    data.item: "stacking" "above";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text.title elm.text.trackno elm.text.length";
+   data.item: "texts" "elm.text.title elm.text.trackno elm.text.length";
    data.item: "states" "elm.state.trackno";
    data.item: "treesize" "20";
    images {
@@ -7495,7 +7495,7 @@ group { name: "elm/genlist/item_compress/media-album/default";
 group { name: "elm/genlist/item_compress_odd/media-album/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text.title elm.text.trackno elm.text.length";
+   data.item: "texts" "elm.text.title elm.text.trackno elm.text.length";
    data.item: "states" "elm.state.trackno";
    data.item: "treesize" "20";
    images {
@@ -7848,7 +7848,7 @@ group { name: "elm/genlist/item_compress_odd/media-album/default";
 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: "texts" "elm.text.title elm.text.artist";
    data.item: "contents" "elm.swallow.preview";
    data.item: "treesize" "20";
    images {
@@ -8135,7 +8135,7 @@ group { name: "elm/genlist/item_compress/media-preview/default";
 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: "texts" "elm.text.title elm.text.artist";
    data.item: "contents" "elm.swallow.preview";
    data.item: "treesize" "20";
    images {
@@ -8396,7 +8396,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: "texts" "elm.text.mode";
    data.item: "contents" "elm.swallow.mode";
    data.item: "mode_part" "elm.swallow.origin";
    data.item: "treesize" "20";
@@ -8795,7 +8795,7 @@ group { name: "elm/genlist/item/mode/default";
 group { name: "elm/genlist/item_odd/mode/default";
    data.item: "stacking" "below";
    data.item: "selectraise" "on";
-   data.item: "labels" "elm.text.mode";
+   data.item: "texts" "elm.text.mode";
    data.item: "contents" "elm.swallow.mode";
    data.item: "mode_part" "elm.swallow.origin";
    data.item: "treesize" "20";

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 2b35fb9..370dc3a 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -935,10 +935,10 @@ _item_realize(Elm_Gen_Item *it)
         const Eina_List *l;
         const char *key;
 
-        it->labels =
+        it->texts =
            elm_widget_stringlist_get(edje_object_data_get(VIEW(it),
-                                                          "labels"));
-        EINA_LIST_FOREACH(it->labels, l, key)
+                                                          "texts"));
+        EINA_LIST_FOREACH(it->texts, l, key)
           {
              char *s = it->itc->func.text_get
                 ((void *)it->base.data, WIDGET(it), key);

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 78514e2..bb8891e 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -32,7 +32,7 @@ struct Elm_Gen_Item_Type
    Evas_Coord                    w, h, minw, minh;
    Elm_Gen_Item                 *group_item;
    Elm_Genlist_Item_Flags        flags;
-   Eina_List                    *mode_labels, *mode_contents, *mode_states, *mode_content_objs;
+   Eina_List                    *mode_texts, *mode_contents, *mode_states, *mode_content_objs;
    Ecore_Timer                  *swipe_timer;
    Evas_Coord                    scrl_x, scrl_y, old_scrl_y;
 
@@ -1621,7 +1621,7 @@ _item_label_realize(Elm_Gen_Item *it,
         const Eina_List *l;
         const char *key;
 
-        *source = elm_widget_stringlist_get(edje_object_data_get(target, "labels"));
+        *source = elm_widget_stringlist_get(edje_object_data_get(target, "texts"));
         EINA_LIST_FOREACH(*source, l, key)
           {
              if (parts && fnmatch(parts, key, FNM_PERIOD))
@@ -1887,7 +1887,7 @@ _item_realize(Elm_Gen_Item *it,
            will clean our mess */
         assert(eina_list_count(it->content_objs) == 0);
 
-        _item_label_realize(it, VIEW(it), &it->labels, NULL);
+        _item_label_realize(it, VIEW(it), &it->texts, NULL);
         it->content_objs = _item_content_realize(it, VIEW(it), &it->contents, NULL);
         _item_state_realize(it, VIEW(it), &it->states, NULL);
 
@@ -2861,7 +2861,7 @@ _mode_item_realize(Elm_Gen_Item *it)
       will clean our mess */
    assert(eina_list_count(it->item->mode_content_objs) == 0);
 
-   _item_label_realize(it, it->item->mode_view, &it->item->mode_labels, NULL);
+   _item_label_realize(it, it->item->mode_view, &it->item->mode_texts, NULL);
    it->item->mode_content_objs =
      _item_content_realize(it, it->item->mode_view,
                            &it->item->mode_contents, NULL);
@@ -2884,8 +2884,8 @@ _mode_item_unrealize(Elm_Gen_Item *it)
    if (!it->item->mode_view) return;
 
    evas_event_freeze(evas_object_evas_get(it->wd->obj));
-   elm_widget_stringlist_free(it->item->mode_labels);
-   it->item->mode_labels = NULL;
+   elm_widget_stringlist_free(it->item->mode_texts);
+   it->item->mode_texts = NULL;
    elm_widget_stringlist_free(it->item->mode_contents);
    it->item->mode_contents = NULL;
    elm_widget_stringlist_free(it->item->mode_states);
@@ -4499,7 +4499,7 @@ elm_genlist_item_fields_update(Elm_Genlist_Item *it,
    if (it->generation < it->wd->generation) return;
 
    if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_LABEL))
-     _item_label_realize(it, it->base.view, &it->labels, parts);
+     _item_label_realize(it, it->base.view, &it->texts, parts);
    if ((!itf) || (itf & ELM_GENLIST_ITEM_FIELD_CONTENT))
      {
         it->content_objs = _item_content_unrealize(it, it->base.view,
@@ -5177,8 +5177,8 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
         it->long_timer = NULL;
      }
 
-   elm_widget_stringlist_free(it->labels);
-   it->labels = NULL;
+   elm_widget_stringlist_free(it->texts);
+   it->texts = NULL;
    elm_widget_stringlist_free(it->contents);
    it->contents = NULL;
    elm_widget_stringlist_free(it->states);

diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index 4499eaa..677ff9a 100644 (file)
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -33,7 +33,7 @@ struct Elm_Gen_Item
    Evas_Coord                    x, y, dx, dy;
    Evas_Object                  *spacer;
    Elm_Gen_Item                 *parent;
-   Eina_List                    *labels, *contents, *states, *content_objs;
+   Eina_List                    *texts, *contents, *states, *content_objs;
    Ecore_Timer                  *long_timer;
    int                           relcount;
    int                           walking;