Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/tools/ewl_edb_ed


Modified Files:
        ewl_edb_ed.c 


Log Message:
- convert from ewl_table to ewl_tree

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/tools/ewl_edb_ed/ewl_edb_ed.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_edb_ed.c        27 Jul 2004 03:23:28 -0000      1.1
+++ ewl_edb_ed.c        27 Jul 2004 04:46:09 -0000      1.2
@@ -14,7 +14,7 @@
 static Ewl_Edb_Type current_type = EWL_EDB_TYPE_NONE;
 static Ewl_Widget *key_name_box = NULL;
 static Ewl_Widget *val_box = NULL;
-static Ewl_Widget *table = NULL;
+static Ewl_Widget *tree = NULL;
 
 void win_del_cb(Ewl_Widget *w, void *event, void *data);
 void open_file_cb(Ewl_Widget *w, void *event, void *data);
@@ -28,8 +28,7 @@
 int main(int argc, char ** argv) {
     Ewl_Widget *win = NULL, *box = NULL, *o = NULL;
     Ewl_Widget *menu_box = NULL, *hbox = NULL;
-    Ewl_Widget *scroll = NULL, *combo = NULL;
-       Ewl_Widget *box2 = NULL;
+    Ewl_Widget *combo = NULL, *box2 = NULL;
 
     if (!ewl_init(&argc, argv)) {
         printf("Unable to init ewl\n");
@@ -59,18 +58,15 @@
     ewl_container_append_child(EWL_CONTAINER(box), hbox);
     ewl_widget_show(hbox);
 
-    scroll = ewl_scrollpane_new();
-    ewl_container_append_child(EWL_CONTAINER(hbox), scroll);
-    ewl_widget_show(scroll);
-
-       /* create the table */
+       /* create the tree */
        {
                char * headers [] = {
                                "type", "key", "value"
                };
-           table = ewl_table_new(3, 10, headers);
-           ewl_container_append_child(EWL_CONTAINER(scroll), table);
-           ewl_widget_show(table);
+           tree = ewl_tree_new(3);
+           ewl_container_append_child(EWL_CONTAINER(hbox), tree);
+               ewl_tree_set_headers(EWL_TREE(tree), headers);
+           ewl_widget_show(tree);
        }
 
        box2 = ewl_vbox_new();
@@ -223,14 +219,12 @@
        }
 
        key_list = e_db_dump_key_list(file, &num_ret);  
-
        {
-               Ewl_Widget *cell = NULL;
                int i = 0;
 
                for(i = 0; i < num_ret; i++) {
                        if (key_list[i] != NULL) {
-                               Ewl_Widget *o = NULL;
+                               Ewl_Widget * widgets[3];
                                char *type = e_db_type_get(db_file, key_list[i]);
                                char val[512];
 
@@ -251,27 +245,16 @@
                                        snprintf(val, sizeof(val), "%d", integer);
                                }
 
-                               cell = ewl_cell_new();
-                               o = ewl_text_new(type);
-                               ewl_container_append_child(EWL_CONTAINER(cell), o);
-                               ewl_widget_show(o);
-                               ewl_widget_show(cell);
-                               ewl_table_add(EWL_TABLE(table), EWL_CELL(cell), 1, 1, 
i+2, i+2);
-
-                               cell = ewl_cell_new();
-                               o = ewl_text_new(key_list[i]);
-                               ewl_container_append_child(EWL_CONTAINER(cell), o);
-                               ewl_widget_show(o);
-                               ewl_widget_show(cell);
-                               ewl_table_add(EWL_TABLE(table), EWL_CELL(cell), 2, 2, 
i+2, i+2);
-
-                               cell = ewl_cell_new();
-                               o = ewl_text_new(val);
-                               ewl_container_append_child(EWL_CONTAINER(cell), o);
-                               ewl_widget_show(o);
-                               ewl_widget_show(cell);
-                               ewl_table_add(EWL_TABLE(table), EWL_CELL(cell), 3, 3, 
i+2, i+2);
+                               widgets[0] = ewl_text_new(type);
+                               ewl_widget_show(widgets[0]);
+
+                               widgets[1] = ewl_text_new(key_list[i]);
+                               ewl_widget_show(widgets[1]);
+
+                               widgets[2] = ewl_text_new(val);
+                               ewl_widget_show(widgets[2]);
 
+                               ewl_tree_add_row(EWL_TREE(tree), NULL, widgets);
                                free(key_list[i]);
                        }
                }
@@ -341,6 +324,7 @@
 void add_cb(Ewl_Widget *w, void *event, void *data) {
        char *key = ewl_entry_get_text(EWL_ENTRY(key_name_box));
        char *val = ewl_entry_get_text(EWL_ENTRY(val_box));
+       Ewl_Widget *widgets[3];
 
        if ((key == NULL)  || (val == NULL))
                return;
@@ -349,23 +333,33 @@
                case EWL_EDB_TYPE_INT:
                        {
                                int ival = atoi(val);
+                               widgets[0] = ewl_text_new("int");
+                               ewl_widget_show(widgets[0]);
                                e_db_int_set(db_file, key, ival);
                        }
                        break;
 
                case EWL_EDB_TYPE_STR:
+                       widgets[0] = ewl_text_new("str");
+                       ewl_widget_show(widgets[0]);
                        e_db_str_set(db_file, key, val);
                        break;
 
                case EWL_EDB_TYPE_FLOAT:
                        {
                                float fval = atof(val);
+                               widgets[0] = ewl_text_new("float");
+                               ewl_widget_show(widgets[0]);
                                e_db_float_set(db_file, key, fval);
                        }
                        break;
 
                case EWL_EDB_TYPE_DATA:
+                       widgets[0] = ewl_text_new("data");
+                       ewl_widget_show(widgets[0]);
                        e_db_data_set(db_file, key, val, strlen(val));
+                       free(val);
+                       val = strdup("");
                        break;
 
                default:
@@ -373,6 +367,14 @@
                        break;
        }
 
+       widgets[1] = ewl_text_new(key);
+       ewl_widget_show(widgets[1]);
+
+       widgets[2] = ewl_text_new(val);
+       ewl_widget_show(widgets[2]);
+
+       ewl_tree_add_row(EWL_TREE(tree), NULL, widgets);
+
        return;
        w = NULL;
        event = NULL;
@@ -380,7 +382,8 @@
 }
 
 void delete_cb(Ewl_Widget *w, void *event, void *data) {
-       char *current_key = ewl_table_get_selected(EWL_TABLE(table));
+       char *current_key = NULL;
+//     char *current_key = ewl_table_get_selected(EWL_TABLE(table));
 
        if (current_key == NULL)
                return;




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to