Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c etk_structure_viewer.c layout_etk_simple.c
Log Message:
* Commit for new tree2 api (thanks hisham!)
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- etk_list_viewer.c 3 Jan 2007 02:04:28 -0000 1.77
+++ etk_list_viewer.c 5 Jan 2007 19:32:35 -0000 1.78
@@ -555,7 +555,7 @@
if (!file->retrieved_stat) {
new_row = etk_tree2_row_append(ETK_TREE2(viewer->tree), NULL,
- col1, thumbnail_filename,
+ col1, thumbnail_filename, NULL,
col2, file->filename,
col4, file->mime_type,
NULL);
@@ -568,7 +568,7 @@
date_buffer[strlen(date_buffer)-1] = '\0';
new_row = etk_tree2_row_append(ETK_TREE2(viewer->tree), NULL,
- col1, thumbnail_filename,
+ col1, thumbnail_filename, NULL,
col2, file->filename,
col3, buffer,
col4, file->mime_type,
@@ -671,7 +671,7 @@
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);
-
+
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';
@@ -736,7 +736,7 @@
etk_tree2_freeze(ETK_TREE2(viewer->tree));
etk_tree2_row_fields_set((Etk_Tree2_Row*)obj->icon,
- col1, obj->thumbnail->thumbnail_filename,
+ col1, obj->thumbnail->thumbnail_filename, NULL,
NULL);
etk_tree2_thaw(ETK_TREE2(viewer->tree));
@@ -824,22 +824,26 @@
viewer->tree = etk_tree2_new();
etk_tree2_mode_set(ETK_TREE2(viewer->tree), ETK_TREE2_MODE_LIST);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Icon"),
- etk_tree2_model_image_new(ETK_TREE2(viewer->tree),
ETK_TREE2_FROM_FILE), 48);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree),
_("Filename"),
- etk_tree2_model_text_new(ETK_TREE2(viewer->tree)), 150);
+ 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_tree2_col_new(ETK_TREE2(viewer->tree),
_("Filename"), 150,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_filename_compare_cb, NULL);
- viewer->tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer->tree), _("Size"),
- etk_tree2_model_text_new(ETK_TREE2(viewer->tree)),60);
+ 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_tree2_col_new(ETK_TREE2(viewer->tree), _("Type"),
- etk_tree2_model_text_new(ETK_TREE2(viewer->tree)),65);
+ 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());
+
etk_tree2_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"),
- etk_tree2_model_text_new(ETK_TREE2(viewer->tree)),90);
+ 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());
+
etk_tree2_col_sort_set(viewer->tree_col1, _entropy_etk_list_date_compare_cb,
NULL);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- etk_structure_viewer.c 3 Jan 2007 01:47:39 -0000 1.32
+++ etk_structure_viewer.c 5 Jan 2007 19:32:35 -0000 1.33
@@ -180,11 +180,11 @@
if (!prow) {
- new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer->parent_visual)->tree,
(Etk_Tree2_Row*)viewer->parent_visual, col,
- PACKAGE_DATA_DIR "/icons/folder.png",
_(file->filename), NULL);
+ new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer->parent_visual)->tree,
(Etk_Tree2_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,
- PACKAGE_DATA_DIR "/icons/folder.png",
_(file->filename), NULL);
+ PACKAGE_DATA_DIR "/icons/folder.png", NULL,
_(file->filename), NULL);
}
ecore_hash_set(instance_map_hash, new_row, instance);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- layout_etk_simple.c 3 Jan 2007 01:47:39 -0000 1.70
+++ layout_etk_simple.c 5 Jan 2007 19:32:35 -0000 1.71
@@ -304,8 +304,8 @@
etk_tree2_freeze(ETK_TREE2(gui->tree));
- row = etk_tree2_row_append(ETK_TREE2(gui->tree), NULL, col,
- icon_string, structure_obj->name, NULL);
+ row = etk_tree2_row_append(ETK_TREE2(gui->tree), NULL, col,
+ icon_string, NULL, structure_obj->name, NULL);
etk_tree2_thaw(ETK_TREE2(gui->tree));
@@ -790,8 +790,9 @@
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"),
- etk_tree2_model_icon_text_new(ETK_TREE2(gui->tree),
ETK_TREE2_FROM_FILE), 60);
+ 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_tree2_col_expand_set(col, ETK_TRUE);
etk_tree2_build(ETK_TREE2(gui->tree));
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
