Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_structure_viewer.c layout_etk_simple.c
Log Message:
* etk_tree->etk_tree2 . DND temporarily disabled
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_structure_viewer.c 30 Dec 2006 13:43:34 -0000 1.31
+++ etk_structure_viewer.c 3 Jan 2007 01:47:39 -0000 1.32
@@ -16,7 +16,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree_Col* tree_col1;
+ Etk_Tree2_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* row_hash;
@@ -67,17 +67,20 @@
{
Etk_Event_Selection_Request *ev;
Etk_Selection_Data_Files *files;
- Etk_Tree* tree;
- Etk_Tree_Row* row;
+ Etk_Tree2* tree;
+ Etk_Tree2_Row* row;
int i;
entropy_etk_file_structure_viewer* viewer;
entropy_gui_component_instance* instance;
event_file_core* e_event;
+
+ /*FIXME - DND is disabled during the transition to tree2*/
+ return;
ev = event;
files = ev->data;
- tree = ETK_TREE(object);
- row = etk_tree_selected_row_get(tree);
+ tree = ETK_TREE2(object);
+ //row = etk_tree2_selected_row_get(tree);
instance = ecore_hash_get(instance_map_hash, row);
if (instance) {
@@ -120,7 +123,7 @@
}
}
-static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object,
Etk_Tree2_Row *row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_structure_viewer* viewer;
@@ -136,7 +139,7 @@
printf("Post\n");
instance = ecore_hash_get(instance_map_hash, row);
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (instance) {
viewer = instance->data;
e_event = ecore_hash_get(viewer->row_hash, row);
@@ -159,28 +162,28 @@
-Etk_Tree_Row*
+Etk_Tree2_Row*
structure_viewer_add_row (entropy_gui_component_instance * instance,
- entropy_generic_file * file, Etk_Tree_Row * prow)
+ entropy_generic_file * file, Etk_Tree2_Row * prow)
{
- Etk_Tree_Row* new_row;
+ Etk_Tree2_Row* new_row;
entropy_etk_file_structure_viewer* viewer;
event_file_core *event;
- Etk_Tree_Col* col;
- Etk_Tree_Row* parent;
+ Etk_Tree2_Col* col;
+ Etk_Tree2_Row* parent;
viewer = instance->data;
- parent = (Etk_Tree_Row*)viewer->parent_visual;
+ parent = (Etk_Tree2_Row*)viewer->parent_visual;
- col = etk_tree_nth_col_get(ETK_TREE(parent->tree), 0);
- etk_tree_freeze(ETK_TREE(viewer->tree));
+ col = etk_tree2_nth_col_get(ETK_TREE2(parent->tree), 0);
+ etk_tree2_freeze(ETK_TREE2(viewer->tree));
if (!prow) {
- new_row =
etk_tree_append_to_row((Etk_Tree_Row*)viewer->parent_visual, col,
+ 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);
} else {
- new_row = etk_tree_append_to_row(prow, col,
+ 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);
}
@@ -196,7 +199,7 @@
/*Save this file in this list of files we're responsible for */
ecore_list_append (viewer->files, event->file);
- etk_tree_thaw(ETK_TREE(viewer->tree));
+ etk_tree2_thaw(ETK_TREE2(viewer->tree));
return new_row;
}
@@ -212,7 +215,7 @@
switch (eevent->event_type) {
case ENTROPY_NOTIFY_FILELIST_REQUEST_EXTERNAL:
case ENTROPY_NOTIFY_FILELIST_REQUEST:{
- Etk_Tree_Row* row = NULL;
+ Etk_Tree2_Row* row = NULL;
entropy_generic_file *file;
entropy_generic_file *event_file =
((entropy_file_request *) eevent->data)->file;
@@ -253,7 +256,7 @@
}
if (row)
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (row) {
ecore_list_goto_first (el);
@@ -276,7 +279,7 @@
structure_viewer_add_row (comp, file,
row);
ecore_hash_set (viewer->loaded_dirs, row,
(int*)1);
}
- etk_tree_row_expand(row);
+ etk_tree2_row_unfold(row);
}
}
@@ -289,7 +292,7 @@
entropy_generic_file* file = el;
entropy_generic_file* parent_file = NULL;
- Etk_Tree_Row* row = NULL;
+ Etk_Tree2_Row* row = NULL;
parent_file = entropy_core_parent_folder_file_get(file);
@@ -310,11 +313,11 @@
case ENTROPY_NOTIFY_FILE_REMOVE_DIRECTORY: {
entropy_generic_file* file = el;
- Etk_Tree_Row* row = NULL;
+ Etk_Tree2_Row* row = NULL;
row = ecore_hash_get (viewer->row_folder_hash, file);
if (row) {
- etk_tree_row_del(row);
+ etk_tree2_row_delete(row);
ecore_hash_remove(viewer->row_folder_hash, file);
}
@@ -358,13 +361,6 @@
viewer->loaded_dirs = ecore_hash_new(ecore_direct_hash,
ecore_direct_compare);
viewer->parent_visual = parent_visual;
- /*viewer->tree = etk_tree_new();
- etk_tree_mode_set(ETK_TREE(viewer->tree), ETK_TREE_MODE_TREE);
- viewer->tree_col1 = etk_tree_col_new(ETK_TREE(viewer->tree), _("Files"),
- etk_tree_model_icon_text_new(ETK_TREE(viewer->tree),
ETK_TREE_FROM_EDJE), 60);
- etk_tree_col_expand_set(viewer->tree_col1, ETK_TRUE);
- etk_tree_build(ETK_TREE(viewer->tree));*/
-
instance->data = viewer;
instance->core = core;
instance->gui_object = viewer->tree;
@@ -399,22 +395,27 @@
etk_callback_setup = 1;
}
- 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 ),
+ 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 ),
ETK_CALLBACK(_etk_structure_viewer_row_clicked), NULL);
+
+
/*Accept drops*/
const char *dnd_types[] = { "text/uri-list" };
int dnd_types_num;
dnd_types_num = 1;
- etk_widget_dnd_types_set(
ETK_WIDGET(((Etk_Tree_Row*)parent_visual)->tree),
+ etk_widget_dnd_types_set(
ETK_WIDGET(((Etk_Tree2_Row*)parent_visual)->tree),
dnd_types, dnd_types_num);
- etk_widget_dnd_dest_set(
ETK_WIDGET(((Etk_Tree_Row*)parent_visual)->tree) , ETK_TRUE);
- etk_signal_connect("drag_drop", ETK_OBJECT(
((Etk_Tree_Row*)parent_visual)->tree ),
-
ETK_CALLBACK(_etk_structure_viewer_xdnd_drag_drop_cb), NULL);
+ etk_widget_dnd_dest_set(
ETK_WIDGET(((Etk_Tree2_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_CALLBACK(_etk_structure_viewer_xdnd_drag_drop_cb), NULL);*/
- ecore_hash_set(tree_map_hash, ((Etk_Tree_Row*)parent_visual)->tree,
(int*)1);
+ ecore_hash_set(tree_map_hash, ((Etk_Tree2_Row*)parent_visual)->tree,
(int*)1);
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- layout_etk_simple.c 8 Sep 2006 12:54:55 -0000 1.69
+++ layout_etk_simple.c 3 Jan 2007 01:47:39 -0000 1.70
@@ -29,7 +29,7 @@
typedef struct _layout_etk_row_structure_plugin
_layout_etk_row_structure_plugin;
struct _layout_etk_row_structure_plugin {
- Etk_Tree_Row* row;
+ Etk_Tree2_Row* row;
entropy_plugin* structure_plugin;
};
@@ -45,7 +45,7 @@
Etk_Widget *paned;
Etk_Widget *statusbar_box;
Etk_Widget *statusbars[3];
- Etk_Tree_Row* delete_row; /*The row pending deletion, if any*/
+ Etk_Tree2_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_Tree_Row* row = gui->delete_row;
+ Etk_Tree2_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_tree_row_del(ref->row);
+ etk_tree2_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_Tree_Row *row, Etk_Event_Mouse_Down *event, void *data)
+ Etk_Tree2_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_tree_row_select(row);
+ etk_tree2_row_select(row);
etk_menu_popup(ETK_MENU(gui->popup));
}
@@ -277,14 +277,14 @@
entropy_plugin *structure;
entropy_generic_file* file;
- Etk_Tree_Row* row;
- Etk_Tree_Col* col;
+ Etk_Tree2_Row* row;
+ Etk_Tree2_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_tree_nth_col_get(ETK_TREE(gui->tree), 0);
+ col = etk_tree2_nth_col_get(ETK_TREE2(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_tree_freeze(ETK_TREE(gui->tree));
- row = etk_tree_append(ETK_TREE(gui->tree), col,
+ etk_tree2_freeze(ETK_TREE2(gui->tree));
+ row = etk_tree2_row_append(ETK_TREE2(gui->tree), NULL, col,
icon_string, structure_obj->name, NULL);
- etk_tree_thaw(ETK_TREE(gui->tree));
+ etk_tree2_thaw(ETK_TREE2(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_Tree_Col* col;
+ Etk_Tree2_Col* col;
Etk_Widget* vbox;
Etk_Widget* menubar;
Etk_Widget* menu_item;
@@ -784,17 +784,17 @@
etk_container_add(ETK_CONTAINER(window), vbox);
/*Tree init*/
- gui->tree = etk_tree_new();
+ gui->tree = etk_tree2_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_tree_mode_set(ETK_TREE(gui->tree), ETK_TREE_MODE_TREE);
- col = etk_tree_col_new(ETK_TREE(gui->tree), _("Folders"),
- etk_tree_model_icon_text_new(ETK_TREE(gui->tree),
ETK_TREE_FROM_FILE), 60);
+ 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);
- etk_tree_col_expand_set(col, ETK_TRUE);
- etk_tree_build(ETK_TREE(gui->tree));
+ etk_tree2_col_expand_set(col, ETK_TRUE);
+ etk_tree2_build(ETK_TREE2(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
