[EGIT] [misc/entrance] master 01/01: entrance: Themes can set the item style now per default!

[Marcel Hollerbach]

bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/misc/entrance.git/commit/?id=8806464b5788373a2f266597df8e0d9301409d91

commit 8806464b5788373a2f266597df8e0d9301409d91
Author: Marcel Hollerbach <marcel.hollerb...@stzedn.de>
Date:   Thu Mar 6 17:38:05 2014 +0100

    entrance: Themes can set the item style now per default!
    
    - Themes can set the style for entrance.users & entrance.actions via
      item_style_users and item_style_actions as data items !
---
 data/themes/default/default.edc |  3 +++
 src/bin/entrance_gui.c          | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index 5d9e7b0..c4ed959 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -133,6 +133,9 @@ collections {
    group {
       name : "entrance";
 
+      data.item: "item_style_users"  "default";
+      data.item: "item_style_actions" "default";
+
       images {
       }
 
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index ba1990e..c1055dd 100755
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -391,10 +391,15 @@ entrance_gui_users_set(Eina_List *users)
    Entrance_Screen *screen;
    Eina_List *l;
    Entrance_Fill *ef;
-   char *style = "double_label";
+   const char *style;
 
    screen = eina_list_data_get(_gui->screens);
-   style = edje_object_data_get(elm_layout_edje_get(screen->edj), 
"item_style"); 
+
+   style = edje_object_data_get(elm_layout_edje_get(screen->edj), 
"item_style_users");
+
+   if (!style)
+     style = "default"; //theme has not settet a style
+
    PT("Add users list, using item style: %s\n", style);
    ef = entrance_fill_new(style,
                           _entrance_gui_user_text_get,
@@ -755,11 +760,19 @@ _entrance_gui_actions_populate()
    Evas_Object *o;
    Eina_List *l;
    Entrance_Screen *screen;
+   const char *style;
+
+   screen = eina_list_data_get(_gui->screens);
+
+   style = edje_object_data_get(elm_layout_edje_get(screen->edj), 
"item_style_actions");
+
+   if (!style)
+     style = "default"; //theme has not settet a style
 
    EINA_LIST_FOREACH(_gui->screens, l, screen)
      {
         Entrance_Fill *ef;
-        ef = entrance_fill_new(NULL, _entrance_gui_action_text_get,
+        ef = entrance_fill_new(style, _entrance_gui_action_text_get,
                                NULL, NULL, NULL);
         o = ENTRANCE_GUI_GET(screen->edj, "entrance.actions");
         entrance_fill(o, ef, _gui->actions, NULL,

--