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
Log Message:
* Delete dialog behaviour rationalisation
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- etk_icon_viewer.c 5 Aug 2007 01:00:48 -0000 1.28
+++ etk_icon_viewer.c 5 Aug 2007 12:25:22 -0000 1.29
@@ -250,6 +250,7 @@
{
Etk_Event_Key_Down *key_event = event;
Etk_Iconbox* iconbox = ETK_ICONBOX(object);
+ Ecore_List* del = NULL;
if (!strcmp(key_event->key, "Delete")) {
Etk_Iconbox_Icon* icon;
@@ -267,10 +268,15 @@
if (key_event->modifiers & ETK_MODIFIER_SHIFT) {
entropy_plugin_filesystem_file_remove(file,
(entropy_gui_component_instance*)data);
} else {
- entropy_etk_delete_dialog_new(file,
(entropy_gui_component_instance*)data);
+ if (!del) del = ecore_list_new();
+ ecore_list_append(del, file);
}
}
}
+ }
+
+ if (del && ecore_list_count(del)) {
+
entropy_etk_delete_dialog_new((entropy_gui_component_instance*)data, del);
}
}
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- etk_list_viewer.c 2 Aug 2007 04:36:02 -0000 1.87
+++ etk_list_viewer.c 5 Aug 2007 12:25:22 -0000 1.88
@@ -204,13 +204,13 @@
Etk_Tree* tree;
Evas_List* row_list = NULL;
gui_file* file;
+ Ecore_List* del = NULL;
tree = ETK_TREE(object);
- for (iter = etk_tree_first_row_get(tree); iter; iter =
etk_tree_row_walk_next(iter, ETK_TRUE))
- if (iter->selected == ETK_TRUE) row_list =
evas_list_append(row_list, iter);
-
if (!strcmp(key_event->key, "Delete")) {
+ for (iter = etk_tree_first_row_get(tree); iter; iter =
etk_tree_row_walk_next(iter, ETK_TRUE))
+ if (iter->selected == ETK_TRUE) row_list =
evas_list_append(row_list, iter);
printf("Delete pressed!\n");
for (; row_list; row_list = row_list->next ) {
@@ -222,15 +222,22 @@
if (key_event->modifiers & ETK_MODIFIER_SHIFT) {
entropy_plugin_filesystem_file_remove(file->file,
(entropy_gui_component_instance*)data);
} else {
- entropy_etk_delete_dialog_new(file->file,
(entropy_gui_component_instance*)data);
+ if (!del) del = ecore_list_new();
+ ecore_list_append(del, file->file);
}
}
}
+ evas_list_free(row_list);
+
+ if (del && ecore_list_count(del)) {
+
entropy_etk_delete_dialog_new((entropy_gui_component_instance*)data, del);
+ }
+
}
- evas_list_free(row_list);
+
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
