Menu
▾
▴
E CVS: apps/exhibit moom
|
From: Enlightenment C. <no...@cv...> - 2007-01-16 19:30:12
|
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_main.c exhibit_main.h
exhibit_menus.c exhibit_model_wobbly.c exhibit_model_wobbly.h
exhibit_options.c exhibit_slideshow.c exhibit_sort.c
exhibit_tab.c exhibit_thumb.c
Log Message:
tree2 --> tree
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- exhibit.h 16 Jan 2007 03:34:49 -0000 1.39
+++ exhibit.h 17 Jan 2007 01:30:09 -0000 1.40
@@ -165,8 +165,8 @@
Etk_Widget *alignment;
Etk_Widget *dialog;
- Etk_Tree2_Col *dcol;
- Etk_Tree2_Col *icol;
+ Etk_Tree_Col *dcol;
+ Etk_Tree_Col *icol;
struct {
Etk_Bool visible;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- exhibit_image.c 16 Jan 2007 03:34:49 -0000 1.41
+++ exhibit_image.c 17 Jan 2007 01:30:09 -0000 1.42
@@ -43,26 +43,26 @@
}
else
{
- Etk_Tree2_Row *row;
+ Etk_Tree_Row *row;
if (ev->z > 0)
{
- row = etk_tree2_row_next_get(
- etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree)));
- etk_tree2_row_select(row);
+ row = etk_tree_row_next_get(
+ etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree)));
+ etk_tree_row_select(row);
#if 0
/* TODO: implement when this is in Tree2 */
- etk_tree2_row_scroll_to(row, ETK_FALSE);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
#endif
}
else
{
- row = etk_tree2_row_prev_get(
- etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree)));
- etk_tree2_row_select(row);
+ row = etk_tree_row_prev_get(
+ etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree)));
+ etk_tree_row_select(row);
#if 0
/* TODO: implement when this is in Tree2 */
- etk_tree2_row_scroll_to(row, ETK_FALSE);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
#endif
}
}
@@ -1229,15 +1229,15 @@
Etk_Bool
_ex_image_is_favorite(Exhibit *e)
{
- Etk_Tree2_Row *r;
+ Etk_Tree_Row *r;
char *icol_string;
char path[PATH_MAX];
- r = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
+ r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return ETK_FALSE;
- etk_tree2_row_fields_get(r,
- etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree),
+ etk_tree_row_fields_get(r,
+ etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree),
0),
NULL, NULL, &icol_string,
NULL);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- exhibit_main.c 16 Jan 2007 03:34:49 -0000 1.92
+++ exhibit_main.c 17 Jan 2007 01:30:09 -0000 1.93
@@ -10,7 +10,7 @@
Evas_List *event_handlers;
static void _ex_main_monitor_dir(void *data, Ecore_File_Monitor *ecore_file_monitor, Ecore_File_Event event, const char *path);
-static int _ex_main_dtree_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data);
+static int _ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
static void _ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data);
static void _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event, void *data);
static Etk_Bool _ex_main_window_deleted_cb(void *data);
@@ -21,40 +21,40 @@
/*******
* We are defining these here until Tree2 has them
*******/
-Etk_Tree2_Row *etk_tree2_selected_row_get(Etk_Tree2 *tree)
+Etk_Tree_Row *etk_tree_selected_row_get(Etk_Tree *tree)
{
if (!tree || !tree->last_selected_row || !tree->last_selected_row->selected)
return NULL;
return tree->last_selected_row;
}
-Evas_List *etk_tree2_selected_rows_get(Etk_Tree2 *tree)
+Evas_List *etk_tree_selected_rows_get(Etk_Tree *tree)
{
Evas_List *row_list = NULL;
- Etk_Tree2_Row *iter;
+ Etk_Tree_Row *iter;
- for (iter = etk_tree2_first_row_get(tree);
+ for (iter = etk_tree_first_row_get(tree);
iter;
- iter = etk_tree2_row_walk_next(iter, ETK_TRUE))
+ iter = etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter->selected == ETK_TRUE)
row_list = evas_list_append(row_list, iter);
return row_list;
}
-int etk_tree2_num_rows_get(Etk_Tree2 *tree)
+int etk_tree_num_rows_get(Etk_Tree *tree)
{
return tree->total_rows;
}
-int etk_tree2_row_num_get(Etk_Tree2 *tree, Etk_Tree2_Row *row)
+int etk_tree_row_num_get(Etk_Tree *tree, Etk_Tree_Row *row)
{
int num = 0;
- Etk_Tree2_Row *iter;
+ Etk_Tree_Row *iter;
- for (iter = etk_tree2_first_row_get(tree);
+ for (iter = etk_tree_first_row_get(tree);
iter;
- iter = etk_tree2_row_walk_next(iter, ETK_TRUE))
+ iter = etk_tree_row_walk_next(iter, ETK_TRUE))
{
if (iter == row)
return num;
@@ -187,15 +187,15 @@
}
static int
-_ex_main_dtree_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+_ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
char *dir1, *dir2;
if (!row1 || !row2 || !col)
return 0;
- etk_tree2_row_fields_get(row1, col, NULL, NULL, &dir1, NULL);
- etk_tree2_row_fields_get(row2, col, NULL, NULL, &dir2, NULL);
+ etk_tree_row_fields_get(row1, col, NULL, NULL, &dir1, NULL);
+ etk_tree_row_fields_get(row2, col, NULL, NULL, &dir2, NULL);
return strcasecmp(dir1, dir2);
}
@@ -211,7 +211,7 @@
if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
{
snprintf(back, PATH_MAX, "..");
- etk_tree2_row_append(ETK_TREE2(e->cur_tab->dtree), NULL, e->cur_tab->dcol,
+ etk_tree_row_append(ETK_TREE(e->cur_tab->dtree), NULL, e->cur_tab->dcol,
etk_theme_icon_get(), "actions/go-up_16", back, NULL);
}
@@ -225,8 +225,8 @@
if ((dir = opendir(".")) == NULL)
return;
- etk_tree2_freeze(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_freeze(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_freeze(ETK_TREE(e->cur_tab->itree));
+ etk_tree_freeze(ETK_TREE(e->cur_tab->dtree));
getcwd(e->cur_tab->cur_path, PATH_MAX);
if (strlen(e->cur_tab->cur_path) < PATH_MAX - 2)
@@ -254,7 +254,7 @@
if(stat(image, &st) == -1) continue;
if(S_ISDIR(st.st_mode))
{
- etk_tree2_row_append(ETK_TREE2(e->cur_tab->dtree), NULL, e->cur_tab->dcol,
+ etk_tree_row_append(ETK_TREE(e->cur_tab->dtree), NULL, e->cur_tab->dcol,
etk_theme_icon_get(),
"places/folder_16",
dir_entry->d_name, NULL);
@@ -276,8 +276,8 @@
_ex_main_itree_add(imagereal, selected_file);
}
- etk_tree2_thaw(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_thaw(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_thaw(ETK_TREE(e->cur_tab->itree));
+ etk_tree_thaw(ETK_TREE(e->cur_tab->dtree));
if (update == EX_TREE_UPDATE_FILES)
{
@@ -294,7 +294,7 @@
#if 0
/* TODO: implement this when tree2 has sorting */
if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
- etk_tree2_sort(ETK_TREE2(e->cur_tab->dtree), _ex_main_dtree_compare_cb,
+ etk_tree_sort(ETK_TREE(e->cur_tab->dtree), _ex_main_dtree_compare_cb,
ETK_TRUE, e->cur_tab->dcol, NULL);
#endif
@@ -317,7 +317,7 @@
_ex_main_itree_add(const char *file, const char *selected_file)
{
Epsilon *ep;
- Etk_Tree2_Row *row;
+ Etk_Tree_Row *row;
if (!file)
{
@@ -336,7 +336,7 @@
char *thumb;
thumb = (char*) epsilon_thumb_file_get(ep);
- row = etk_tree2_row_append(ETK_TREE2(e->cur_tab->itree), NULL,
+ row = etk_tree_row_append(ETK_TREE(e->cur_tab->itree), NULL,
e->cur_tab->icol,
thumb, NULL,
basename((char *) file), NULL);
@@ -345,10 +345,10 @@
{
if(!strcmp(selected_file, file))
{
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
#if 0
/* TODO: Implement this when Tree2 has support */
- etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree_row_scroll_to(row, ETK_TRUE);
#endif
}
}
@@ -396,16 +396,16 @@
switch (event)
{
case ECORE_FILE_EVENT_CREATED_DIRECTORY:
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_DIRS);
break;
case ECORE_FILE_EVENT_DELETED_DIRECTORY:
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_DIRS);
break;
case ECORE_FILE_EVENT_DELETED_SELF:
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
break;
case ECORE_FILE_EVENT_MODIFIED:
@@ -413,7 +413,7 @@
break;
case ECORE_FILE_EVENT_DELETED_FILE:
/* TODO: remove the correct item from tree, don't refresh all */
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_FILES);
break;
case ECORE_FILE_EVENT_CREATED_FILE:
@@ -506,8 +506,8 @@
{
_ex_slideshow_stop(e);
e->cur_tab->dir = strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
}
@@ -516,8 +516,8 @@
_ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data)
{
e->cur_tab->dir = strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
@@ -554,14 +554,14 @@
}
else if(!strcmp(ev->key, "d"))
{
- Etk_Tree2_Row *r;
+ Etk_Tree_Row *r;
char *icol_string;
- r = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
+ r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
- etk_tree2_row_fields_get(r, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 0),
- NULL, &icol_string, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 1), NULL);
+ etk_tree_row_fields_get(r, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0),
+ NULL, &icol_string, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1), NULL);
_ex_favorites_add(e, icol_string);
}
else if(!strcmp(ev->key, "x"))
@@ -714,8 +714,8 @@
E_FREE(e->cur_tab->dir);
e->cur_tab->dir = strdup(dir);
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(ecore_file_get_file(file), EX_TREE_UPDATE_ALL);
if (ecore_file_exists(file) && !ecore_file_is_dir(file))
_ex_main_image_set(e, file);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- exhibit_main.h 16 Jan 2007 03:34:49 -0000 1.17
+++ exhibit_main.h 17 Jan 2007 01:30:09 -0000 1.18
@@ -20,8 +20,8 @@
void _ex_main_button_zoom_one_to_one_cb(Etk_Object *obj, void *data);
/* remove this when tree2 defines it */
-Etk_Tree2_Row *etk_tree2_selected_row_get(Etk_Tree2 *tree);
-Evas_List *etk_tree2_selected_rows_get(Etk_Tree2 *tree);
-int etk_tree2_num_rows_get(Etk_Tree2 *tree);
-int etk_tree2_row_num_get(Etk_Tree2 *tree, Etk_Tree2_Row *row);
+Etk_Tree_Row *etk_tree_selected_row_get(Etk_Tree *tree);
+Evas_List *etk_tree_selected_rows_get(Etk_Tree *tree);
+int etk_tree_num_rows_get(Etk_Tree *tree);
+int etk_tree_row_num_get(Etk_Tree *tree, Etk_Tree_Row *row);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- exhibit_menus.c 16 Jan 2007 03:34:49 -0000 1.40
+++ exhibit_menus.c 17 Jan 2007 01:30:09 -0000 1.41
@@ -121,11 +121,11 @@
_ex_menu_save_image_cb(Etk_Object *obj, void *data)
{
Exhibit *e;
- Etk_Tree2_Row *r;
+ Etk_Tree_Row *r;
EX_MENU_ITEM_GET_RETURN(obj);
e = data;
- r = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
+ r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
_ex_image_save(ETK_IMAGE(e->cur_tab->image));
@@ -434,14 +434,14 @@
void
_ex_menu_add_to_fav_cb(Etk_Object *obj, void *data)
{
- Etk_Tree2_Row *r;
+ Etk_Tree_Row *r;
char *icol_string;
EX_MENU_ITEM_GET_RETURN(obj);
- r = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
+ r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
- etk_tree2_row_fields_get(r, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 0), NULL, &icol_string, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 1),NULL);
+ etk_tree_row_fields_get(r, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0), NULL, &icol_string, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1),NULL);
_ex_favorites_add(e, icol_string);
//free(icol_string);
}
@@ -449,14 +449,14 @@
void
_ex_menu_remove_from_fav_cb(Etk_Object *obj, void *data)
{
- Etk_Tree2_Row *r;
+ Etk_Tree_Row *r;
char *icol_string;
EX_MENU_ITEM_GET_RETURN(obj);
- r = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
+ r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
- etk_tree2_row_fields_get(r, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 0), NULL, &icol_string, etk_tree2_nth_col_get(ETK_TREE2(e->cur_tab->itree), 1),NULL);
+ etk_tree_row_fields_get(r, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0), NULL, &icol_string, etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1),NULL);
_ex_favorites_del(e, icol_string);
//free(icol_string);
}
@@ -469,8 +469,8 @@
_ex_slideshow_stop();
E_FREE(e->cur_tab->dir);
e->cur_tab->dir = strdup(e->options->fav_path);
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_model_wobbly.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_model_wobbly.c 16 Jan 2007 03:34:49 -0000 1.2
+++ exhibit_model_wobbly.c 17 Jan 2007 01:30:09 -0000 1.3
@@ -5,47 +5,47 @@
#include "config.h"
/* Structure of the "wobbly" model */
-typedef struct Etk_Tree2_Model_Wobbly
+typedef struct Etk_Tree_Model_Wobbly
{
- Etk_Tree2_Model model;
+ Etk_Tree_Model model;
Etk_Cache *cache;
-} Etk_Tree2_Model_Wobbly;
+} Etk_Tree_Model_Wobbly;
/* Data associated to the "wobbly" model */
-typedef struct Etk_Tree2_Model_Wobbly_Data
+typedef struct Etk_Tree_Model_Wobbly_Data
{
char *filename;
char *key;
enum
{
- ETK_TREE2_MODEL_UNKNOWN_YET,
- ETK_TREE2_MODEL_NORMAL,
- ETK_TREE2_MODEL_EDJE,
- ETK_TREE2_MODEL_NOT_FOUND
+ ETK_TREE_MODEL_UNKNOWN_YET,
+ ETK_TREE_MODEL_NORMAL,
+ ETK_TREE_MODEL_EDJE,
+ ETK_TREE_MODEL_NOT_FOUND
} type;
-} Etk_Tree2_Model_Wobbly_Data;
+} Etk_Tree_Model_Wobbly_Data;
-static void _wobbly_model_free(Etk_Tree2_Model *model);
-static void _wobbly_cell_data_free(Etk_Tree2_Model *model, void *cell_data);
-static void _wobbly_cell_data_set(Etk_Tree2_Model *model, void *cell_data, va_list *args);
-static void _wobbly_cell_data_get(Etk_Tree2_Model *model, void *cell_data, va_list *args);
-static void _wobbly_objects_cache(Etk_Tree2_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL]);
-static Etk_Bool _wobbly_render(Etk_Tree2_Model *model, Etk_Tree2_Row *row, Etk_Geometry geometry, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL], Evas *evas);
-static int _wobbly_width_get(Etk_Tree2_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL]);
+static void _wobbly_model_free(Etk_Tree_Model *model);
+static void _wobbly_cell_data_free(Etk_Tree_Model *model, void *cell_data);
+static void _wobbly_cell_data_set(Etk_Tree_Model *model, void *cell_data, va_list *args);
+static void _wobbly_cell_data_get(Etk_Tree_Model *model, void *cell_data, va_list *args);
+static void _wobbly_objects_cache(Etk_Tree_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL]);
+static Etk_Bool _wobbly_render(Etk_Tree_Model *model, Etk_Tree_Row *row, Etk_Geometry geometry, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL], Evas *evas);
+static int _wobbly_width_get(Etk_Tree_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL]);
static void _wobbly_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _wobbly_cache_free_cb(Evas_Object *object, void *data);
/* TODOC */
-Etk_Tree2_Model *etk_tree2_model_wobbly_new(void)
+Etk_Tree_Model *etk_tree_model_wobbly_new(void)
{
- Etk_Tree2_Model *model;
- Etk_Tree2_Model_Wobbly *wobbly_model;
+ Etk_Tree_Model *model;
+ Etk_Tree_Model_Wobbly *wobbly_model;
- model = calloc(1, sizeof(Etk_Tree2_Model_Wobbly));
- wobbly_model = (Etk_Tree2_Model_Wobbly *)model;
+ model = calloc(1, sizeof(Etk_Tree_Model_Wobbly));
+ wobbly_model = (Etk_Tree_Model_Wobbly *)model;
- model->cell_data_size = sizeof(Etk_Tree2_Model_Wobbly_Data);
+ model->cell_data_size = sizeof(Etk_Tree_Model_Wobbly_Data);
model->model_free = _wobbly_model_free;
model->cell_data_free = _wobbly_cell_data_free;
model->cell_data_set = _wobbly_cell_data_set;
@@ -61,19 +61,19 @@
}
/* Wobbly: model_free() */
-static void _wobbly_model_free(Etk_Tree2_Model *model)
+static void _wobbly_model_free(Etk_Tree_Model *model)
{
- Etk_Tree2_Model_Wobbly *wobbly_model;
+ Etk_Tree_Model_Wobbly *wobbly_model;
- if (!(wobbly_model = (Etk_Tree2_Model_Wobbly *)model))
+ if (!(wobbly_model = (Etk_Tree_Model_Wobbly *)model))
return;
etk_cache_destroy(wobbly_model->cache);
}
/* Wobbly: cell_data_free() */
-static void _wobbly_cell_data_free(Etk_Tree2_Model *model, void *cell_data)
+static void _wobbly_cell_data_free(Etk_Tree_Model *model, void *cell_data)
{
- Etk_Tree2_Model_Wobbly_Data *wobbly_data;
+ Etk_Tree_Model_Wobbly_Data *wobbly_data;
if (!(wobbly_data = cell_data))
return;
@@ -83,9 +83,9 @@
}
/* Wobbly: cell_data_set() */
-static void _wobbly_cell_data_set(Etk_Tree2_Model *model, void *cell_data, va_list *args)
+static void _wobbly_cell_data_set(Etk_Tree_Model *model, void *cell_data, va_list *args)
{
- Etk_Tree2_Model_Wobbly_Data *wobbly_data;
+ Etk_Tree_Model_Wobbly_Data *wobbly_data;
char *string;
if (!(wobbly_data = cell_data) || !args || !model)
@@ -105,13 +105,13 @@
wobbly_data->key = string ? strdup(string) : NULL;
}
- wobbly_data->type = ETK_TREE2_MODEL_UNKNOWN_YET;
+ wobbly_data->type = ETK_TREE_MODEL_UNKNOWN_YET;
}
/* Wobbly: cell_data_get() */
-static void _wobbly_cell_data_get(Etk_Tree2_Model *model, void *cell_data, va_list *args)
+static void _wobbly_cell_data_get(Etk_Tree_Model *model, void *cell_data, va_list *args)
{
- Etk_Tree2_Model_Wobbly_Data *wobbly_data;
+ Etk_Tree_Model_Wobbly_Data *wobbly_data;
char **string;
if (!(wobbly_data = cell_data) || !args || !model)
@@ -126,16 +126,16 @@
}
/* Wobbly: objects_cache() */
-static void _wobbly_objects_cache(Etk_Tree2_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL])
+static void _wobbly_objects_cache(Etk_Tree_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL])
{
- Etk_Tree2_Model_Wobbly *wobbly_model;
- Etk_Tree2_Model_Wobbly_Data *wobbly_data;
+ Etk_Tree_Model_Wobbly *wobbly_model;
+ Etk_Tree_Model_Wobbly_Data *wobbly_data;
- if (!(wobbly_model = (Etk_Tree2_Model_Wobbly *)model) || !cell_objects[0])
+ if (!(wobbly_model = (Etk_Tree_Model_Wobbly *)model) || !cell_objects[0])
return;
wobbly_data = cell_data;
- if (wobbly_data && (wobbly_data->type == ETK_TREE2_MODEL_NORMAL || wobbly_data->type == ETK_TREE2_MODEL_EDJE))
+ if (wobbly_data && (wobbly_data->type == ETK_TREE_MODEL_NORMAL || wobbly_data->type == ETK_TREE_MODEL_EDJE))
etk_cache_add(wobbly_model->cache, cell_objects[0], wobbly_data->filename, wobbly_data->key);
else
{
@@ -148,28 +148,28 @@
}
/* Wobbly: render() */
-static Etk_Bool _wobbly_render(Etk_Tree2_Model *model, Etk_Tree2_Row *row, Etk_Geometry geometry, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL], Evas *evas)
+static Etk_Bool _wobbly_render(Etk_Tree_Model *model, Etk_Tree_Row *row, Etk_Geometry geometry, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL], Evas *evas)
{
- Etk_Tree2_Model_Wobbly *wobbly_model;
- Etk_Tree2_Model_Wobbly_Data *wobbly_data;
+ Etk_Tree_Model_Wobbly *wobbly_model;
+ Etk_Tree_Model_Wobbly_Data *wobbly_data;
Etk_Bool object_created = ETK_FALSE;
char *ext;
- if (!(wobbly_model = (Etk_Tree2_Model_Wobbly *)model) || !(wobbly_data = cell_data) || !evas)
+ if (!(wobbly_model = (Etk_Tree_Model_Wobbly *)model) || !(wobbly_data = cell_data) || !evas)
return ETK_FALSE;
- if (!wobbly_data->filename || wobbly_data->type == ETK_TREE2_MODEL_NOT_FOUND)
+ if (!wobbly_data->filename || wobbly_data->type == ETK_TREE_MODEL_NOT_FOUND)
return ETK_FALSE;
/* If we don't know yet what the image's type is, we "guess" it */
- if (wobbly_data->type == ETK_TREE2_MODEL_UNKNOWN_YET)
+ if (wobbly_data->type == ETK_TREE_MODEL_UNKNOWN_YET)
{
if (!wobbly_data->key)
- wobbly_data->type = ETK_TREE2_MODEL_NORMAL;
+ wobbly_data->type = ETK_TREE_MODEL_NORMAL;
else if ((ext = strrchr(wobbly_data->filename, '.')) && strcasecmp(ext + 1, "eet") == 0)
- wobbly_data->type = ETK_TREE2_MODEL_NORMAL;
+ wobbly_data->type = ETK_TREE_MODEL_NORMAL;
else
- wobbly_data->type = ETK_TREE2_MODEL_EDJE;
+ wobbly_data->type = ETK_TREE_MODEL_EDJE;
}
/* If the object is not already in the cache, we load it */
@@ -180,7 +180,7 @@
edje_object_signal_emit(cell_objects[0], "e,action,thumb,gen", "e");
evas_object_pass_events_set(cell_objects[0], 1);
- if (wobbly_data->type == ETK_TREE2_MODEL_NORMAL)
+ if (wobbly_data->type == ETK_TREE_MODEL_NORMAL)
{
cell_objects[1] = evas_object_image_add(evas);
evas_object_show(cell_objects[1]);
@@ -190,7 +190,7 @@
if (!evas_object_image_load_error_get(cell_objects[1]))
object_created = ETK_TRUE;
else
- wobbly_data->type = ETK_TREE2_MODEL_NOT_FOUND;
+ wobbly_data->type = ETK_TREE_MODEL_NOT_FOUND;
}
/* If it's not a normal image file, then it's an Edje file... */
else
@@ -199,7 +199,7 @@
if (edje_object_file_set(cell_objects[1], wobbly_data->filename, wobbly_data->key))
object_created = ETK_TRUE;
else
- wobbly_data->type = ETK_TREE2_MODEL_NOT_FOUND;
+ wobbly_data->type = ETK_TREE_MODEL_NOT_FOUND;
}
edje_object_part_swallow(cell_objects[0], "swallow_icon", cell_objects[1]);
@@ -208,7 +208,7 @@
cell_objects[1] = edje_object_part_swallow_get(cell_objects[0], "swallow_icon");
/* If loading the image has failed, we destroy the objects and return */
- if (wobbly_data->type == ETK_TREE2_MODEL_NOT_FOUND)
+ if (wobbly_data->type == ETK_TREE_MODEL_NOT_FOUND)
{
evas_object_del(cell_objects[0]);
evas_object_del(cell_objects[1]);
@@ -227,12 +227,12 @@
}
/* Wobbly: width_get() */
-static int _wobbly_width_get(Etk_Tree2_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL])
+static int _wobbly_width_get(Etk_Tree_Model *model, void *cell_data, Evas_Object *cell_objects[MAX_OBJECTS_PER_MODEL])
{
- Etk_Tree2_Model_Wobbly *wobbly_model;
+ Etk_Tree_Model_Wobbly *wobbly_model;
int w;
- if (!(wobbly_model = (Etk_Tree2_Model_Wobbly *)model) || !cell_objects[0])
+ if (!(wobbly_model = (Etk_Tree_Model_Wobbly *)model) || !cell_objects[0])
return 0;
evas_object_geometry_get(cell_objects[0], NULL, NULL, &w, NULL);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_model_wobbly.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_model_wobbly.h 16 Jan 2007 03:34:49 -0000 1.2
+++ exhibit_model_wobbly.h 17 Jan 2007 01:30:09 -0000 1.3
@@ -1,8 +1,8 @@
-#ifndef _ETK_TREE2_MODEL_WOBBLY_H_
-#define _ETK_TREE2_MODEL_WOBBLY_H_
+#ifndef _ETK_TREE_MODEL_WOBBLY_H_
+#define _ETK_TREE_MODEL_WOBBLY_H_
#include <Etk.h>
-Etk_Tree2_Model *etk_tree2_model_wobbly_new(void);
+Etk_Tree_Model *etk_tree_model_wobbly_new(void);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- exhibit_options.c 16 Jan 2007 03:34:49 -0000 1.19
+++ exhibit_options.c 17 Jan 2007 01:30:09 -0000 1.20
@@ -477,8 +477,8 @@
/* SORTING */
e->options->default_sort = e->options->default_sort_tmp;
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
/* MONITOR FOCUS */
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_slideshow.c 16 Jan 2007 03:34:49 -0000 1.10
+++ exhibit_slideshow.c 17 Jan 2007 01:30:10 -0000 1.11
@@ -32,27 +32,27 @@
int
_ex_slideshow_next(void *data)
{
- Etk_Tree2_Row *row, *last_row;
+ Etk_Tree_Row *row, *last_row;
int i = 0;
int n = 0;
char string[80];
- row = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
- last_row = etk_tree2_last_row_get(ETK_TREE2(e->cur_tab->itree));
+ row = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
+ last_row = etk_tree_last_row_get(ETK_TREE(e->cur_tab->itree));
if(!row || row == last_row)
- row = etk_tree2_first_row_get(ETK_TREE2(e->cur_tab->itree));
+ row = etk_tree_first_row_get(ETK_TREE(e->cur_tab->itree));
else
- row = etk_tree2_row_next_get(row);
+ row = etk_tree_row_next_get(row);
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
#if 0
/* TODO: implement when Tree2 has this */
- etk_tree2_row_scroll_to(row, ETK_FALSE);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
#endif
- i = etk_tree2_num_rows_get(ETK_TREE2(e->cur_tab->itree));
- n = 1 + etk_tree2_row_num_get(ETK_TREE2(e->cur_tab->itree), row);
+ i = etk_tree_num_rows_get(ETK_TREE(e->cur_tab->itree));
+ n = 1 + etk_tree_row_num_get(ETK_TREE(e->cur_tab->itree), row);
sprintf(string, "Slideshow picture %d of %d", n, i);
etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
@@ -62,27 +62,27 @@
int
_ex_slideshow_prev(void *data)
{
- Etk_Tree2_Row *row, *first_row;
+ Etk_Tree_Row *row, *first_row;
int i = 0;
int n = 0;
char string[80];
- row = etk_tree2_selected_row_get(ETK_TREE2(e->cur_tab->itree));
- first_row = etk_tree2_first_row_get(ETK_TREE2(e->cur_tab->itree));
+ row = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
+ first_row = etk_tree_first_row_get(ETK_TREE(e->cur_tab->itree));
if(!row || row == first_row)
- row = etk_tree2_last_row_get(ETK_TREE2(e->cur_tab->itree));
+ row = etk_tree_last_row_get(ETK_TREE(e->cur_tab->itree));
else
- row = etk_tree2_row_prev_get(row);
+ row = etk_tree_row_prev_get(row);
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
#if 0
/* TODO: implemenet when this is done in Tree2 */
- etk_tree2_row_scroll_to(row, ETK_FALSE);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
#endif
- i = etk_tree2_num_rows_get(ETK_TREE2(e->cur_tab->itree));
- n = 1 + etk_tree2_row_num_get(ETK_TREE2(e->cur_tab->itree), row);
+ i = etk_tree_num_rows_get(ETK_TREE(e->cur_tab->itree));
+ n = 1 + etk_tree_row_num_get(ETK_TREE(e->cur_tab->itree), row);
sprintf(string, "Slideshow picture %d of %d", n, i);
etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[3]), string, 0);
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_sort.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_sort.c 16 Jan 2007 03:34:49 -0000 1.10
+++ exhibit_sort.c 17 Jan 2007 01:30:10 -0000 1.11
@@ -7,22 +7,22 @@
static Evas *evas_buf;
static int
-_ex_sort_itree_name_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+_ex_sort_itree_name_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
char *f1, *f2;
if (!row1 || !row2 || !col)
return 0;
- etk_tree2_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree2_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
+ etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
return strcasecmp(f1, f2);
}
static int
-_ex_sort_itree_size_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+_ex_sort_itree_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
char *f1, *f2;
struct stat s1, s2;
@@ -30,8 +30,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree2_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree2_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
+ etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
stat(f1, &s1);
stat(f2, &s2);
@@ -43,7 +43,7 @@
}
static int
-_ex_sort_itree_date_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+_ex_sort_itree_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
char *f1, *f2;
struct stat s1, s2;
@@ -51,8 +51,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree2_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree2_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
+ etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
stat(f1, &s1);
stat(f2, &s2);
@@ -64,7 +64,7 @@
}
static int
-_ex_sort_itree_resol_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
+_ex_sort_itree_resol_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
{
char *f1, *f2;
Evas_Object *i1, *i2;
@@ -73,8 +73,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree2_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree2_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
+ etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
if(!ee_buf)
{
@@ -119,7 +119,7 @@
{
#if 0
/* TODO: implement when this is supported */
- etk_tree2_sort(ETK_TREE2(e->cur_tab->itree), _ex_sort_itree_name_compare_cb,
+ etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_name_compare_cb,
ETK_TRUE, e->cur_tab->icol, NULL);
#endif
}
@@ -129,7 +129,7 @@
{
#if 0
/* TODO: implement when this is supported */
- etk_tree2_sort(ETK_TREE2(e->cur_tab->itree), _ex_sort_itree_size_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
+ etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_size_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
#endif
}
@@ -138,7 +138,7 @@
{
#if 0
/* TODO: implement when this is supported */
- etk_tree2_sort(ETK_TREE2(e->cur_tab->itree), _ex_sort_itree_resol_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
+ etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_resol_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
#endif
}
@@ -147,7 +147,7 @@
{
#if 0
/* TODO: implement when this is supported */
- etk_tree2_sort(ETK_TREE2(e->cur_tab->itree), _ex_sort_itree_date_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
+ etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_date_compare_cb, ETK_TRUE, e->cur_tab->icol, NULL);
#endif
}
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- exhibit_tab.c 16 Jan 2007 03:34:49 -0000 1.34
+++ exhibit_tab.c 17 Jan 2007 01:30:10 -0000 1.35
@@ -7,15 +7,15 @@
#define EX_DND_COL_NUM 5
static void _ex_tab_tree_drag_begin_cb(Etk_Object *object, void *data);
-static void _ex_tab_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree2_Row *row, void *event, void *data);
-static void _ex_tab_itree_item_clicked_cb(Etk_Object *object, Etk_Tree2_Row *row, void *data);
+static void _ex_tab_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void *event, void *data);
+static void _ex_tab_itree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
static void _ex_tab_itree_key_down_cb(Etk_Object *object, void *event, void *data);
Ex_Tab *
_ex_tab_new(Exhibit *e, char *dir)
{
Ex_Tab *tab;
- Etk_Tree2_Model *imodel;
+ Etk_Tree_Model *imodel;
char *file;
file = NULL;
@@ -42,32 +42,32 @@
tab->comment.visible = ETK_FALSE;
tab->image_loaded = ETK_FALSE;
- tab->dtree = etk_tree2_new();
+ tab->dtree = etk_tree_new();
etk_widget_size_request_set(tab->dtree, 180, 120);
etk_signal_connect("row_clicked", ETK_OBJECT(tab->dtree), ETK_CALLBACK(_ex_tab_dtree_item_clicked_cb), e);
- tab->dcol = etk_tree2_col_new(ETK_TREE2(tab->dtree), "Directories", 10, 0.0);
- etk_tree2_col_model_add(tab->dcol, etk_tree2_model_image_new());
- etk_tree2_col_model_add(tab->dcol, etk_tree2_model_text_new());
- etk_tree2_headers_visible_set(ETK_TREE2(tab->dtree), 0);
- etk_scrolled_view_policy_set(etk_tree2_scrolled_view_get(ETK_TREE2(tab->dtree)), ETK_POLICY_AUTO, ETK_POLICY_SHOW);
- etk_tree2_build(ETK_TREE2(tab->dtree));
+ tab->dcol = etk_tree_col_new(ETK_TREE(tab->dtree), "Directories", 10, 0.0);
+ etk_tree_col_model_add(tab->dcol, etk_tree_model_image_new());
+ etk_tree_col_model_add(tab->dcol, etk_tree_model_text_new());
+ etk_tree_headers_visible_set(ETK_TREE(tab->dtree), 0);
+ etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->dtree)), ETK_POLICY_AUTO, ETK_POLICY_SHOW);
+ etk_tree_build(ETK_TREE(tab->dtree));
- tab->itree = etk_tree2_new();
+ tab->itree = etk_tree_new();
etk_widget_dnd_source_set(ETK_WIDGET(tab->itree), ETK_TRUE);
// etk_signal_connect("drag_begin", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_tree_drag_begin_cb), tab);
etk_widget_size_request_set(tab->itree, 180, 220);
- etk_tree2_multiple_select_set(ETK_TREE2(tab->itree), ETK_TRUE);
+ etk_tree_multiple_select_set(ETK_TREE(tab->itree), ETK_TRUE);
etk_signal_connect("row_selected", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_item_clicked_cb), e);
etk_signal_connect("key_down", ETK_OBJECT(tab->itree), ETK_CALLBACK(_ex_tab_itree_key_down_cb), e);
- imodel = etk_tree2_model_wobbly_new();
- //etk_tree2_model_image_width_set(imodel, 80, 0.0);
- tab->icol = etk_tree2_col_new(ETK_TREE2(tab->itree), "Files", 10, 0.0);
- etk_tree2_col_model_add(tab->icol, imodel);
- etk_tree2_col_model_add(tab->icol, etk_tree2_model_text_new());
- etk_tree2_headers_visible_set(ETK_TREE2(tab->itree), 0);
- etk_tree2_rows_height_set(ETK_TREE2(tab->itree), 60);
- etk_scrolled_view_policy_set(etk_tree2_scrolled_view_get(ETK_TREE2(tab->itree)), ETK_POLICY_AUTO, ETK_POLICY_SHOW);
- etk_tree2_build(ETK_TREE2(tab->itree));
+ imodel = etk_tree_model_wobbly_new();
+ //etk_tree_model_image_width_set(imodel, 80, 0.0);
+ tab->icol = etk_tree_col_new(ETK_TREE(tab->itree), "Files", 10, 0.0);
+ etk_tree_col_model_add(tab->icol, imodel);
+ etk_tree_col_model_add(tab->icol, etk_tree_model_text_new());
+ etk_tree_headers_visible_set(ETK_TREE(tab->itree), 0);
+ etk_tree_rows_height_set(ETK_TREE(tab->itree), 60);
+ etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->itree)), ETK_POLICY_AUTO, ETK_POLICY_SHOW);
+ etk_tree_build(ETK_TREE(tab->itree));
if (dir)
tab->dir = strdup(dir);
@@ -273,8 +273,8 @@
static void _ex_tab_tree_drag_begin_cb(Etk_Object *object, void *data)
{
Ex_Tab *tab;
- Etk_Tree2 *tree;
- Etk_Tree2_Row *row;
+ Etk_Tree *tree;
+ Etk_Tree_Row *row;
Etk_Widget *drag;
Etk_Widget *image;
Evas_List *rows;
@@ -285,10 +285,10 @@
unsigned int num_types;
tab = data;
- tree = ETK_TREE2(object);
+ tree = ETK_TREE(object);
drag = (ETK_WIDGET(tree))->drag;
- rows = etk_tree2_selected_rows_get(tree);
+ rows = etk_tree_selected_rows_get(tree);
types = calloc(1, sizeof(char*));
num_types = 1;
@@ -312,7 +312,7 @@
char tmp[PATH_MAX];
row = ll->data;
- etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(tree, 0), &icol1_string, &icol2_string, etk_tree2_nth_col_get(tree, 1),NULL);
+ etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), &icol1_string, &icol2_string, etk_tree_nth_col_get(tree, 1),NULL);
snprintf(tmp, PATH_MAX * sizeof(char), "file://%s%s\r\n", tab->cur_path, icol2_string);
strncat(drag_data, tmp, PATH_MAX * evas_list_count(rows));
if (i <= EX_DND_MAX_NUM * EX_DND_MAX_NUM)
@@ -338,8 +338,8 @@
}
else
{
- row = etk_tree2_selected_row_get(tree);
- etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(tree, 0), &icol1_string, &icol2_string, etk_tree2_nth_col_get(tree, 1),NULL);
+ row = etk_tree_selected_row_get(tree);
+ etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), &icol1_string, &icol2_string, etk_tree_nth_col_get(tree, 1),NULL);
drag_data = calloc(PATH_MAX, sizeof(char));
snprintf(drag_data, PATH_MAX * sizeof(char), "file://%s%s\r\n", tab->cur_path, icol2_string);
image = etk_image_new_from_file(icol1_string, NULL);
@@ -353,40 +353,40 @@
}
static void
-_ex_tab_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree2_Row *row, void *event, void *data)
+_ex_tab_dtree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void *event, void *data)
{
- Etk_Tree2 *tree;
+ Etk_Tree *tree;
char *dcol_string;
Exhibit *e;
e = data;
_ex_slideshow_stop(e);
- tree = ETK_TREE2(object);
- etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(tree, 0), NULL, NULL, &dcol_string, NULL);
+ tree = ETK_TREE(object);
+ etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL, NULL, &dcol_string, NULL);
E_FREE(e->cur_tab->dir);
e->cur_tab->dir = strdup(dcol_string);
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
etk_notebook_page_tab_label_set(ETK_NOTEBOOK(e->notebook), etk_notebook_current_page_get(ETK_NOTEBOOK(e->notebook)), _ex_file_get(e->cur_tab->cur_path));
}
static void
-_ex_tab_itree_item_clicked_cb(Etk_Object *object, Etk_Tree2_Row *row, void *data)
+_ex_tab_itree_item_clicked_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
{
Exhibit *e;
- Etk_Tree2 *tree;
+ Etk_Tree *tree;
char *icol_string;
e = data;
e->zoom = 0;
_ex_main_statusbar_zoom_update(e);
- tree = ETK_TREE2(object);
+ tree = ETK_TREE(object);
- etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(tree, 0), NULL, NULL,
+ etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL, NULL,
&icol_string, NULL);
_ex_main_image_set(e, icol_string);
@@ -404,8 +404,8 @@
if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
{
e->cur_tab->dir = strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->itree));
- etk_tree2_clear(ETK_TREE2(e->cur_tab->dtree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_thumb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_thumb.c 16 Jan 2007 03:34:49 -0000 1.10
+++ exhibit_thumb.c 17 Jan 2007 01:30:10 -0000 1.11
@@ -25,20 +25,20 @@
if (ext)
{
- Etk_Tree2_Row *row;
+ Etk_Tree_Row *row;
thumb->image = (char*)epsilon_thumb_file_get(thumb->ep);
- row = etk_tree2_row_append(ETK_TREE2(thumb->e->cur_tab->itree),
+ row = etk_tree_row_append(ETK_TREE(thumb->e->cur_tab->itree),
NULL,
thumb->e->cur_tab->icol,
thumb->image, NULL,
thumb->name, NULL);
if(thumb->selected)
{
- etk_tree2_row_select(row);
+ etk_tree_row_select(row);
#if 0
/* TODO: implement when done in Tree2 */
- etk_tree2_row_scroll_to(row, ETK_TRUE);
+ etk_tree_row_scroll_to(row, ETK_TRUE);
#endif
}
E_FREE(thumb->image);
|