Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am ewl_icon_local_viewer.c ewl_tip.c
layout_ewl_simple.c
Log Message:
* About dialog beginning
* Cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 2 Jan 2006 09:05:42 -0000 1.13
+++ Makefile.am 11 Jan 2006 10:55:38 -0000 1.14
@@ -56,7 +56,7 @@
layout_ewl_simple_la_SOURCES = $(top_srcdir)/src/entropy_gui.c \
ewl_mime_dialog.c layout_ewl_simple.c
$(top_srcdir)/src/entropy_debug.c \
- ewl_tip.c
+ ewl_tip.c ewl_about_dialog.c
layout_ewl_simple_la_CFLAGS = @EWL_CFLAGS@
layout_ewl_simple_la_LDFLAGS = -module -avoid-version
layout_ewl_simple_la_LIBADD = @EWL_LIBS@
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_icon_local_viewer.c 11 Jan 2006 04:56:19 -0000 1.50
+++ ewl_icon_local_viewer.c 11 Jan 2006 10:55:39 -0000 1.51
@@ -119,7 +119,7 @@
if (local_file->file && local_file->file->retrieved_stat) {
snprintf(buffer,1024, "File type: %s\nSize: %d kb",
local_file->file->mime_type,
- local_file->file->properties.st_size/1024);
+ (int)local_file->file->properties.st_size/1024);
ewl_text_text_set(EWL_TEXT(viewer->hover_properties), buffer);
}
@@ -153,8 +153,6 @@
while ( (file = ecore_list_next(selected)) ) {
(*copy_func)(file,
((entropy_icon_viewer*)instance->data)->current_dir, instance );
}
-
-
}
void ewl_iconbox_file_copy_cb(Ewl_Widget *w , void *ev_data , void *user_data
) {
@@ -207,8 +205,6 @@
if (!local_file) { printf ("*Alert* Couldn't find a local file
reference for icon\n"); }
-
-
if (ev->clicks > 1) {
if (ev->button == 1) {
@@ -225,10 +221,6 @@
}
}
-
-
-
-
}
@@ -328,8 +320,6 @@
(*del_func)(file);
entropy_core_file_cache_remove_reference(file->md5);
-
-
}
} else {
@@ -360,8 +350,6 @@
gui_file* local_file;
Ewl_Iconbox_Icon* list_item;
-
-
Ewl_Widget* dialog_win;
Ewl_Widget* dialog_label;
Ewl_Widget* button;
@@ -397,10 +385,6 @@
entropy_file_wait_list_add(viewer, new_file_list);
ecore_list_destroy(icon_list);
-
- /////////////////////
- //
-
button = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(button), "Yes");
ewl_widget_show(button);
@@ -435,8 +419,6 @@
entropy_gui_component_instance* instance =
entropy_gui_component_instance_new();
entropy_icon_viewer* viewer =
entropy_malloc(sizeof(entropy_icon_viewer));
-
-
/*Save a reference to our local data*/
instance->data = viewer;
instance->layout_parent = layout;
@@ -498,8 +480,6 @@
ewl_callback_append(context, EWL_CALLBACK_CLICKED,
ewl_iconbox_background_remove_cb, instance);
ewl_widget_show(context);
-
-
/*---------------Icon Menu---------------*/
/*Copy*/
@@ -519,9 +499,12 @@
//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), "Rename");
+ 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);
/*Icon menu*/
context = ewl_menu_item_new();
@@ -577,14 +560,7 @@
/*We want to know about thumbnail available events*/
entropy_core_component_event_register(instance,
entropy_core_gui_event_get(ENTROPY_GUI_EVENT_THUMBNAIL_AVAILABLE));
-
ewl_iconbox_controlled_key_callback_register(viewer->iconbox,
ewl_icon_local_viewer_key_event_cb, instance);
-
-
-
-
-
-
return instance;
}
@@ -791,9 +767,6 @@
proc->user_data = ecore_list_new();
view->last_processor = proc;
-
-
-
ecore_list_goto_first(ret);
while ( (event_file = ecore_list_next(ret))) {
//printf("Populating with '%s'\n",
event_file->filename);
@@ -802,11 +775,6 @@
ecore_idle_enterer_add(idle_add_icons, proc);
-
-
- //printf("Starting..\n");
-
-
/*Set the current path from the event source...*/
snprintf(view->current_dir, 1024, "%s://%s/%s",
request->file->uri_base, request->file->path, request->file->filename);
@@ -816,11 +784,6 @@
gui_object_destroy_and_free(comp, tmp_gui_hash);
ecore_hash_destroy(tmp_icon_hash);
-
-
-
-
-
/*Clear the view, if there's anything to nuke*/
ewl_iconbox_clear(EWL_ICONBOX(view->iconbox));
@@ -933,6 +896,3 @@
} //End switch
}
-
-
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_tip.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_tip.c 11 Jan 2006 05:35:54 -0000 1.3
+++ ewl_tip.c 11 Jan 2006 10:55:39 -0000 1.4
@@ -34,6 +34,20 @@
ecore_list_append(tool_tips, "You can add a new 'location' by clicking
on \"Add Location\"\nin the Tools menu");
ecore_list_append(tool_tips, "Entropy can browse .tar.gz and .tar.bz2
files. Just click on the\n file, and it will be"
"treated as a regular folder");
+ ecore_list_append(tool_tips, "To copy a file, drag the icon from the
icon view to a folder in the left hand pane");
+ ecore_list_append(tool_tips, "The icon view supports keyboard
navigation. Arrow keys, and special keys\n like 'Delete'"
+ "will execute appropriate actions");
+ ecore_list_append(tool_tips, "File properties can be viewed by
selecting an icon, and clicking 'Properties'");
+ ecore_list_append(tool_tips, "You can change the action that is
executed for a particular file type\n"
+ "by opening the 'Properties' dialog for a
file of that type, and clicking\n"
+ "'Open With..'");
+ ecore_list_append(tool_tips, "The MIME-Type dialog allows fine grained
control over the action executed\n"
+ "for a file type.");
+ ecore_list_append(tool_tips, "Entropy is able to thumbnail images in
any filesystem supported by EVFS.\n"
+ "For instance, this means that Entropy can
thumbnail files in a .tar.bz2\n"
+ "file on a Samba share!\n");
+
+
}
char* ewl_entropy_tip_window_tip_next() {
@@ -51,6 +65,7 @@
Ewl_Widget* vbox = ewl_vbox_new();
Ewl_Widget* hbox = ewl_hbox_new();
Ewl_Widget* button;
+ Ewl_Widget* image = ewl_image_new();
ewl_entropy_tip_window_create_tips();
tip_number = 0;
@@ -61,13 +76,19 @@
ewl_object_fill_policy_set(EWL_OBJECT(tip_window), EWL_FLAG_FILL_FILL);
ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_FILL);
- ewl_object_minimum_size_set(EWL_OBJECT(tip_window), 400, 150);
ewl_container_child_append(EWL_CONTAINER(tip_window), vbox);
+ ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
text_tip = ewl_text_new();
- ewl_container_child_append(EWL_CONTAINER(vbox), text_tip);
-
+ ewl_object_minimum_h_set(EWL_OBJECT(text_tip), 80);
+ ewl_container_child_append(EWL_CONTAINER(hbox), text_tip);
+ ewl_image_file_set(EWL_IMAGE(image), PACKAGE_DATA_DIR "/icons/tip.png",
NULL);
+ ewl_container_child_append(EWL_CONTAINER(hbox), image);
+ ewl_widget_show(hbox);
+
+ hbox = ewl_hbox_new();
+ ewl_widget_show(hbox);
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
button = ewl_button_new();
@@ -95,8 +116,8 @@
ewl_widget_show(tip_window);
ewl_widget_show(vbox);
- ewl_widget_show(hbox);
ewl_widget_show(text_tip);
+ ewl_widget_show(image);
ewl_entropy_tip_window_tip_next_cb(NULL,NULL,NULL);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- layout_ewl_simple.c 11 Jan 2006 05:35:54 -0000 1.32
+++ layout_ewl_simple.c 11 Jan 2006 10:55:39 -0000 1.33
@@ -7,6 +7,7 @@
#include "ewl_mime_dialog.h"
#include "entropy_gui.h"
#include "ewl_tip.h"
+#include "ewl_about_dialog.h"
#define HEADER_CONFIG_MAX 2048
@@ -34,6 +35,7 @@
void entropy_delete_current_folder(Ecore_List* el);
entropy_gui_component_instance* entropy_plugin_layout_create(entropy_core*
core);
void ewl_layout_simple_tooltip_show_cb(Ewl_Widget *item, void *ev_data, void
*user_data);
+void ewl_layout_simple_about_dialog_cb(Ewl_Widget *item, void *ev_data, void
*user_data);
typedef struct entropy_ewl_layout_header_uri entropy_ewl_layout_header_uri;
struct entropy_ewl_layout_header_uri {
@@ -85,10 +87,16 @@
}
-void ewl_layout_simple_tooltip_show_cb(Ewl_Widget *item, void *ev_data, void
*user_data) {
+void ewl_layout_simple_tooltip_show_cb(Ewl_Widget *item, void *ev_data, void
*user_data)
+{
ewl_entropy_tip_window_display();
}
+void ewl_layout_simple_about_dialog_cb(Ewl_Widget *item, void *ev_data, void
*user_data)
+{
+ entropy_ewl_about_dialog_display();
+}
+
/*TODO/FIXME - This needs a rewrite, to be dynamic, and wizard-based*/
@@ -756,7 +764,7 @@
item = ewl_menu_item_new();
ewl_menu_item_text_set(EWL_MENU_ITEM(item), "About..");
ewl_container_child_append(EWL_CONTAINER(menu), item);
- ewl_callback_append(EWL_WIDGET(item), EWL_CALLBACK_CLICKED,
location_add_cb, layout);
+ ewl_callback_append(EWL_WIDGET(item), EWL_CALLBACK_CLICKED,
ewl_layout_simple_about_dialog_cb, layout);
ewl_widget_show(item);
/*-------------------------------*/
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
