Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c _ew_list.h ew_edjelist.c ew_textlist.c
Log Message:
Moving to Etk_Tree2
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- _ew_list.c 27 Sep 2006 21:45:47 -0000 1.12
+++ _ew_list.c 16 Jan 2007 16:26:54 -0000 1.13
@@ -1,7 +1,7 @@
#include <Etk.h>
#include "Entrance_Widgets.h"
-static void _ew_list_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
+static void _ew_list_cb_row_clicked(Etk_Object *, Etk_Tree2_Row *,
Etk_Event_Mouse_Down *, void *);
Entrance_List
__ew_list_new(void)
@@ -25,13 +25,13 @@
return NULL;
}
- ew->owner = etk_tree_new();
+ ew->owner = etk_tree2_new();
etk_signal_connect("row_clicked", ETK_OBJECT(ew->owner),
ETK_CALLBACK(_ew_list_cb_row_clicked), NULL);
etk_widget_size_request_set(ew->owner, w, h);
- etk_tree_mode_set(ETK_TREE(ew->owner), ETK_TREE_MODE_LIST);
- etk_tree_multiple_select_set(ETK_TREE(ew->owner), ETK_FALSE);
- etk_tree_headers_visible_set(ETK_TREE(ew->owner), ETK_FALSE);
- etk_tree_row_height_set(ETK_TREE(ew->owner), r_h);
+ etk_tree2_mode_set(ETK_TREE2(ew->owner), ETK_TREE2_MODE_LIST);
+ etk_tree2_multiple_select_set(ETK_TREE2(ew->owner), ETK_FALSE);
+ etk_tree2_headers_visible_set(ETK_TREE2(ew->owner), ETK_FALSE);
+ etk_tree2_rows_height_set(ETK_TREE2(ew->owner), r_h);
ew->col = NULL;
@@ -42,7 +42,7 @@
Entrance_List
_ew_list_buildtree(Entrance_List ew)
{
- etk_tree_build(ETK_TREE(ew->owner));
+ etk_tree2_build(ETK_TREE2(ew->owner));
/*TODO:should trees have their own labels? being we're putting stuff
into a group with a label already.*/
/*Etk_Widget *hbox;
@@ -79,27 +79,27 @@
void
ew_list_first_row_select(Entrance_List el)
{
- Etk_Tree_Row *row = etk_tree_first_row_get(ETK_TREE(el->owner));
- etk_tree_row_select(row);
+ Etk_Tree2_Row *row = etk_tree2_first_row_get(ETK_TREE2(el->owner));
+ etk_tree2_row_select(row);
}
void*
ew_list_selected_data_get(Entrance_List el)
{
- Etk_Tree_Row *row = etk_tree_selected_row_get(ETK_TREE(el->owner));
+ Etk_Tree2_Row *row = etk_tree2_selected_row_get(ETK_TREE2(el->owner));
if(!row) {
return NULL;
}
- Entrance_List_Data ewld = etk_tree_row_data_get(row);
+ Entrance_List_Data ewld = etk_tree2_row_data_get(row);
return ewld->data;
}
/*privates*/
static void
-_ew_list_cb_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Down *event, void *data)
+_ew_list_cb_row_clicked(Etk_Object *object, Etk_Tree2_Row *row,
Etk_Event_Mouse_Down *event, void *data)
{
- Entrance_List_Data ewld = etk_tree_row_data_get(row);
+ Entrance_List_Data ewld = etk_tree2_row_data_get(row);
if(ewld->func)
ewld->func(ewld->funcdata);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- _ew_list.h 27 Sep 2006 21:45:47 -0000 1.6
+++ _ew_list.h 16 Jan 2007 16:26:54 -0000 1.7
@@ -11,7 +11,7 @@
typedef struct _Entrance_List {
Etk_Widget *owner;
Etk_Widget *box;
- Etk_Tree_Col *col;
+ Etk_Tree2_Col *col;
} *Entrance_List;
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_edjelist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ew_edjelist.c 6 Nov 2006 09:56:19 -0000 1.8
+++ ew_edjelist.c 16 Jan 2007 16:26:54 -0000 1.9
@@ -4,7 +4,7 @@
#include "_ew_list.h"
-static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
+static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree2_Row *,
Etk_Event_Mouse_Down *, void *);
Entrance_List
ew_edjelist_new(const char *title, int w, int h, int r_h, int c_w)
@@ -14,7 +14,9 @@
return NULL;
}
- ew->col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_icon_text_new(ETK_TREE(ew->owner), ETK_TREE_FROM_EDJE), c_w);
+ ew->col = etk_tree2_col_new(ETK_TREE2(ew->owner), NULL, c_w, 0.0);
+ etk_tree2_col_model_add(ew->col, etk_tree2_model_image_new());
+ etk_tree2_col_model_add(ew->col, etk_tree2_model_text_new());
return _ew_list_buildtree(ew);
}
@@ -22,10 +24,10 @@
void
ew_edjelist_add(Entrance_List ew, const char *label, const char *edje, const
char *group, void *data, size_t size, void (*func) (void*), void* funcdata)
{
- Etk_Tree_Row *row;
- etk_tree_freeze(ETK_TREE(ew->owner));
+ Etk_Tree2_Row *row;
+ etk_tree2_freeze(ETK_TREE2(ew->owner));
- row = etk_tree_append(ETK_TREE(ew->owner),
etk_tree_nth_col_get(ETK_TREE(ew->owner), 0), edje, group, label, NULL);
+ row = etk_tree2_row_append(ETK_TREE2(ew->owner), NULL,
etk_tree2_nth_col_get(ETK_TREE2(ew->owner), 0), edje, group, label, NULL);
Entrance_List_Data ewld = ew_listdata_new();
if(ewld)
@@ -38,7 +40,7 @@
ewld->funcdata = funcdata;
}
- etk_tree_row_data_set(row, ewld);
+ etk_tree2_row_data_set(row, ewld);
- etk_tree_thaw(ETK_TREE(ew->owner));
+ etk_tree2_thaw(ETK_TREE2(ew->owner));
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_textlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ew_textlist.c 6 Nov 2006 09:56:19 -0000 1.8
+++ ew_textlist.c 16 Jan 2007 16:26:54 -0000 1.9
@@ -4,7 +4,7 @@
#include "_ew_list.h"
-static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
+static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree2_Row *,
Etk_Event_Mouse_Down *, void *);
Entrance_List
ew_textlist_new(const char *title, int w, int h, int r_h, int c_w)
@@ -14,7 +14,8 @@
return NULL;
}
- ew->col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_text_new(ETK_TREE(ew->owner)), c_w);
+ ew->col = etk_tree2_col_new(ETK_TREE2(ew->owner), NULL, c_w, 0.0);
+ etk_tree2_col_model_add(ew->col, etk_tree2_model_text_new());
return _ew_list_buildtree(ew);
}
@@ -23,12 +24,12 @@
ew_textlist_add(Entrance_List ew, const char *label, void *data, size_t size,
void (*func) (void*), void* funcdata)
{
- Etk_Tree_Row *row;
+ Etk_Tree2_Row *row;
- etk_tree_freeze(ETK_TREE(ew->owner));
+ etk_tree2_freeze(ETK_TREE2(ew->owner));
- row = etk_tree_append(ETK_TREE(ew->owner),
etk_tree_nth_col_get(ETK_TREE(ew->owner), 0),
- label, NULL);
+ row = etk_tree2_row_append(ETK_TREE2(ew->owner), NULL,
etk_tree2_nth_col_get(ETK_TREE2(ew->owner), 0),
+ label, NULL);
Entrance_List_Data ewld = ew_listdata_new();
if(ewld)
@@ -43,7 +44,7 @@
ewld->funcdata = funcdata;
}
- etk_tree_row_data_set(row, ewld);
+ etk_tree2_row_data_set(row, ewld);
- etk_tree_thaw(ETK_TREE(ew->owner));
+ etk_tree2_thaw(ETK_TREE2(ew->owner));
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
