Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c etk_meta_plugin.c etk_structure_viewer.c
layout_etk_simple.c
Log Message:
Make it compile with the latest change on Etk_Tree.
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- etk_list_viewer.c 6 Jan 2007 18:45:25 -0000 1.79
+++ etk_list_viewer.c 24 Jan 2007 22:49:13 -0000 1.80
@@ -19,7 +19,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree2_Col* tree_col1;
+ Etk_Tree_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* gui_hash;
@@ -46,7 +46,7 @@
entropy_generic_file *file;
entropy_thumbnail *thumbnail;
entropy_gui_component_instance *instance;
- Etk_Tree2_Row *icon;
+ Etk_Tree_Row *icon;
};
@@ -96,7 +96,7 @@
/* Compares two rows of the tree */
-static int _entropy_etk_list_type_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+static int _entropy_etk_list_type_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -116,7 +116,7 @@
}
}
-static int _entropy_etk_list_filename_compare_cb(Etk_Tree2 *tree,
Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+static int _entropy_etk_list_filename_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -149,7 +149,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_size_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+static int _entropy_etk_list_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -172,7 +172,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_date_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+static int _entropy_etk_list_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -198,14 +198,14 @@
static void _etk_entropy_list_viewer_key_down_cb(Etk_Object *object, void
*event, void *data)
{
Etk_Event_Key_Down *key_event = event;
- Etk_Tree2_Row* iter;
+ Etk_Tree_Row* iter;
- Etk_Tree2* tree;
+ Etk_Tree* tree;
Evas_List* row_list = NULL;
gui_file* file;
- tree = ETK_TREE2(object);
- for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_row_walk_next(iter, ETK_TRUE))
+ tree = ETK_TREE(object);
+ for (iter = etk_tree_first_row_get(tree); iter; iter =
etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter->selected == ETK_TRUE) row_list =
evas_list_append(row_list, iter);
@@ -231,7 +231,7 @@
static void _entropy_etk_list_viewer_drag_begin_cb(Etk_Object *object, void
*data)
{
- Etk_Tree2 *tree;
+ Etk_Tree *tree;
const char **types;
unsigned int num_types;
Etk_Widget *drag;
@@ -248,13 +248,13 @@
Etk_Widget* vbox;
Etk_Widget* label;
char label_buffer[50];
- Etk_Tree2_Row* iter;
+ Etk_Tree_Row* iter;
instance = data;
viewer = instance->data;
- tree = ETK_TREE2(object);
- for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_row_walk_next(iter, ETK_TRUE))
+ tree = ETK_TREE(object);
+ for (iter = etk_tree_first_row_get(tree); iter; iter =
etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter->selected == ETK_TRUE) rows = evas_list_append(rows, iter);
drag = (ETK_WIDGET(tree))->drag;
@@ -357,7 +357,7 @@
Ecore_List *file_remove_ref_list;
entropy_generic_file *obj;
gui_file *freeobj;
- Etk_Tree2_Row* row;
+ Etk_Tree_Row* row;
entropy_etk_file_list_viewer *view = comp->data;
@@ -401,7 +401,7 @@
}
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree2_Row
*row, Etk_Event_Mouse_Up *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_list_viewer* viewer;
@@ -429,7 +429,7 @@
gui_event->data = file->file;
entropy_core_layout_notify_event (file->instance, gui_event,
ENTROPY_EVENT_GLOBAL);
} else if (event->button == 2) {
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
printf("MetaData request\n");
gui_event = entropy_malloc (sizeof (entropy_gui_event));
@@ -439,13 +439,13 @@
entropy_core_layout_notify_event (file->instance, gui_event,
ENTROPY_EVENT_GLOBAL);
} else if (event->button == 3) {
Evas_List* rows = NULL;
- Etk_Tree2_Row* iter;
+ Etk_Tree_Row* iter;
- for (iter = etk_tree2_first_row_get(ETK_TREE2(viewer->tree)); iter;
iter = etk_tree2_row_walk_next(iter, ETK_TRUE))
+ for (iter = etk_tree_first_row_get(ETK_TREE(viewer->tree)); iter; iter
= etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter->selected == ETK_TRUE) rows = evas_list_append(rows,
iter);
if (evas_list_count(rows) <= 1) {
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
file = ecore_hash_get(etk_list_viewer_row_hash, row);
entropy_etk_context_menu_popup(instance, file->file);
} else {
@@ -480,7 +480,7 @@
event_file = ecore_hash_get(viewer->gui_hash,file);
- etk_tree2_row_delete(event_file->icon);
+ etk_tree_row_delete(event_file->icon);
/*Destroy the gui_file object..*/
gui_file_remove_destroy_single(instance,event_file);
@@ -490,13 +490,13 @@
Ecore_List* entropy_etk_list_viewer_selected_get(entropy_etk_file_list_viewer*
viewer)
{
Evas_List* rows = NULL;
- Etk_Tree2_Row* iter;
+ Etk_Tree_Row* iter;
Ecore_List* ret_files;
gui_file* file;
ret_files = ecore_list_new();
- for (iter = etk_tree2_first_row_get(ETK_TREE2(viewer->tree)); iter;
iter = etk_tree2_row_walk_next(iter, ETK_TRUE))
+ for (iter = etk_tree_first_row_get(ETK_TREE(viewer->tree)); iter; iter
= etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter->selected == ETK_TRUE) rows = evas_list_append(rows,
iter);
for (; rows; rows = rows->next ) {
@@ -513,15 +513,15 @@
list_viewer_add_row (entropy_gui_component_instance * instance,
entropy_generic_file * file)
{
- Etk_Tree2_Row* new_row;
+ Etk_Tree_Row* new_row;
entropy_etk_file_list_viewer* viewer;
gui_file *e_file = NULL;
entropy_gui_event *gui_event;
- Etk_Tree2_Col* col1;
- Etk_Tree2_Col* col2;
- Etk_Tree2_Col* col3;
- Etk_Tree2_Col* col4;
- Etk_Tree2_Col* col5;
+ Etk_Tree_Col* col1;
+ Etk_Tree_Col* col2;
+ Etk_Tree_Col* col3;
+ Etk_Tree_Col* col4;
+ Etk_Tree_Col* col5;
char buffer[50];
char date_buffer[26];
char* thumbnail_filename;
@@ -544,17 +544,17 @@
thumbnail_filename = file->thumbnail->thumbnail_filename;
}
- col1 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 0);
- col2 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 1);
- col3 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 2);
- col4 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 3);
- col5 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 4);
+ col1 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 0);
+ col2 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 1);
+ col3 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 2);
+ col4 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 3);
+ col5 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 4);
- etk_tree2_freeze(ETK_TREE2(viewer->tree));
+ etk_tree_freeze(ETK_TREE(viewer->tree));
if (!file->retrieved_stat) {
- new_row = etk_tree2_row_append(ETK_TREE2(viewer->tree), NULL,
+ new_row = etk_tree_row_append(ETK_TREE(viewer->tree), NULL,
col1, thumbnail_filename, NULL,
col2, file->filename,
col4, file->mime_type,
@@ -567,7 +567,7 @@
ctime_r(&file->properties.st_mtime, date_buffer);
date_buffer[strlen(date_buffer)-1] = '\0';
- new_row = etk_tree2_row_append(ETK_TREE2(viewer->tree), NULL,
+ new_row = etk_tree_row_append(ETK_TREE(viewer->tree), NULL,
col1, thumbnail_filename, NULL,
col2, file->filename,
col3, buffer,
@@ -599,7 +599,7 @@
ENTROPY_EVENT_LOCAL);
}
- etk_tree2_thaw(ETK_TREE2(viewer->tree));
+ etk_tree_thaw(ETK_TREE(viewer->tree));
}
@@ -626,7 +626,7 @@
remove_ref = gui_object_destroy_and_free(comp, viewer->gui_hash);
printf("Clearing tree..\n");
- etk_tree2_clear(ETK_TREE2(viewer->tree));
+ etk_tree_clear(ETK_TREE(viewer->tree));
ecore_list_goto_first (el);
while ((file = ecore_list_next (el))) {
@@ -657,31 +657,31 @@
char buffer[50];
char date_buffer[26];
- Etk_Tree2_Col* col1;
- Etk_Tree2_Col* col2;
- Etk_Tree2_Col* col3;
- Etk_Tree2_Col* col4;
- Etk_Tree2_Col* col5;
+ Etk_Tree_Col* col1;
+ Etk_Tree_Col* col2;
+ Etk_Tree_Col* col3;
+ Etk_Tree_Col* col4;
+ Etk_Tree_Col* col5;
/*If !obj, it has been deleted - fail silently*/
if (obj) {
- col1 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree),
0);
- col2 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree),
1);
- col3 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree),
2);
- col4 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree),
3);
- col5 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree),
4);
+ col1 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 0);
+ col2 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 1);
+ col3 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 2);
+ col4 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 3);
+ col5 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 4);
snprintf(buffer,50, "%lld Kb",
file_stat->stat_obj->st_size / 1024);
ctime_r(&file_stat->stat_obj->st_mtime, date_buffer);
date_buffer[strlen(date_buffer)-1] = '\0';
- etk_tree2_freeze(ETK_TREE2(viewer->tree));
- etk_tree2_row_fields_set((Etk_Tree2_Row*)obj->icon,
ETK_FALSE,
+ etk_tree_freeze(ETK_TREE(viewer->tree));
+ etk_tree_row_fields_set((Etk_Tree_Row*)obj->icon,
ETK_FALSE,
col3, buffer,
col5, date_buffer,
NULL);
- etk_tree2_thaw(ETK_TREE2(viewer->tree));
+ etk_tree_thaw(ETK_TREE(viewer->tree));
}
}
break;
@@ -729,17 +729,17 @@
obj = ecore_hash_get (view->gui_hash, thumb->parent);
if (obj) {
- Etk_Tree2_Col* col1;
+ Etk_Tree_Col* col1;
obj->thumbnail = thumb;
- col1 = etk_tree2_nth_col_get(ETK_TREE2(viewer->tree), 0);
- etk_tree2_freeze(ETK_TREE2(viewer->tree));
+ col1 = etk_tree_nth_col_get(ETK_TREE(viewer->tree), 0);
+ etk_tree_freeze(ETK_TREE(viewer->tree));
- etk_tree2_row_fields_set((Etk_Tree2_Row*)obj->icon,
ETK_FALSE,
+ etk_tree_row_fields_set((Etk_Tree_Row*)obj->icon, ETK_FALSE,
col1, obj->thumbnail->thumbnail_filename, NULL,
NULL);
- etk_tree2_thaw(ETK_TREE2(viewer->tree));
+ etk_tree_thaw(ETK_TREE(viewer->tree));
} else {
/*printf ("ERR: Couldn't find a hash reference for this
file!\n");*/
@@ -821,30 +821,30 @@
viewer->files = ecore_list_new();
viewer->gui_hash = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
- viewer->tree = etk_tree2_new();
- etk_tree2_mode_set(ETK_TREE2(viewer->tree), ETK_TREE2_MODE_LIST);
+ viewer->tree = etk_tree_new();
+ etk_tree_mode_set(ETK_TREE(viewer->tree), ETK_TREE_MODE_LIST);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Icon"),
48,0.0);
- etk_tree2_col_model_add(viewer->tree_col1, etk_tree2_model_image_new());
+ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Icon"),
48,0.0);
+ etk_tree_col_model_add(viewer->tree_col1, etk_tree_model_image_new());
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree),
_("Filename"), 150,0.0);
- etk_tree2_col_model_add(viewer->tree_col1, etk_tree2_model_text_new());
+ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Filename"),
150,0.0);
+ etk_tree_col_model_add(viewer->tree_col1, etk_tree_model_text_new());
- etk_tree2_col_sort_set(viewer->tree_col1,
_entropy_etk_list_filename_compare_cb, NULL);
+ etk_tree_col_sort_set(viewer->tree_col1,
_entropy_etk_list_filename_compare_cb, NULL);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Size"),
60,0.0);
- etk_tree2_col_model_add(viewer->tree_col1, etk_tree2_model_text_new());
- etk_tree2_col_sort_set(viewer->tree_col1, _entropy_etk_list_size_compare_cb,
NULL);
+ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Size"),
60,0.0);
+ etk_tree_col_model_add(viewer->tree_col1, etk_tree_model_text_new());
+ etk_tree_col_sort_set(viewer->tree_col1, _entropy_etk_list_size_compare_cb,
NULL);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Type"),
65,0.0);
- etk_tree2_col_model_add(viewer->tree_col1, etk_tree2_model_text_new());
+ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Type"),
65,0.0);
+ etk_tree_col_model_add(viewer->tree_col1, etk_tree_model_text_new());
- etk_tree2_col_sort_set(viewer->tree_col1, _entropy_etk_list_type_compare_cb,
NULL);
+ etk_tree_col_sort_set(viewer->tree_col1, _entropy_etk_list_type_compare_cb,
NULL);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Date
Modified"), 90,0.0);
- etk_tree2_col_model_add(viewer->tree_col1, etk_tree2_model_text_new());
+ viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Date
Modified"), 90,0.0);
+ etk_tree_col_model_add(viewer->tree_col1, etk_tree_model_text_new());
- etk_tree2_col_sort_set(viewer->tree_col1, _entropy_etk_list_date_compare_cb,
NULL);
+ etk_tree_col_sort_set(viewer->tree_col1, _entropy_etk_list_date_compare_cb,
NULL);
/*DND Setup*/ /*FIXME - DND disabled*/
@@ -853,8 +853,8 @@
dnd_types[0] = strdup("text/uri-list");
etk_widget_dnd_source_set(viewer->tree, ETK_TRUE);
etk_signal_connect("drag_begin", ETK_OBJECT(viewer->tree) ,
ETK_CALLBACK(_entropy_etk_list_viewer_drag_begin_cb), instance);*/
- etk_tree2_multiple_select_set(ETK_TREE2(viewer->tree), ETK_TRUE);
- etk_tree2_build(ETK_TREE2(viewer->tree));
+ etk_tree_multiple_select_set(ETK_TREE(viewer->tree), ETK_TRUE);
+ etk_tree_build(ETK_TREE(viewer->tree));
//etk_widget_size_request_set(viewer->tree, 600, 600);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_meta_plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_meta_plugin.c 29 Dec 2006 13:02:53 -0000 1.3
+++ etk_meta_plugin.c 24 Jan 2007 22:49:13 -0000 1.4
@@ -106,7 +106,7 @@
etk_tree_clear(ETK_TREE(view->list));
ecore_list_goto_first(list);
while ( (object = ecore_list_next(list))) {
- etk_tree_append(ETK_TREE(view->list),
+ etk_tree_row_append(ETK_TREE(view->list), NULL,
col1, object->key,
col2, object->value,
NULL);
@@ -151,6 +151,7 @@
entropy_plugin_gui_instance_new (entropy_core * core,
entropy_gui_component_instance * layout, void*
parent_visual, void *data)
{
+ Etk_Tree_Col *col_tree;
_etk_meta_plugin* view = entropy_malloc(sizeof(_etk_meta_plugin));
entropy_gui_component_instance *instance =
entropy_gui_component_instance_new ();
instance->layout_parent = layout;
@@ -168,10 +169,10 @@
view->list = etk_tree_new();
etk_tree_mode_set(ETK_TREE(view->list), ETK_TREE_MODE_LIST);
- etk_tree_col_new(ETK_TREE(view->list), _("Keyword"),
- etk_tree_model_text_new(ETK_TREE(view->list)), 80);
- etk_tree_col_new(ETK_TREE(view->list), _("Value"),
- etk_tree_model_text_new(ETK_TREE(view->list)), 200);
+ col_tree = etk_tree_col_new(ETK_TREE(view->list), _("Keyword"), 80, 0.0);
+ etk_tree_col_model_add(col_tree, etk_tree_model_text_new());
+ col_tree = etk_tree_col_new(ETK_TREE(view->list), _("Value"), 200, 0.0);
+ etk_tree_col_model_add(col_tree, etk_tree_model_text_new());
etk_tree_build(ETK_TREE(view->list));
etk_container_add(ETK_CONTAINER(view->window), view->list);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_structure_viewer.c 5 Jan 2007 19:32:35 -0000 1.33
+++ etk_structure_viewer.c 24 Jan 2007 22:49:13 -0000 1.34
@@ -16,7 +16,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree2_Col* tree_col1;
+ Etk_Tree_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* row_hash;
@@ -67,8 +67,8 @@
{
Etk_Event_Selection_Request *ev;
Etk_Selection_Data_Files *files;
- Etk_Tree2* tree;
- Etk_Tree2_Row* row;
+ Etk_Tree* tree;
+ Etk_Tree_Row* row;
int i;
entropy_etk_file_structure_viewer* viewer;
entropy_gui_component_instance* instance;
@@ -79,8 +79,8 @@
ev = event;
files = ev->data;
- tree = ETK_TREE2(object);
- //row = etk_tree2_selected_row_get(tree);
+ tree = ETK_TREE(object);
+ //row = etk_tree_selected_row_get(tree);
instance = ecore_hash_get(instance_map_hash, row);
if (instance) {
@@ -123,7 +123,7 @@
}
}
-static void _etk_structure_viewer_row_clicked(Etk_Object *object,
Etk_Tree2_Row *row, Etk_Event_Mouse_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_structure_viewer* viewer;
@@ -139,7 +139,7 @@
printf("Post\n");
instance = ecore_hash_get(instance_map_hash, row);
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
if (instance) {
viewer = instance->data;
e_event = ecore_hash_get(viewer->row_hash, row);
@@ -162,28 +162,28 @@
-Etk_Tree2_Row*
+Etk_Tree_Row*
structure_viewer_add_row (entropy_gui_component_instance * instance,
- entropy_generic_file * file, Etk_Tree2_Row * prow)
+ entropy_generic_file * file, Etk_Tree_Row * prow)
{
- Etk_Tree2_Row* new_row;
+ Etk_Tree_Row* new_row;
entropy_etk_file_structure_viewer* viewer;
event_file_core *event;
- Etk_Tree2_Col* col;
- Etk_Tree2_Row* parent;
+ Etk_Tree_Col* col;
+ Etk_Tree_Row* parent;
viewer = instance->data;
- parent = (Etk_Tree2_Row*)viewer->parent_visual;
+ parent = (Etk_Tree_Row*)viewer->parent_visual;
- col = etk_tree2_nth_col_get(ETK_TREE2(parent->tree), 0);
- etk_tree2_freeze(ETK_TREE2(viewer->tree));
+ col = etk_tree_nth_col_get(ETK_TREE(parent->tree), 0);
+ etk_tree_freeze(ETK_TREE(viewer->tree));
if (!prow) {
- new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer->parent_visual)->tree,
(Etk_Tree2_Row*)viewer->parent_visual, col,
+ new_row = etk_tree_row_append(
((Etk_Tree_Row*)viewer->parent_visual)->tree,
(Etk_Tree_Row*)viewer->parent_visual, col,
PACKAGE_DATA_DIR "/icons/folder.png", NULL,
_(file->filename), NULL);
} else {
- new_row = etk_tree2_row_append( ((Etk_Tree2_Row*)prow)->tree,
(Etk_Tree2_Row*)prow, col,
+ new_row = etk_tree_row_append( ((Etk_Tree_Row*)prow)->tree,
(Etk_Tree_Row*)prow, col,
PACKAGE_DATA_DIR "/icons/folder.png", NULL,
_(file->filename), NULL);
}
@@ -199,7 +199,7 @@
/*Save this file in this list of files we're responsible for */
ecore_list_append (viewer->files, event->file);
- etk_tree2_thaw(ETK_TREE2(viewer->tree));
+ etk_tree_thaw(ETK_TREE(viewer->tree));
return new_row;
}
@@ -215,7 +215,7 @@
switch (eevent->event_type) {
case ENTROPY_NOTIFY_FILELIST_REQUEST_EXTERNAL:
case ENTROPY_NOTIFY_FILELIST_REQUEST:{
- Etk_Tree2_Row* row = NULL;
+ Etk_Tree_Row* row = NULL;
entropy_generic_file *file;
entropy_generic_file *event_file =
((entropy_file_request *) eevent->data)->file;
@@ -256,7 +256,7 @@
}
if (row)
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
if (row) {
ecore_list_goto_first (el);
@@ -279,7 +279,7 @@
structure_viewer_add_row (comp, file,
row);
ecore_hash_set (viewer->loaded_dirs, row,
(int*)1);
}
- etk_tree2_row_unfold(row);
+ etk_tree_row_unfold(row);
}
}
@@ -292,7 +292,7 @@
entropy_generic_file* file = el;
entropy_generic_file* parent_file = NULL;
- Etk_Tree2_Row* row = NULL;
+ Etk_Tree_Row* row = NULL;
parent_file = entropy_core_parent_folder_file_get(file);
@@ -313,11 +313,11 @@
case ENTROPY_NOTIFY_FILE_REMOVE_DIRECTORY: {
entropy_generic_file* file = el;
- Etk_Tree2_Row* row = NULL;
+ Etk_Tree_Row* row = NULL;
row = ecore_hash_get (viewer->row_folder_hash, file);
if (row) {
- etk_tree2_row_delete(row);
+ etk_tree_row_delete(row);
ecore_hash_remove(viewer->row_folder_hash, file);
}
@@ -395,8 +395,8 @@
etk_callback_setup = 1;
}
- if (!ecore_hash_get(tree_map_hash, ((Etk_Tree2_Row*)parent_visual)->tree)) {
- etk_signal_connect("row_clicked", ETK_OBJECT(
((Etk_Tree2_Row*)parent_visual)->tree ),
+ if (!ecore_hash_get(tree_map_hash, ((Etk_Tree_Row*)parent_visual)->tree)) {
+ etk_signal_connect("row_clicked", ETK_OBJECT(
((Etk_Tree_Row*)parent_visual)->tree ),
ETK_CALLBACK(_etk_structure_viewer_row_clicked), NULL);
@@ -406,16 +406,16 @@
int dnd_types_num;
dnd_types_num = 1;
- etk_widget_dnd_types_set(
ETK_WIDGET(((Etk_Tree2_Row*)parent_visual)->tree),
+ etk_widget_dnd_types_set(
ETK_WIDGET(((Etk_Tree_Row*)parent_visual)->tree),
dnd_types, dnd_types_num);
- etk_widget_dnd_dest_set(
ETK_WIDGET(((Etk_Tree2_Row*)parent_visual)->tree) , ETK_TRUE);
+ etk_widget_dnd_dest_set(
ETK_WIDGET(((Etk_Tree_Row*)parent_visual)->tree) , ETK_TRUE);
/*FIXME :: Disabled until migration to tree2 is done*/
- /*etk_signal_connect("drag_drop", ETK_OBJECT(
((Etk_Tree2_Row*)parent_visual)->tree ),
+ /*etk_signal_connect("drag_drop", ETK_OBJECT(
((Etk_Tree_Row*)parent_visual)->tree ),
ETK_CALLBACK(_etk_structure_viewer_xdnd_drag_drop_cb), NULL);*/
- ecore_hash_set(tree_map_hash, ((Etk_Tree2_Row*)parent_visual)->tree,
(int*)1);
+ ecore_hash_set(tree_map_hash, ((Etk_Tree_Row*)parent_visual)->tree,
(int*)1);
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- layout_etk_simple.c 5 Jan 2007 19:32:35 -0000 1.71
+++ layout_etk_simple.c 24 Jan 2007 22:49:13 -0000 1.72
@@ -29,7 +29,7 @@
typedef struct _layout_etk_row_structure_plugin
_layout_etk_row_structure_plugin;
struct _layout_etk_row_structure_plugin {
- Etk_Tree2_Row* row;
+ Etk_Tree_Row* row;
entropy_plugin* structure_plugin;
};
@@ -45,7 +45,7 @@
Etk_Widget *paned;
Etk_Widget *statusbar_box;
Etk_Widget *statusbars[3];
- Etk_Tree2_Row* delete_row; /*The row pending deletion, if any*/
+ Etk_Tree_Row* delete_row; /*The row pending deletion, if any*/
Etk_Widget* popup;
Etk_Widget* localshell;
@@ -230,7 +230,7 @@
{
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance->data;
- Etk_Tree2_Row* row = gui->delete_row;
+ Etk_Tree_Row* row = gui->delete_row;
Entropy_Config_Structure* structure;
Ecore_List* row_refs = NULL;
_layout_etk_row_structure_plugin* ref;
@@ -240,7 +240,7 @@
row_refs =
ecore_hash_get(_etk_layout_structure_plugin_reference, structure);
if (row_refs) {
while ( (ref = ecore_list_remove_first(row_refs))) {
- etk_tree2_row_delete(ref->row);
+ etk_tree_row_delete(ref->row);
IF_FREE(ref);
}
ecore_list_destroy(row_refs);
@@ -251,7 +251,7 @@
}
static void _etk_layout_row_clicked(Etk_Object *object,
- Etk_Tree2_Row *row, Etk_Event_Mouse_Down *event, void *data)
+ Etk_Tree_Row *row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance->data;
@@ -262,7 +262,7 @@
if (event->button == 3 && structure) {
gui->delete_row = row;
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
etk_menu_popup(ETK_MENU(gui->popup));
}
@@ -277,14 +277,14 @@
entropy_plugin *structure;
entropy_generic_file* file;
- Etk_Tree2_Row* row;
- Etk_Tree2_Col* col;
+ Etk_Tree_Row* row;
+ Etk_Tree_Col* col;
entropy_layout_gui* gui = instance->data;
char* icon_string = NULL;
Ecore_List* layouts;
_layout_etk_row_structure_plugin* struct_ref = NULL;
- col = etk_tree2_nth_col_get(ETK_TREE2(gui->tree), 0);
+ col = etk_tree_nth_col_get(ETK_TREE(gui->tree), 0);
/*Parse the file from the URI*/
file = entropy_core_parse_uri (structure_obj->uri);
@@ -303,10 +303,10 @@
icon_string = PACKAGE_DATA_DIR "/icons/vfolder-system.png";
- etk_tree2_freeze(ETK_TREE2(gui->tree));
- row = etk_tree2_row_append(ETK_TREE2(gui->tree), NULL, col,
+ etk_tree_freeze(ETK_TREE(gui->tree));
+ row = etk_tree_row_append(ETK_TREE(gui->tree), NULL, col,
icon_string, NULL, structure_obj->name, NULL);
- etk_tree2_thaw(ETK_TREE2(gui->tree));
+ etk_tree_thaw(ETK_TREE(gui->tree));
structure =
entropy_plugins_type_get_first(ENTROPY_PLUGIN_GUI_COMPONENT,ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW);
@@ -696,7 +696,7 @@
entropy_plugin *trackback;
entropy_gui_component_instance* meta_instance;
- Etk_Tree2_Col* col;
+ Etk_Tree_Col* col;
Etk_Widget* vbox;
Etk_Widget* menubar;
Etk_Widget* menu_item;
@@ -784,18 +784,18 @@
etk_container_add(ETK_CONTAINER(window), vbox);
/*Tree init*/
- gui->tree = etk_tree2_new();
+ gui->tree = etk_tree_new();
gui->tree_shell = etk_vbox_new(ETK_FALSE,0);
etk_box_append(ETK_BOX(gui->tree_shell), gui->tree, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_paned_child1_set(ETK_PANED(gui->paned), gui->tree_shell, ETK_FALSE);
- etk_tree2_mode_set(ETK_TREE2(gui->tree), ETK_TREE2_MODE_TREE);
- col = etk_tree2_col_new(ETK_TREE2(gui->tree), _("Folders"), 60,0.0);
- etk_tree2_col_model_add(col, etk_tree2_model_image_new());
- etk_tree2_col_model_add(col, etk_tree2_model_text_new());
+ etk_tree_mode_set(ETK_TREE(gui->tree), ETK_TREE_MODE_TREE);
+ col = etk_tree_col_new(ETK_TREE(gui->tree), _("Folders"), 60,0.0);
+ etk_tree_col_model_add(col, etk_tree_model_image_new());
+ etk_tree_col_model_add(col, etk_tree_model_text_new());
- etk_tree2_col_expand_set(col, ETK_TRUE);
- etk_tree2_build(ETK_TREE2(gui->tree));
+ etk_tree_col_expand_set(col, ETK_TRUE);
+ etk_tree_build(ETK_TREE(gui->tree));
etk_widget_size_request_set(ETK_WIDGET(gui->tree),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X, 50);
/*Register to receive events related to the treeview config*/
-------------------------------------------------------------------------
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
