Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
* Implement copy/paste via the context menu. Accelerators to come
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_file_context_menu.c 20 Jul 2006 17:49:58 -0000 1.12
+++ etk_file_context_menu.c 11 Aug 2006 11:11:59 -0000 1.13
@@ -140,8 +140,18 @@
static void
_entropy_etk_context_menu_file_delete_cb(Etk_Object *object, void *data)
{
-
entropy_plugin_filesystem_file_remove(_entropy_etk_context_menu_current_file,
+ if (_entropy_etk_context_menu_mode ==0) {
+
entropy_plugin_filesystem_file_remove(_entropy_etk_context_menu_current_file,
_entropy_etk_context_menu_current_instance);
+ } else {
+ entropy_generic_file* file;
+
+ ecore_list_goto_first(_entropy_etk_context_menu_selected_files);
+ while ( (file =
ecore_list_next(_entropy_etk_context_menu_selected_files))) {
+ entropy_plugin_filesystem_file_remove(file,
+ _entropy_etk_context_menu_current_instance);
+ }
+ }
}
static void
@@ -151,6 +161,48 @@
}
static void
+_entropy_etk_context_menu_group_file_paste_cb(Etk_Object *object, void *data)
+{
+ Ecore_List* files = entropy_core_selected_files_get();
+
+ if (_entropy_etk_context_menu_current_file) {
+ if (!strcmp(_entropy_etk_context_menu_current_file->mime_type,
"file/folder"))
+ _entropy_etk_context_menu_current_folder =
_entropy_etk_context_menu_current_file;
+ else
+ _entropy_etk_context_menu_current_folder =
+
entropy_core_parent_folder_file_get(_entropy_etk_context_menu_current_file);
+
+ if (_entropy_etk_context_menu_current_folder) {
+ char* f_uri =
_entropy_etk_context_menu_current_folder->uri;
+ if (f_uri)
+
entropy_plugin_filesystem_file_copy_multi(files, f_uri,
+
_entropy_etk_context_menu_current_instance);
+ } else {
+ printf("Current folder is NULL at context menu\n");
+ }
+ }
+
+ }
+
+static void
+_entropy_etk_context_menu_group_file_copy_cb(Etk_Object *object, void *data)
+{
+ entropy_core_selected_files_clear();
+
+ if (_entropy_etk_context_menu_mode == 0) {
+
entropy_core_selected_file_add(_entropy_etk_context_menu_current_file);
+ } else {
+ entropy_generic_file* file;
+
+ ecore_list_goto_first(_entropy_etk_context_menu_selected_files);
+ while ( (file =
ecore_list_next(_entropy_etk_context_menu_selected_files))) {
+ entropy_core_selected_file_add(file);
+ }
+
+ }
+}
+
+static void
_entropy_etk_context_menu_group_file_add_remove_cb(Etk_Object *object, void
*data)
{
const char* label;
@@ -334,9 +386,16 @@
ETK_MENU(_entropy_etk_context_menu_groups_remove_from));
- _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Copy
(Ctrl-c)"), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL);
+ menu_item =
+ _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Copy
(Ctrl-c)"), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL);
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_group_file_copy_cb),NULL);
+
_entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Cut
(Ctrl-x)"), ETK_STOCK_EDIT_CUT, ETK_MENU_SHELL(menu),NULL);
- _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Paste
(Ctrl-v)"), ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu),NULL);
+
+ menu_item =
+ _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Paste
(Ctrl-v)"), ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu),NULL);
+ etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_group_file_paste_cb),NULL);
+
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL,
_("Delete (Del)"), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL);
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_file_delete_cb), NULL);
-------------------------------------------------------------------------
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
