Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/edje_viewer/src/bin
Modified Files:
edje_etk.c edje_etk.h etk_gui.c etk_gui.h
Log Message:
Moving to Etk_Tree2.
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_etk.c 8 Jul 2006 23:32:00 -0000 1.8
+++ edje_etk.c 16 Jan 2007 16:10:52 -0000 1.9
@@ -117,23 +117,23 @@
}
}
-void list_entries(const char *file, Etk_Tree *tree, Etk_Tree *output,
+void list_entries(const char *file, Etk_Tree2 *tree, Etk_Tree2 *output,
Etk_Canvas *canvas)
{
Evas_List *entries;
Evas_List *collections = NULL;
- Etk_Tree_Col *col1;
- Etk_Tree_Row *row;
+ Etk_Tree2_Col *col1;
+ Etk_Tree2_Row *row;
Etk_Bool sort_parts;
entries = edje_file_collection_list(file);
- col1 = etk_tree_nth_col_get(tree, 0);
+ col1 = etk_tree2_nth_col_get(tree, 0);
if (entries)
{
Evas_List *l;
- etk_tree_clear(tree);
+ etk_tree2_clear(tree);
for (l = entries; l; l = l->next)
{
@@ -147,20 +147,20 @@
co->file = strdup(file);
co->part = strdup(name);
- row = etk_tree_append(tree, col1, name, NULL);
+ row = etk_tree2_row_append(tree, NULL, col1, name, NULL);
de = edje_part_create(output, canvas, file, name);
- etk_tree_row_data_set(row, de);
+ etk_tree2_row_data_set(row, de);
}
edje_file_collection_list_free(entries);
edje_viewer_config_recent_set(file);
edje_viewer_config_last_set(file);
sort_parts = edje_viewer_config_sort_parts_get();
if (sort_parts)
- etk_tree_sort(tree, gui_part_col_sort_cb, ETK_TRUE, col1, NULL);
+ etk_tree2_col_sort_set(col1, gui_part_col_sort_cb, NULL);
}
}
-Demo_Edje *edje_part_create(Etk_Tree *output, Etk_Canvas *canvas,
+Demo_Edje *edje_part_create(Etk_Tree2 *output, Etk_Canvas *canvas,
const char *file, char *name)
{
Evas_Object *o;
@@ -570,45 +570,45 @@
static void signal_cb
(void *data, Evas_Object *o, const char *sig, const char *src)
{
- Etk_Tree *output;
- Etk_Tree_Col *col;
- Etk_Tree_Row *row;
+ Etk_Tree2 *output;
+ Etk_Tree2_Col *col;
+ Etk_Tree2_Row *row;
int count;
char *str;
if (!(output = data)) return;
- col = etk_tree_nth_col_get(output, 0);
- count = evas_list_count(output->rows_widgets);
+ col = etk_tree2_nth_col_get(output, 0);
+ count = output->total_rows;
if (count > 5000)
{
- row = etk_tree_first_row_get(output);
- etk_tree_row_del(row);
+ row = etk_tree2_first_row_get(output);
+ etk_tree2_row_delete(row);
}
str = calloc(1024, sizeof(char));
snprintf(str, 1024, "CALLBACK for \"%s\" \"%s\"", sig, src);
- row = etk_tree_append(output, col, str, NULL);
- etk_tree_row_scroll_to(row, ETK_TRUE);
- etk_tree_row_select(row);
+ row = etk_tree2_row_append(output, NULL, col, str, NULL);
+ etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree2_row_select(row);
if (!strcmp(sig, "drag"))
{
double x, y;
- count = evas_list_count(output->rows_widgets);
+ count = output->total_rows;
if (count > 5000)
{
- row = etk_tree_first_row_get(output);
- etk_tree_row_del(row);
+ row = etk_tree2_first_row_get(output);
+ etk_tree2_row_delete(row);
}
edje_object_part_drag_value_get(o, src, &x, &y);
snprintf(str, 1024, "Drag %3.3f %3.3f", x, y);
- etk_tree_append(output, col, str, NULL);
- etk_tree_row_scroll_to(row, ETK_TRUE);
- etk_tree_row_select(row);
+ etk_tree2_row_append(output, NULL, col, str, NULL);
+ etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree2_row_select(row);
}
FREE(str);
@@ -618,44 +618,44 @@
static void message_cb
(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg)
{
- Etk_Tree *output;
- Etk_Tree_Col *col;
- Etk_Tree_Row *row;
+ Etk_Tree2 *output;
+ Etk_Tree2_Col *col;
+ Etk_Tree2_Row *row;
int count;
char *str;
if (!(output = data)) return;
- col = etk_tree_nth_col_get(output, 0);
- count = evas_list_count(output->rows_widgets);
+ col = etk_tree2_nth_col_get(output, 0);
+ count = output->total_rows;
if (count > 5000)
{
- row = etk_tree_first_row_get(output);
- etk_tree_row_del(row);
+ row = etk_tree2_first_row_get(output);
+ etk_tree2_row_delete(row);
}
str = calloc(1024, sizeof(char));
snprintf(str, 1024, "MESSAGE for %p from script type %i id %i", obj, type,
id);
- row = etk_tree_append(output, col, str, NULL);
- etk_tree_row_scroll_to(row, ETK_TRUE);
- etk_tree_row_select(row);
+ row = etk_tree2_row_append(output, NULL, col, str, NULL);
+ etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree2_row_select(row);
if (type == EDJE_MESSAGE_STRING)
{
Edje_Message_String *emsg;
- count = evas_list_count(output->rows_widgets);
+ count = output->total_rows;
if (count > 5000)
{
- row = etk_tree_first_row_get(output);
- etk_tree_row_del(row);
+ row = etk_tree2_first_row_get(output);
+ etk_tree2_row_delete(row);
}
emsg = (Edje_Message_String *)msg;
snprintf(str, 1024, "STWING: \"%s\"\n", emsg->str);
- row = etk_tree_append(output, col, str, NULL);
- etk_tree_row_scroll_to(row, ETK_TRUE);
- etk_tree_row_select(row);
+ row = etk_tree2_row_append(output, NULL, col, str, NULL);
+ etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree2_row_select(row);
}
edje_object_message_send(obj, EDJE_MESSAGE_NONE, 12345, NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_etk.h 8 Jul 2006 23:32:00 -0000 1.5
+++ edje_etk.h 16 Jan 2007 16:10:52 -0000 1.6
@@ -38,9 +38,9 @@
void bg_setup(Etk_Canvas *canvas);
void canvas_resize_cb(Etk_Object *canvas, const char *property_name,
void *data);
-void list_entries(const char *file, Etk_Tree *tree, Etk_Tree *output,
+void list_entries(const char *file, Etk_Tree2 *tree, Etk_Tree2 *output,
Etk_Canvas *canvas);
-Demo_Edje *edje_part_create(Etk_Tree *output, Etk_Canvas *canvas,
+Demo_Edje *edje_part_create(Etk_Tree2 *output, Etk_Canvas *canvas,
const char *file, char *name);
void edje_part_show(Etk_Widget *canvas, Demo_Edje *de);
void edje_part_hide(Demo_Edje *de);
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_gui.c 19 Nov 2006 18:25:23 -0000 1.13
+++ etk_gui.c 16 Jan 2007 16:10:52 -0000 1.14
@@ -19,7 +19,7 @@
static void _gui_fm_cancel_clicked_cb(Etk_Object *obj, void *data);
static Etk_Bool _gui_main_window_deleted_cb(void *data);
static void _gui_open_edje_file_cb(Gui *gui);
-static void _gui_tree_checkbox_toggled_cb(Etk_Object *obj, Etk_Tree_Row *row,
+static void _gui_tree_checkbox_toggled_cb(Etk_Object *obj, Etk_Tree2_Row *row,
void *data);
static void _gui_send_clicked_cb(Etk_Object *obj, void *data);
@@ -33,7 +33,7 @@
Etk_Widget *paned;
Etk_Widget *vpaned;
Etk_Widget *scrollview;
- Etk_Tree_Col *col, *col2;
+ Etk_Tree2_Col *col, *col2;
Etk_Widget *hbox;
Etk_Widget *signal_label, *signal_entry;
Etk_Widget *source_label, *source_entry;
@@ -107,15 +107,15 @@
etk_box_append(ETK_BOX(vbox), vpaned, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
etk_paned_child1_set(ETK_PANED(vpaned), paned, ETK_TRUE);
- gui->tree = etk_tree_new();
- etk_tree_headers_visible_set(ETK_TREE(gui->tree), ETK_TRUE);
- col = etk_tree_col_new(ETK_TREE(gui->tree), _("Part"),
- etk_tree_model_text_new(ETK_TREE(gui->tree)), 100);
- etk_tree_col_expand_set(col, ETK_TRUE);
- etk_tree_col_sort_func_set(col, gui_part_col_sort_cb, NULL);
- col2 = etk_tree_col_new(ETK_TREE(gui->tree), _("Visibility"),
- etk_tree_model_checkbox_new(ETK_TREE(gui->tree)), 30);
- etk_tree_build(ETK_TREE(gui->tree));
+ gui->tree = etk_tree2_new();
+ etk_tree2_headers_visible_set(ETK_TREE2(gui->tree), ETK_TRUE);
+ col = etk_tree2_col_new(ETK_TREE2(gui->tree), _("Part"), 80, 0.0);
+ etk_tree2_col_model_add(col, etk_tree2_model_text_new());
+ etk_tree2_col_expand_set(col, ETK_TRUE);
+ etk_tree2_col_sort_set(col, gui_part_col_sort_cb, NULL);
+ col2 = etk_tree2_col_new(ETK_TREE2(gui->tree), _("Visibility"), 60, 0.0);
+ etk_tree2_col_model_add(col2, etk_tree2_model_checkbox_new());
+ etk_tree2_build(ETK_TREE2(gui->tree));
etk_widget_size_request_set(gui->tree, 300, 0);
etk_paned_child1_set(ETK_PANED(paned), gui->tree, ETK_FALSE);
@@ -128,12 +128,12 @@
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(scrollview),
gui->canvas);
- gui->output = etk_tree_new();
- etk_tree_headers_visible_set(ETK_TREE(gui->output), ETK_TRUE);
- col = etk_tree_col_new(ETK_TREE(gui->output), _("Output"),
- etk_tree_model_text_new(ETK_TREE(gui->output)), 200);
- etk_tree_col_expand_set(col, ETK_TRUE);
- etk_tree_build(ETK_TREE(gui->output));
+ gui->output = etk_tree2_new();
+ etk_tree2_headers_visible_set(ETK_TREE2(gui->output), ETK_TRUE);
+ col = etk_tree2_col_new(ETK_TREE2(gui->output), _("Output"), 200, 0.0);
+ etk_tree2_col_model_add(col, etk_tree2_model_text_new());
+ etk_tree2_col_expand_set(col, ETK_TRUE);
+ etk_tree2_build(ETK_TREE2(gui->output));
etk_widget_size_request_set(gui->output, 0, 100);
etk_paned_child2_set(ETK_PANED(vpaned), gui->output, ETK_FALSE);
@@ -167,14 +167,14 @@
etk_widget_show_all(gui->win);
check = edje_viewer_config_open_last_get();
- if (file) list_entries(file, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ if (file) list_entries(file, ETK_TREE2(gui->tree), ETK_TREE2(gui->output),
ETK_CANVAS(gui->canvas));
else if (check)
{
file = edje_viewer_config_last_get();
if (file)
{
- list_entries(file, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ list_entries(file, ETK_TREE2(gui->tree), ETK_TREE2(gui->output),
ETK_CANVAS(gui->canvas));
etk_window_title_set(ETK_WINDOW(gui->win), file);
}
@@ -290,7 +290,7 @@
else if (!strcmp(label, "Open"))
_gui_open_edje_file_cb(gui);
else if (strstr(label, ".edj"))
- list_entries(label, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ list_entries(label, ETK_TREE2(gui->tree), ETK_TREE2(gui->output),
ETK_CANVAS(gui->canvas));
}
@@ -380,7 +380,7 @@
gui->path = strdup(dir);
gui->path = strcat(gui->path, "/");
gui->path = strcat(gui->path, file);
- list_entries(gui->path, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ list_entries(gui->path, ETK_TREE2(gui->tree), ETK_TREE2(gui->output),
ETK_CANVAS(gui->canvas));
etk_window_hide_on_delete(ETK_OBJECT(gui->fm_dialog), NULL);
etk_window_title_set(ETK_WINDOW(gui->win), gui->path);
@@ -395,19 +395,19 @@
etk_window_hide_on_delete(ETK_OBJECT(gui->fm_dialog), NULL);
}
-static void _gui_tree_checkbox_toggled_cb(Etk_Object *obj, Etk_Tree_Row *row,
+static void _gui_tree_checkbox_toggled_cb(Etk_Object *obj, Etk_Tree2_Row *row,
void *data)
{
Demo_Edje *de;
Etk_Bool checked;
- Etk_Tree_Col *col;
+ Etk_Tree2_Col *col;
Gui *gui;
- if (!(de = etk_tree_row_data_get(row))) return;
- if (!(col = ETK_TREE_COL(obj)) || !row) return;
+ if (!(de = etk_tree2_row_data_get(row))) return;
+ if (!(col = ETK_TREE2_COL(obj)) || !row) return;
if (!(gui = data)) return;
- etk_tree_row_fields_get(row, col, &checked, NULL);
+ etk_tree2_row_fields_get(row, col, &checked, NULL);
if (checked)
edje_part_show(gui->canvas, de);
else
@@ -437,7 +437,7 @@
}
int gui_part_col_sort_cb
-(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col,
+(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col,
void *data)
{
char *row1_value, *row2_value;
@@ -445,8 +445,8 @@
if (!tree || !row1 || !row2 || !col)
return 0;
- etk_tree_row_fields_get(row1, col, &row1_value, NULL);
- etk_tree_row_fields_get(row2, col, &row2_value, NULL);
+ etk_tree2_row_fields_get(row1, col, &row1_value, NULL);
+ etk_tree2_row_fields_get(row2, col, &row2_value, NULL);
if (strcmp(row1_value, row2_value) < 0)
return -1;
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_gui.h 8 Jul 2006 23:32:00 -0000 1.5
+++ etk_gui.h 16 Jan 2007 16:10:52 -0000 1.6
@@ -21,5 +21,5 @@
};
void main_window_show(char *file);
-int gui_part_col_sort_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
- Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
+int gui_part_col_sort_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1,
+ Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data);
-------------------------------------------------------------------------
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
