Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c etk_list_viewer.c layout_etk_simple.c
Log Message:
* Seelction fixes
* Leak fixes
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_icon_viewer.c 7 Sep 2006 13:40:15 -0000 1.21
+++ etk_icon_viewer.c 8 Sep 2006 12:54:55 -0000 1.22
@@ -338,17 +338,32 @@
printf("ICONBOX: Copy request\n");
entropy_core_selected_files_clear();
+ entropy_core_selection_type_set(ENTROPY_SELECTION_COPY);
selected = entropy_etk_icon_viewer_selected_get(viewer);
ecore_list_goto_first(selected);
while ( (file = ecore_list_next(selected))) {
entropy_core_selected_file_add(file);
}
+ ecore_list_destroy(selected);
}
break;
case ENTROPY_NOTIFY_CUT_REQUEST: {
- printf("ICONBOX: Cut request\n");
+ Ecore_List* selected;
+ entropy_generic_file* file;
+
+ printf("ICONBOX: Cut request\n");
+
+ entropy_core_selected_files_clear();
+ entropy_core_selection_type_set(ENTROPY_SELECTION_CUT);
+ selected = entropy_etk_icon_viewer_selected_get(viewer);
+
+ ecore_list_goto_first(selected);
+ while ( (file = ecore_list_next(selected))) {
+ entropy_core_selected_file_add(file);
+ }
+ ecore_list_destroy(selected);
}
break;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- etk_list_viewer.c 7 Sep 2006 13:40:15 -0000 1.73
+++ etk_list_viewer.c 8 Sep 2006 12:54:55 -0000 1.74
@@ -56,6 +56,7 @@
void *el, entropy_gui_component_instance * comp);
void gui_file_destroy (gui_file * file);
int entropy_plugin_type_get ();
+Ecore_List* entropy_etk_list_viewer_selected_get(entropy_etk_file_list_viewer*
viewer);
/*-------------*/
@@ -475,6 +476,27 @@
}
+Ecore_List* entropy_etk_list_viewer_selected_get(entropy_etk_file_list_viewer*
viewer)
+{
+ Evas_List* rows;
+ Ecore_List* ret_files;
+ Etk_Tree_Row* row;
+ gui_file* file;
+
+ ret_files = ecore_list_new();
+
+ rows = etk_tree_selected_rows_get(ETK_TREE(viewer->tree));
+ for (; rows; rows = rows->next ) {
+ file = ((gui_file*)ecore_hash_get(etk_list_viewer_row_hash,
rows->data));
+
+ ecore_list_append(ret_files, file->file);
+ }
+
+ evas_list_free(rows);
+
+ return ret_files;
+}
+
void
list_viewer_add_row (entropy_gui_component_instance * instance,
entropy_generic_file * file)
@@ -713,7 +735,45 @@
}
} //End case
- break;
+ break;
+
+
+ case ENTROPY_NOTIFY_COPY_REQUEST: {
+ Ecore_List* selected;
+ entropy_generic_file* file;
+
+ printf("LIST: Copy request\n");
+
+ entropy_core_selected_files_clear();
+ entropy_core_selection_type_set(ENTROPY_SELECTION_COPY);
+ selected = entropy_etk_list_viewer_selected_get(viewer);
+
+ ecore_list_goto_first(selected);
+ while ( (file = ecore_list_next(selected))) {
+ entropy_core_selected_file_add(file);
+ }
+ ecore_list_destroy(selected);
+ }
+ break;
+
+ case ENTROPY_NOTIFY_CUT_REQUEST: {
+ Ecore_List* selected;
+ entropy_generic_file* file;
+
+ printf("LIST: Cut request\n");
+
+ entropy_core_selected_files_clear();
+ entropy_core_selection_type_set(ENTROPY_SELECTION_CUT);
+ selected = entropy_etk_list_viewer_selected_get(viewer);
+
+ ecore_list_goto_first(selected);
+ while ( (file = ecore_list_next(selected))) {
+ entropy_core_selected_file_add(file);
+ }
+ ecore_list_destroy(selected);
+
+ }
+ break;
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- layout_etk_simple.c 7 Sep 2006 13:40:15 -0000 1.68
+++ layout_etk_simple.c 8 Sep 2006 12:54:55 -0000 1.69
@@ -486,7 +486,6 @@
ev = event;
- /*FIXME: How do we do modifiers now?*/
if ((ev->modifiers & ETK_MODIFIER_CTRL))
{
if (!strcmp(ev->key, "q")) {
@@ -654,9 +653,11 @@
char* f_uri = cfolder->uri;
if (f_uri) {
if (stype == ENTROPY_SELECTION_COPY) {
+ printf("Copy type..: %d:%s\n",
ecore_list_nodes(files), f_uri);
entropy_plugin_filesystem_file_copy_multi(files, f_uri,
comp);
} else if (stype == ENTROPY_SELECTION_CUT) {
+ printf("Cut type..:%d:%s\n",
ecore_list_nodes(files), f_uri);
entropy_plugin_filesystem_file_move_multi(files, f_uri,
comp);
} else {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
