Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_model_wobbly.c exhibit_sort.c
Log Message:
And thanks to Simon's tree sorting code, exhibit has sorting again
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- exhibit_main.c 25 Mar 2007 18:38:03 -0000 1.97
+++ exhibit_main.c 5 Apr 2007 09:31:28 -0000 1.98
@@ -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_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
+static int _ex_main_dtree_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, 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);
@@ -187,7 +187,7 @@
}
static int
-_ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row
*row2, Etk_Tree_Col *col, void *data)
+_ex_main_dtree_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1, Etk_Tree_Row
*row2, void *data)
{
char *dir1, *dir2;
@@ -291,12 +291,9 @@
_ex_sort_resol_cb(NULL, NULL);
}
-#if 0
- /* TODO: implement this when tree2 has sorting */
if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
- etk_tree_sort(ETK_TREE(e->cur_tab->dtree), _ex_main_dtree_compare_cb,
- ETK_TRUE, e->cur_tab->dcol, NULL);
-#endif
+ etk_tree_col_sort_full(e->cur_tab->dcol, _ex_main_dtree_compare_cb,
+ NULL, ETK_TRUE);
if (!e->cur_tab->monitor)
{
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_model_wobbly.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_model_wobbly.c 17 Jan 2007 01:30:09 -0000 1.3
+++ exhibit_model_wobbly.c 5 Apr 2007 09:31:29 -0000 1.4
@@ -29,9 +29,9 @@
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_objects_cache(Etk_Tree_Model *model, void *cell_data,
Evas_Object *cell_objects[ETK_TREE_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[ETK_TREE_MAX_OBJECTS_PER_MODEL], Evas *evas);
+static int _wobbly_width_get(Etk_Tree_Model *model, void *cell_data,
Evas_Object *cell_objects[ETK_TREE_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);
@@ -126,7 +126,7 @@
}
/* Wobbly: objects_cache() */
-static void _wobbly_objects_cache(Etk_Tree_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[ETK_TREE_MAX_OBJECTS_PER_MODEL])
{
Etk_Tree_Model_Wobbly *wobbly_model;
Etk_Tree_Model_Wobbly_Data *wobbly_data;
@@ -148,7 +148,7 @@
}
/* Wobbly: render() */
-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 Etk_Bool _wobbly_render(Etk_Tree_Model *model, Etk_Tree_Row *row,
Etk_Geometry geometry, void *cell_data, Evas_Object
*cell_objects[ETK_TREE_MAX_OBJECTS_PER_MODEL], Evas *evas)
{
Etk_Tree_Model_Wobbly *wobbly_model;
Etk_Tree_Model_Wobbly_Data *wobbly_data;
@@ -227,7 +227,7 @@
}
/* Wobbly: width_get() */
-static int _wobbly_width_get(Etk_Tree_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[ETK_TREE_MAX_OBJECTS_PER_MODEL])
{
Etk_Tree_Model_Wobbly *wobbly_model;
int w;
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_sort.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_sort.c 17 Jan 2007 01:30:10 -0000 1.11
+++ exhibit_sort.c 5 Apr 2007 09:31:29 -0000 1.12
@@ -7,22 +7,22 @@
static Evas *evas_buf;
static int
-_ex_sort_itree_name_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+_ex_sort_itree_name_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, void *data)
{
char *f1, *f2;
if (!row1 || !row2 || !col)
return 0;
- etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
-
+ etk_tree_row_fields_get(row1, col, NULL, NULL, &f1, NULL);
+ etk_tree_row_fields_get(row2, col, NULL, NULL, &f2, NULL);
+
return strcasecmp(f1, f2);
}
static int
-_ex_sort_itree_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+_ex_sort_itree_size_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, void *data)
{
char *f1, *f2;
struct stat s1, s2;
@@ -30,8 +30,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, NULL, &f1, NULL);
+ etk_tree_row_fields_get(row2, col, NULL, NULL, &f2, NULL);
stat(f1, &s1);
stat(f2, &s2);
@@ -43,7 +43,7 @@
}
static int
-_ex_sort_itree_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+_ex_sort_itree_date_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, void *data)
{
char *f1, *f2;
struct stat s1, s2;
@@ -51,8 +51,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, NULL, &f1, NULL);
+ etk_tree_row_fields_get(row2, col, NULL, NULL, &f2, NULL);
stat(f1, &s1);
stat(f2, &s2);
@@ -64,7 +64,7 @@
}
static int
-_ex_sort_itree_resol_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+_ex_sort_itree_resol_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, void *data)
{
char *f1, *f2;
Evas_Object *i1, *i2;
@@ -73,8 +73,8 @@
if (!row1 || !row2 || !col)
return 0;
- etk_tree_row_fields_get(row1, col, NULL, &f1, NULL,NULL);
- etk_tree_row_fields_get(row2, col, NULL, &f2, NULL,NULL);
+ etk_tree_row_fields_get(row1, col, NULL, NULL, &f1, NULL);
+ etk_tree_row_fields_get(row2, col, NULL, NULL, &f2, NULL);
if(!ee_buf)
{
@@ -117,38 +117,29 @@
void
_ex_sort_name_cb(Etk_Object *obj, void *data)
{
-#if 0
- /* TODO: implement when this is supported */
- etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_name_compare_cb,
- ETK_TRUE, e->cur_tab->icol, NULL);
-#endif
+ etk_tree_col_sort_full(etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree),
0), _ex_sort_itree_name_compare_cb,
+ NULL, ETK_TRUE);
}
void
_ex_sort_size_cb(Etk_Object *obj, void *data)
{
-#if 0
- /* TODO: implement when this is supported */
- etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_size_compare_cb,
ETK_TRUE, e->cur_tab->icol, NULL);
-#endif
+ etk_tree_col_sort_full(e->cur_tab->icol, _ex_sort_itree_size_compare_cb,
+ NULL, ETK_TRUE);
}
void
_ex_sort_resol_cb(Etk_Object *obj, void *data)
{
-#if 0
- /* TODO: implement when this is supported */
- etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_resol_compare_cb,
ETK_TRUE, e->cur_tab->icol, NULL);
-#endif
+ etk_tree_col_sort_full(e->cur_tab->icol, _ex_sort_itree_resol_compare_cb,
+ NULL, ETK_TRUE);
}
void
_ex_sort_date_cb(Etk_Object *obj, void *data)
{
-#if 0
- /* TODO: implement when this is supported */
- etk_tree_sort(ETK_TREE(e->cur_tab->itree), _ex_sort_itree_date_compare_cb,
ETK_TRUE, e->cur_tab->icol, NULL);
-#endif
+ etk_tree_col_sort_full(e->cur_tab->icol, _ex_sort_itree_date_compare_cb,
+ NULL, ETK_TRUE);
}
void
-------------------------------------------------------------------------
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
