Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_icon_local_viewer.c filesystem.c
Log Message:
Icons
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_icon_local_viewer.c 2 Nov 2005 11:52:30 -0000 1.18
+++ ewl_icon_local_viewer.c 7 Nov 2005 11:20:17 -0000 1.19
@@ -449,6 +449,7 @@
/*Add some context menu items*/
context = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Copy selection");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_copy.png");
ewl_iconbox_context_menu_item_add(EWL_ICONBOX(viewer->iconbox),
context);
ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
ewl_iconbox_file_copy_cb, instance);
ewl_widget_show(context);
@@ -456,6 +457,7 @@
/*Add some context menu items*/
context = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Paste");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_paste.png");
ewl_iconbox_context_menu_item_add(EWL_ICONBOX(viewer->iconbox),
context);
ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
ewl_iconbox_file_paste_cb, instance);
ewl_widget_show(context);
@@ -480,9 +482,35 @@
ewl_widget_show(context);
+
+ /*---------------Icon Menu---------------*/
+
+ /*Copy*/
+ context = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Copy");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_copy.png");
+ ewl_widget_show(context);
+ ewl_iconbox_icon_menu_item_add(EWL_ICONBOX(viewer->iconbox), context);
+
+ //ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
icon_properties_cb, instance);
+ //
+
+ context = ewl_menu_item_new();
+ ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Cut");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_cut.png");
+ ewl_widget_show(context);
+ ewl_iconbox_icon_menu_item_add(EWL_ICONBOX(viewer->iconbox), context);
+ //ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
icon_properties_cb, instance);
+
+
+
+
+
+
/*Icon menu*/
context = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Delete file");
+ ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Delete");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_delete.png");
ewl_widget_show(context);
ewl_iconbox_icon_menu_item_add(EWL_ICONBOX(viewer->iconbox), context);
//ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
icon_properties_cb, instance);
@@ -490,6 +518,7 @@
/*Icon menu*/
context = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(context), "Properties");
+ ewl_menu_item_image_set(EWL_MENU_ITEM(context), PACKAGE_DATA_DIR
"/icons/e17_button_detail_delete.png");
ewl_widget_show(context);
ewl_iconbox_icon_menu_item_add(EWL_ICONBOX(viewer->iconbox), context);
ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN,
icon_properties_cb, instance);
@@ -510,12 +539,12 @@
/*Register out interest in receiving folder notifications*/
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FOLDER_CHANGE_CONTENTS));
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FOLDER_CHANGE_CONTENTS_EXTERNAL));
+
/*Register our interest in receiving file mod/create/delete
notifications*/
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_CHANGE));
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_CREATE));
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE));
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE_DIRECTORY));
-
/*Register interest in getting stat events*/
entropy_core_component_event_register(core, instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_STAT));
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- filesystem.c 5 Nov 2005 01:13:35 -0000 1.11
+++ filesystem.c 7 Nov 2005 11:20:17 -0000 1.12
@@ -53,8 +53,6 @@
watchers = ecore_hash_keys(folder_monitor_hash);
ecore_list_goto_first(watchers);
while ( (key = ecore_list_next(watchers))) {
- //printf("'%s' : '%s'\n",
((evfs_file_uri_path*)ecore_hash_get(folder_monitor_hash,
key))->files[0]->path, folder);
-
if ( !strcmp(
((evfs_file_uri_path*)ecore_hash_get(folder_monitor_hash,
key))->files[0]->path, folder)) {
char* md5 =
md5_entropy_path_file(folder, pos+1);
entropy_file_listener* listener;
@@ -79,7 +77,9 @@
entropy_free(folder);
} else {
- listener =
ecore_hash_get(((entropy_gui_component_instance*)key)->core->file_interest_list,
md5);
+ listener =
ecore_hash_get(((
+
entropy_gui_component_instance*)key)->core->file_interest_list, md5);
+
file=listener->file;
entropy_free(md5); /*We
don't need this one, we're returning an old ref*/
entropy_free(folder);
@@ -105,7 +105,8 @@
gui_event->event_type =
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE);
break;
case
EVFS_FILE_EV_REMOVE_DIRECTORY: //printf(" Change event\n");
-
gui_event->event_type =
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE_DIRECTORY);
+
gui_event->event_type =
+
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_FILE_REMOVE_DIRECTORY);
break;
@@ -150,11 +151,11 @@
memcpy(file_stat->stat_obj,
&data->stat.stat_obj, sizeof(struct stat));
/*Retrieve the file. This is bad - the file
might not exist anymore! */
- file_stat->file =
((entropy_file_listener*)ecore_hash_get(((entropy_gui_component_instance*)instance)->core->file_interest_list,
md5))->file;
+ file_stat->file =
((entropy_file_listener*)ecore_hash_get(((
+
entropy_gui_component_instance*)instance)->core->file_interest_list,
md5))->file;
- //printf("File got: md5 %s, pointer %p - '%s',
'%s'\n", md5, file_stat->file, file_stat->file->path,
file_stat->file->filename);
/*Build up the gui_event wrapper*/
gui_event =
entropy_malloc(sizeof(entropy_gui_event));
@@ -262,7 +263,8 @@
if (calling_request &&
(calling_request->drill_down || calling_request->set_parent)) {
printf("Calling request
had a parent...\n");
- printf("File ('%s')
parent's name is '%s'\n", file->filename,
calling_request->reparent_file->filename);
+ printf("File ('%s')
parent's name is '%s'\n",
+ file->filename,
calling_request->reparent_file->filename);
file->parent =
calling_request->reparent_file;
@@ -421,6 +423,7 @@
char dire[255];
char full_name[1024];
+ int count=0;
char posix_name[1024];
char *md5;
int filetype = -1;
@@ -507,6 +510,7 @@
//
}
+ count++;
}
closedir(dir);
@@ -559,7 +563,9 @@
printf("URI build says: '%s'\n", uri_build);
strcat(uri, uri_build);
} else if (request->file->parent) {
- printf("Retrieving mime-descend from
parent...'%s' for file with name '%s'\n", request->file->parent->mime_type,
request->file->parent->filename);
+ printf("Retrieving mime-descend from
parent...'%s' for file with name '%s'\n",
+ request->file->parent->mime_type,
request->file->parent->filename);
+
uri_retrieve =
entropy_core_descent_for_mime_get(request->core,request->file->parent->mime_type);
/*Special case handler for the root dir -
FIXME*/
@@ -602,6 +608,9 @@
new_request->drill_down = request->drill_down;
new_request->requester = request->requester;
new_request->file_type = request->file_type;
+
+ /*If it is a drilldown request - we must be at the root.
+ *Anything else, and we must be an 'embedded' request with a
parent*/
if (request->drill_down) {
ecore_hash_set(evfs_dir_requests, "/", new_request);
} else {
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs