Enlightenment CVS committal
Author : urandom
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:
todo = todo - 1
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_etk.c 17 Jun 2006 23:31:39 -0000 1.1
+++ edje_etk.c 19 Jun 2006 17:39:29 -0000 1.2
@@ -114,7 +114,8 @@
}
}
-void list_entries(char *file, Etk_Tree *tree, Etk_Canvas *canvas)
+void list_entries(char *file, Etk_Tree *tree, Etk_Tree *output,
+ Etk_Canvas *canvas)
{
Evas_List *entries;
Evas_List *collections = NULL;
@@ -143,14 +144,15 @@
co->part = strdup(name);
row = etk_tree_append(tree, col1, name, NULL);
- de = edje_part_create(canvas, file, name);
+ de = edje_part_create(output, canvas, file, name);
etk_tree_row_data_set(row, de);
}
edje_file_collection_list_free(entries);
}
}
-Demo_Edje *edje_part_create(Etk_Canvas *canvas, char *file, char *name)
+Demo_Edje *edje_part_create(Etk_Tree *output, Etk_Canvas *canvas,
+ char *file, char *name)
{
Evas_Object *o;
Demo_Edje *de;
@@ -234,7 +236,7 @@
o = edje_object_add(evas);
edje_object_message_handler_set(o, message_cb, NULL);
- edje_object_signal_callback_add(o, "*", "*", signal_cb, NULL);
+ edje_object_signal_callback_add(o, "*", "*", signal_cb, output);
edje_object_file_set(o, file, name);
edje_object_part_drag_size_set(o, "dragable", 0.01, 0.5);
edje_object_part_drag_step_set(o, "dragable", 0.1, 0.1);
@@ -559,28 +561,94 @@
static void signal_cb
(void *data, Evas_Object *o, const char *sig, const char *src)
{
- printf("CALLBACK for \"%s\" \"%s\"\n", sig, src);
- if (!strcmp(sig, "drag"))
- {
+ Etk_Tree *output;
+ Etk_Tree_Col *col;
+ Etk_Tree_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);
+ if (count > 5000)
+ {
+ row = etk_tree_first_row_get(output);
+ etk_tree_row_del(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);
+ if (!strcmp(sig, "drag"))
+ {
double x, y;
+ count = evas_list_count(output->rows_widgets);
+ if (count > 5000)
+ {
+ row = etk_tree_first_row_get(output);
+ etk_tree_row_del(row);
+ }
+
edje_object_part_drag_value_get(o, src, &x, &y);
- printf("Drag %3.3f %3.3f\n", 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);
+ }
+
+ free(str);
}
static void message_cb
(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg)
{
- printf("MESSAGE for %p from script type %i id %i\n", obj, type, id);
- if (type == EDJE_MESSAGE_STRING)
- {
+ Etk_Tree *output;
+ Etk_Tree_Col *col;
+ Etk_Tree_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);
+ if (count > 5000)
+ {
+ row = etk_tree_first_row_get(output);
+ etk_tree_row_del(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);
+ if (type == EDJE_MESSAGE_STRING)
+ {
Edje_Message_String *emsg;
+ count = evas_list_count(output->rows_widgets);
+ if (count > 5000)
+ {
+ row = etk_tree_first_row_get(output);
+ etk_tree_row_del(row);
+ }
+
emsg = (Edje_Message_String *)msg;
- printf("STWING: \"%s\"\n", emsg->str);
- }
- printf("Send msg to script...\n");
- edje_object_message_send(obj, EDJE_MESSAGE_NONE, 12345, NULL);
+ 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);
+ }
+ edje_object_message_send(obj, EDJE_MESSAGE_NONE, 12345, NULL);
+
+ free(str);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_etk.h 17 Jun 2006 23:31:39 -0000 1.1
+++ edje_etk.h 19 Jun 2006 17:39:29 -0000 1.2
@@ -37,8 +37,10 @@
void bg_setup(Etk_Canvas *canvas);
void canvas_resize_cb(Etk_Object *canvas, const char *property_name,
void *data);
-void list_entries(char *file, Etk_Tree *tree, Etk_Canvas *canvas);
-Demo_Edje *edje_part_create(Etk_Canvas *canvas, char *file, char *name);
+void list_entries(char *file, Etk_Tree *tree, Etk_Tree *output,
+ Etk_Canvas *canvas);
+Demo_Edje *edje_part_create(Etk_Tree *output, Etk_Canvas *canvas,
+ char *file, char *name);
void edje_part_show(Etk_Widget *canvas, Demo_Edje *de);
void edje_part_hide(Demo_Edje *de);
void edje_part_resize(Demo_Edje *de);
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_gui.c 17 Jun 2006 23:43:39 -0000 1.2
+++ etk_gui.c 19 Jun 2006 17:39:29 -0000 1.3
@@ -26,6 +26,7 @@
Etk_Widget *menuitem;
Etk_Widget *vbox;
Etk_Widget *paned;
+ Etk_Widget *vpaned;
Etk_Widget *scrollview;
Etk_Tree_Col *col, *col2;
@@ -52,10 +53,11 @@
ETK_MENU_SHELL(menu));
paned = etk_hpaned_new();
- etk_box_pack_start(ETK_BOX(vbox), paned, ETK_TRUE, ETK_TRUE, 0);
+ vpaned = etk_vpaned_new();
+ etk_box_pack_start(ETK_BOX(vbox), vpaned, ETK_TRUE, ETK_TRUE, 0);
+ etk_paned_child1_set(ETK_PANED(vpaned), paned, ETK_TRUE);
gui->tree = etk_tree_new();
- etk_tree_multiple_select_set(ETK_TREE(gui->tree), ETK_TRUE);
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);
@@ -74,13 +76,22 @@
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));
+ etk_paned_child2_set(ETK_PANED(vpaned), gui->output, ETK_FALSE);
+
gui->status = etk_statusbar_new();
etk_box_pack_end(ETK_BOX(vbox), gui->status, ETK_FALSE, ETK_FALSE, 0);
bg_setup(ETK_CANVAS(gui->canvas));
etk_widget_show_all(gui->win);
- if (file) list_entries(file, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
+ if (file) list_entries(file, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ ETK_CANVAS(gui->canvas));
etk_signal_connect("delete_event", ETK_OBJECT(gui->win),
ETK_CALLBACK(_gui_main_window_deleted_cb), NULL);
etk_signal_connect("cell_value_changed", ETK_OBJECT(col2),
@@ -221,7 +232,8 @@
gui->file = etk_filechooser_widget_selected_file_get(
ETK_FILECHOOSER_WIDGET(gui->fm_chooser));
- list_entries(gui->file, ETK_TREE(gui->tree), ETK_CANVAS(gui->canvas));
+ list_entries(gui->file, ETK_TREE(gui->tree), ETK_TREE(gui->output),
+ ETK_CANVAS(gui->canvas));
etk_window_hide_on_delete(ETK_OBJECT(gui->fm_dialog), NULL);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_gui.h 17 Jun 2006 23:31:39 -0000 1.1
+++ etk_gui.h 19 Jun 2006 17:39:29 -0000 1.2
@@ -10,6 +10,7 @@
Etk_Widget *tree;
Etk_Widget *canvas;
Etk_Widget *status;
+ Etk_Widget *output;
Etk_Widget *fm_dialog;
Etk_Widget *fm_chooser;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
