E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy Modified Files: configure.in Log Message: Oops - forgot this === RCS file: /cvs/e/e17/proto/entropy/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- configure.in16 Jul 2007 13:27:53 - 1.13 +++ configure.in5 Aug 2007 08:02:08 - 1.14 @@ -192,6 +192,17 @@ ) AM_CONDITIONAL(HAVE_EWL, test x$have_ewl = xyes) +#check for emotion +PKG_CHECK_MODULES(EMOTION, emotion = 0.0.1, + [ have_emotion=yes ], + [ + AC_MSG_WARN([No Emotion, can't build emotion plugins.]) + have_emotion=no + ] +) +AM_CONDITIONAL(HAVE_EMOTION, test x$have_emotion = xyes) + + #check for etk PKG_CHECK_MODULES(ETK, etk = 0.1.0, [ have_etk=yes ], - 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
E CVS: proto chaos
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 - 1.28
+++ etk_icon_viewer.c 5 Aug 2007 12:25:22 - 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 - 1.87
+++ etk_list_viewer.c 5 Aug 2007 12:25:22 - 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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_interaction_dialog.c
Log Message:
* Delete dialog behaviour rationalisation
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_interaction_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_interaction_dialog.c4 Aug 2007 13:46:25 - 1.11
+++ etk_interaction_dialog.c5 Aug 2007 12:25:22 - 1.12
@@ -1,5 +1,6 @@
#include entropy.h
#include entropy_gui.h
+#include etk_user_interaction_dialog.h
#include limits.h
#include dlfcn.h
#include Etk.h
@@ -23,26 +24,46 @@
Etk_Widget* window = NULL;
int result = (int)user_data;
entropy_generic_file* file;
+ Ecore_List* files;
entropy_gui_component_instance* instance;
window = etk_object_data_get(ETK_OBJECT(w), window);
- file= etk_object_data_get(ETK_OBJECT(window), file);
+ files= etk_object_data_get(ETK_OBJECT(window), files);
instance = etk_object_data_get(ETK_OBJECT(window), instance);
etk_signal_disconnect(pressed, ETK_OBJECT(w),
ETK_CALLBACK(etk_entropy_delete_dialog_cb));
switch (result) {
- case ENTROPY_USER_INTERACTION_RESPONSE_YES:
- case ENTROPY_USER_INTERACTION_RESPONSE_YES_TO_ALL: {
- entropy_plugin_filesystem_file_remove(file, instance);
+ case ENTROPY_USER_INTERACTION_RESPONSE_YES: {
+ ecore_list_first_goto(files);
+ while ((file = ecore_list_first_remove(files))) {
+ entropy_plugin_filesystem_file_remove(file,
instance);
+ }
}
break;
+
+ case ENTROPY_USER_INTERACTION_RESPONSE_NO: {
+ }
+ break;
+
default: break;
}
+
+ ecore_list_destroy(files);
etk_object_destroy(ETK_OBJECT(window));
}
-void entropy_etk_delete_dialog_new(entropy_generic_file* file,
entropy_gui_component_instance* instance)
+void entropy_etk_delete_dialog_single_new(entropy_gui_component_instance*
instance, entropy_generic_file* file)
+{
+ Ecore_List* files;
+
+ files = ecore_list_new();
+ ecore_list_append(files,file);
+
+ entropy_etk_delete_dialog_new(instance,files);
+}
+
+void entropy_etk_delete_dialog_new(entropy_gui_component_instance* instance,
Ecore_List* files)
{
char buf[PATH_MAX];
Etk_Widget* window = etk_window_new();
@@ -51,51 +72,43 @@
Etk_Widget* button;
Etk_Widget* label;
- snprintf(buf, PATH_MAX, Are you sure you want to delete '%s/%s'? ,
file-path,file-filename);
+ if (ecore_list_count(files) == 1) {
+ ecore_list_first_goto(files);
+ entropy_generic_file* file =
((entropy_generic_file*)ecore_list_current(files));
+ snprintf(buf, PATH_MAX, Are you sure you want to delete
'%s/%s'? , file-path,
+ file-filename);
+ } else {
+ snprintf(buf, PATH_MAX, Are you sure you want to delete these
%d files'? , ecore_list_count(files));
+ }
- etk_window_title_set(ETK_WINDOW(window), buf);
+ etk_window_title_set(ETK_WINDOW(window), buf);
- etk_container_add(ETK_CONTAINER(window), vbox);
+ etk_container_add(ETK_CONTAINER(window), vbox);
- label = etk_label_new(buf);
- etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 5);
- etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 5);
-
- button = etk_button_new_with_label(Yes);
- etk_container_add(ETK_CONTAINER(hbox), button);
- etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
- (int*)ENTROPY_USER_INTERACTION_RESPONSE_YES );
- etk_object_data_set(ETK_OBJECT(button), window, window);
- etk_widget_show(button);
-
- button = etk_button_new_with_label(Yes to all);
- etk_container_add(ETK_CONTAINER(hbox), button);
- etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
-
(int*)ENTROPY_USER_INTERACTION_RESPONSE_YES_TO_ALL );
- etk_object_data_set(ETK_OBJECT(button), window, window);
- etk_widget_show(button);
-
- button = etk_button_new();
- etk_button_label_set(ETK_BUTTON(button), No);
- etk_container_add(ETK_CONTAINER(hbox), button);
+ label = etk_label_new(buf);
+ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL,
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: etk_user_interaction_dialog.h Log Message: * Delete dialog behaviour rationalisation === RCS file: /cvs/e/e17/proto/entropy/src/include/etk_user_interaction_dialog.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- etk_user_interaction_dialog.h 2 Aug 2007 03:30:32 - 1.3 +++ etk_user_interaction_dialog.h 5 Aug 2007 12:25:22 - 1.4 @@ -1,7 +1,8 @@ #ifndef __ETK_USER_INTERACTION_DIALOG_H_ #define __ETK_USER_INTERACTION_DIALOG_H_ -void entropy_etk_delete_dialog_new(entropy_generic_file* file, entropy_gui_component_instance* instance); +void entropy_etk_delete_dialog_new(entropy_gui_component_instance* instance, Ecore_List* files); void entropy_etk_user_interaction_dialog_new(entropy_file_operation* ); +void entropy_etk_delete_dialog_single_new(entropy_gui_component_instance* instance, entropy_generic_file* file); #endif - 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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am action_simple.c
Log Message:
* Fix behaviour of compile when no emotion
* ecore_exe_run - pipe - some apps don't like ecore_exe_run (mplayer)
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- Makefile.am 4 Aug 2007 13:46:26 - 1.47
+++ Makefile.am 6 Aug 2007 01:11:36 - 1.48
@@ -40,7 +40,13 @@
ETK_METADATA_L = etk_metadata.la
ETK_ICONBOX_L = etk_iconbox.la
ETK_TRACKBACK_L = etk_trackback.la
+
+if HAVE_EMOTION
ETK_HOVER_L = etk_hover.la
+else
+ETK_HOVER_L =
+endif
+
else
LAYOUT_ETK_L =
ETK_LIST_VIEWER_L =
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/action_simple.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- action_simple.c 29 Dec 2006 13:02:53 - 1.16
+++ action_simple.c 6 Aug 2007 01:11:36 - 1.17
@@ -173,7 +173,7 @@
//printf (Hit action callback\n);
//printf(Exe: %s\n, fullname);
-ecore_exe_run (fullname, NULL);
+ecore_exe_pipe_run (fullname, ECORE_EXE_PIPE_AUTO, NULL);
}
else {
printf (action_simple: No action associated with %s\n,
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am etk_icon_viewer.c etk_meta_plugin.c
layout_etk_simple.c
Added Files:
etk_hover_viewer.c
Log Message:
* Add 'hover plugin' - try it in icon mode, hover for ~2 secs over a video or
image
* Misc bugfixes
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- Makefile.am 2 Aug 2007 03:30:32 - 1.46
+++ Makefile.am 4 Aug 2007 13:46:26 - 1.47
@@ -40,6 +40,7 @@
ETK_METADATA_L = etk_metadata.la
ETK_ICONBOX_L = etk_iconbox.la
ETK_TRACKBACK_L = etk_trackback.la
+ETK_HOVER_L = etk_hover.la
else
LAYOUT_ETK_L =
ETK_LIST_VIEWER_L =
@@ -47,9 +48,10 @@
ETK_METADATA_L =
ETK_ICONBOX_L =
ETK_TRACKBACK_L =
+ETK_HOVER_L =
endif
-pkg_LTLIBRARIES= $(MIME_L) $(THUMBNAILER_L) $(POSIX_L)
$(LAYOUT_L) $(EWL_LOCAL_ICON_L) $(STRUCTURE_VIEWER_L) $(SYSTEM_THUMBNAILER_L)
$(ACTION_SIMPLE_L) $(LAYOUT_ETK_L) $(EWL_LIST_L) $(REMOTE_THUMBNAILER_L)
$(DISTRIB_THUMBNAILER_L) $(ETK_STRUCTURE_VIEWER_L) $(ETK_LIST_VIEWER_L)
$(METADATA_EXTRACT_L) $(ETK_METADATA_L) $(ETK_ICONBOX_L) $(ETK_TRACKBACK_L)
+pkg_LTLIBRARIES= $(MIME_L) $(THUMBNAILER_L) $(POSIX_L)
$(LAYOUT_L) $(EWL_LOCAL_ICON_L) $(STRUCTURE_VIEWER_L) $(SYSTEM_THUMBNAILER_L)
$(ACTION_SIMPLE_L) $(LAYOUT_ETK_L) $(EWL_LIST_L) $(REMOTE_THUMBNAILER_L)
$(DISTRIB_THUMBNAILER_L) $(ETK_STRUCTURE_VIEWER_L) $(ETK_LIST_VIEWER_L)
$(METADATA_EXTRACT_L) $(ETK_METADATA_L) $(ETK_ICONBOX_L) $(ETK_TRACKBACK_L)
$(ETK_HOVER_L)
ewl_local_icon_la_SOURCES = $(top_srcdir)/src/entropy_gui.c \
$(top_srcdir)/src/dialogs/ewl_progress_dialog.c \
@@ -161,6 +163,14 @@
etk_metadata_la_CFLAGS = @ETK_CFLAGS@
etk_metadata_la_LDFLAGS = -module -avoid-version
etk_metadata_la_LIBADD = @ETK_LIBS@
+
+if HAVE_EMOTION
+etk_hover_la_SOURCES = etk_hover_viewer.c
+etk_hover_la_CFLAGS = @ETK_CFLAGS@ @EMOTION_CFLAGS@
+etk_hover_la_LDFLAGS = -module -avoid-version
+etk_hover_la_LIBADD = @ETK_LIBS@ @EMOTION_LIBS@
+endif
+
endif
mime_la_SOURCES= mime.c $(top_srcdir)/src/entropy_core.c
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_icon_viewer.c 25 Jul 2007 17:01:03 - 1.26
+++ etk_icon_viewer.c 4 Aug 2007 13:46:26 - 1.27
@@ -33,6 +33,17 @@
/*A file we're waiting on for passback properties*/
Ecore_Hash* properties_request_hash;
+
+ /*Timer for tooltips*/
+ Ecore_Timer* tooltimer;
+ Ecore_Timer* popuptimer;
+
+ /*Hover positions*/
+ int hx;
+ int hy;
+
+ /*Hover file*/
+ entropy_generic_file* hover_file;
};
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
@@ -211,6 +222,73 @@
entropy_etk_icon_viewer_icon_size_set(viewer, value);
}
+int _entropy_etk_icon_viewer_hover_popup_cb(void* data)
+{
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+ entropy_file_request* req;
+
+ req = data;
+ instance = (entropy_gui_component_instance*)req-requester;
+ viewer = instance-data;
+
+ entropy_event_hover_request(instance,req-file, viewer-hx, viewer-hy);
+ entropy_core_file_cache_remove_reference(req-file-md5);
+
+ viewer-hover_file = req-file;
+ free(req);
+
+ ecore_timer_del(viewer-popuptimer);
+ viewer-popuptimer = NULL;
+
+ return 0;
+}
+
+
+void _entropy_etk_icon_viewer_move_cb(Etk_Object *object, void *event_info,
void *data)
+{
+ Etk_Event_Mouse_Move *event =event_info;
+ Etk_Iconbox_Icon* icon;
+ entropy_generic_file* file;
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+ Etk_Toplevel* toplevel;
+ int win_x,win_y;
+
+ instance = data;
+ viewer = instance-data;
+
+ if (viewer-popuptimer) {
+ ecore_timer_del(viewer-popuptimer);
+ viewer-popuptimer = NULL;
+ }
+
+ if (viewer-hover_file) {
+ entropy_event_dehover_request(instance,viewer-hover_file);
+ viewer-hover_file = NULL;
+ }
+
+ if (!(icon = etk_iconbox_icon_get_at_xy(ETK_ICONBOX(viewer-iconbox),
+ event-cur.canvas.x, event-cur.canvas.y, ETK_FALSE, ETK_TRUE,
ETK_TRUE))) return;
+
+ toplevel = etk_widget_toplevel_parent_get(viewer-iconbox);
+ etk_window_geometry_get(ETK_WINDOW(toplevel), win_x, win_y, NULL,
NULL);
+
+ file = etk_iconbox_icon_data_get(icon);
+
+ if (file) {
+ entropy_file_request*
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c entropy_gui_event_handlers.c
notification_engine.c plugin_helper.c
Log Message:
* Add 'hover plugin' - try it in icon mode, hover for ~2 secs over a video or
image
* Misc bugfixes
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- entropy_core.c 27 Jul 2007 14:09:42 - 1.96
+++ entropy_core.c 4 Aug 2007 13:46:25 - 1.97
@@ -292,7 +292,8 @@
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_COPY_REQUEST,
entropy_event_handler_copy_request_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_CUT_REQUEST,
entropy_event_handler_cut_request_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_PASTE_REQUEST,
entropy_event_handler_paste_request_handler);
-
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_HOVER,
entropy_event_handler_hover_request_handler);
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_DEHOVER,
entropy_event_handler_dehover_request_handler);
//printf(\n\nDetails of thumbnailers:\n);
@@ -639,6 +640,10 @@
return entropy_gui_event_cut_request;
} else if (!strcmp(event, ENTROPY_GUI_EVENT_PASTE_REQUEST)) {
return entropy_gui_event_paste_request;
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_HOVER)) {
+ return entropy_gui_event_hover;
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_DEHOVER)) {
+ return entropy_gui_event_dehover;
} else
return ;
}
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_gui_event_handlers.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- entropy_gui_event_handlers.c7 Sep 2006 13:40:14 - 1.15
+++ entropy_gui_event_handlers.c4 Aug 2007 13:46:25 - 1.16
@@ -608,3 +608,65 @@
return data;
}
+
+/*Hover Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_hover_request_handler()
+{
+ return entropy_gui_event_handler_new(
+ entropy_event_handler_hover_request_instance_data,
+ entropy_event_handler_instance_data_generic_cleanup);
+
+}
+
+Entropy_Gui_Event_Handler_Instance_Data*
+entropy_event_handler_hover_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor)
+{
+ Entropy_Gui_Event_Handler_Instance_Data* data = NULL;
+ entropy_notify_event* ev = NULL;
+
+ data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data));
+
+ ev = entropy_notify_event_new();
+ ev-event_type = ENTROPY_NOTIFY_HOVER;
+ ev-return_struct = event-data; /*An entropy generic file*/
+ ev-key = event-key;
+ ev-hints = event-hints;
+ ev-processed = 1;
+
+ data-notify = ev;
+
+
+ return data;
+}
+
+/*Hover Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_dehover_request_handler()
+{
+ return entropy_gui_event_handler_new(
+ entropy_event_handler_dehover_request_instance_data,
+ entropy_event_handler_instance_data_generic_cleanup);
+
+}
+
+Entropy_Gui_Event_Handler_Instance_Data*
+entropy_event_handler_dehover_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor)
+{
+ Entropy_Gui_Event_Handler_Instance_Data* data = NULL;
+ entropy_notify_event* ev = NULL;
+
+ data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data));
+
+ ev = entropy_notify_event_new();
+ ev-event_type = ENTROPY_NOTIFY_DEHOVER;
+ ev-return_struct = event-data; /*An entropy generic file*/
+ ev-key = event-key;
+ ev-hints = event-hints;
+ ev-processed = 1;
+
+ data-notify = ev;
+
+
+ return data;
+}
===
RCS file: /cvs/e/e17/proto/entropy/src/notification_engine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- notification_engine.c 25 Jul 2007 17:01:03 - 1.13
+++ notification_engine.c 4 Aug 2007 13:46:25 - 1.14
@@ -217,6 +217,20 @@
}
break;
+ case ENTROPY_NOTIFY_HOVER: {
+ entropy_generic_file* file =
eevent-data;
+
entropy_core_file_cache_remove_reference (
+ file-md5);
+
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy_gui.h entropy_gui_event_handler.h
notification_engine.h plugin_base.h plugin_helper.h
Log Message:
* Add 'hover plugin' - try it in icon mode, hover for ~2 secs over a video or
image
* Misc bugfixes
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_gui.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- entropy_gui.h 7 Sep 2006 13:40:15 - 1.13
+++ entropy_gui.h 4 Aug 2007 13:46:25 - 1.14
@@ -22,6 +22,9 @@
#define ENTROPY_GUI_EVENT_CUT_REQUEST entropy_gui_event_cut_request
#define ENTROPY_GUI_EVENT_PASTE_REQUEST entropy_gui_event_paste_request
+#define ENTROPY_GUI_EVENT_HOVER entropy_gui_event_hover
+#define ENTROPY_GUI_EVENT_DEHOVER entropy_gui_event_dehover
+
#define ENTROPY_TOOLKIT_EWL ewl
#define ENTROPY_TOOLKIT_ETK etk
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_gui_event_handler.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- entropy_gui_event_handler.h 7 Sep 2006 13:40:15 - 1.10
+++ entropy_gui_event_handler.h 4 Aug 2007 13:46:26 - 1.11
@@ -123,4 +123,18 @@
Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_paste_request_instance_data(entropy_gui_event* event,
entropy_gui_component_instance* requestor) ;
+
+/*Hover Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_hover_request_handler();
+Entropy_Gui_Event_Handler_Instance_Data*
+entropy_event_handler_hover_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor);
+
+/*DeHover Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_dehover_request_handler();
+Entropy_Gui_Event_Handler_Instance_Data*
+entropy_event_handler_dehover_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance*
requestor);
+
+
#endif
===
RCS file: /cvs/e/e17/proto/entropy/src/include/notification_engine.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- notification_engine.h 7 Sep 2006 13:40:15 - 1.14
+++ notification_engine.h 4 Aug 2007 13:46:26 - 1.15
@@ -21,7 +21,9 @@
ENTROPY_NOTIFY_METADATA_GROUPS = 16,
ENTROPY_NOTIFY_COPY_REQUEST = 17,
ENTROPY_NOTIFY_CUT_REQUEST = 18,
- ENTROPY_NOTIFY_PASTE_REQUEST = 19
+ ENTROPY_NOTIFY_PASTE_REQUEST = 19,
+ ENTROPY_NOTIFY_HOVER = 20,
+ ENTROPY_NOTIFY_DEHOVER = 21
};
enum ENTROPY_GUI_EVENT_HINTS {
===
RCS file: /cvs/e/e17/proto/entropy/src/include/plugin_base.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- plugin_base.h 29 Dec 2006 13:02:53 - 1.17
+++ plugin_base.h 4 Aug 2007 13:46:26 - 1.18
@@ -21,7 +21,8 @@
ENTROPY_PLUGIN_SUB_TYPE_ALL,
ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW,
ENTROPY_PLUGIN_GUI_COMPONENT_LOCAL_VIEW,
- ENTROPY_PLUGIN_GUI_COMPONENT_INFO_PROVIDER
+ ENTROPY_PLUGIN_GUI_COMPONENT_INFO_PROVIDER,
+ ENTROPY_PLUGIN_GUI_COMPONENT_HOVER_PROVIDER
};
===
RCS file: /cvs/e/e17/proto/entropy/src/include/plugin_helper.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- plugin_helper.h 29 Dec 2006 13:02:53 - 1.27
+++ plugin_helper.h 4 Aug 2007 13:46:26 - 1.28
@@ -38,5 +38,7 @@
void entropy_event_copy_request(entropy_gui_component_instance* instance);
void entropy_event_cut_request(entropy_gui_component_instance* instance);
void entropy_event_paste_request(entropy_gui_component_instance* instance);
+void entropy_event_hover_request(entropy_gui_component_instance* instance,
entropy_generic_file* file, int x, int y);
+void entropy_event_dehover_request(entropy_gui_component_instance* instance,
entropy_generic_file* file);
#endif
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_interaction_dialog.c
Log Message:
* Add 'hover plugin' - try it in icon mode, hover for ~2 secs over a video or
image
* Misc bugfixes
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_interaction_dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_interaction_dialog.c2 Aug 2007 03:30:32 - 1.10
+++ etk_interaction_dialog.c4 Aug 2007 13:46:25 - 1.11
@@ -4,6 +4,7 @@
#include dlfcn.h
#include Etk.h
+
void etk_entropy_user_interaction_dialog_cb(Etk_Object* w, void* user_data)
{
long id = (long)etk_object_data_get(ETK_OBJECT(w),operation);
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Bring available key actions for iconviewer into line with other plugins
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_icon_viewer.c 4 Aug 2007 13:46:26 - 1.27
+++ etk_icon_viewer.c 5 Aug 2007 01:00:48 - 1.28
@@ -8,6 +8,7 @@
#include etk_directory_add_dialog.h
#include etk_properties_dialog.h
#include entropy_etk_context_menu.h
+#include etk_user_interaction_dialog.h
#define EN_DND_COL_NUM 5
@@ -244,6 +245,39 @@
return 0;
}
+/* Called when the user presses a key */
+static void _etk_entropy_iconviewer_key_down_cb(Etk_Object *object, void
*event, void *data)
+{
+ Etk_Event_Key_Down *key_event = event;
+ Etk_Iconbox* iconbox = ETK_ICONBOX(object);
+
+ if (!strcmp(key_event-key, Delete)) {
+ Etk_Iconbox_Icon* icon;
+ entropy_generic_file* file;
+
+ printf(Delete pressed!\n);
+
+ for (icon = iconbox-first_icon; icon ; icon = icon-next ) {
+ if (etk_iconbox_is_selected(icon)) {
+ file = etk_iconbox_icon_data_get(icon);
+
+ if (file) {
+ printf(Deleting '%s'...\n, file-filename);
+
+ 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);
+ }
+ }
+ }
+ }
+
+ }
+
+}
+
+
void _entropy_etk_icon_viewer_move_cb(Etk_Object *object, void *event_info,
void *data)
{
@@ -652,6 +686,8 @@
etk_signal_connect(mouse-down, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
etk_signal_connect(mouse-move, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_move_cb), instance);
+ etk_signal_connect(key-down, ETK_OBJECT(viewer-iconbox),
+ ETK_CALLBACK(_etk_entropy_iconviewer_key_down_cb), instance);
/*DND Setup*/
/* dnd_types_num = 1;
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am etk_list_viewer.c
Log Message:
* Fix warnings
* Add delete confirmation dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Makefile.am 28 Jul 2007 23:41:40 - 1.45
+++ Makefile.am 2 Aug 2007 03:30:32 - 1.46
@@ -129,7 +129,8 @@
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_properties_dialog.c \
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
-
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c
+
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c
etk_list_la_CFLAGS = @ETK_CFLAGS@
etk_list_la_LDFLAGS = -module -avoid-version
etk_list_la_LIBADD = @ETK_LIBS@
@@ -140,7 +141,8 @@
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c \
-
$(top_srcdir)/src/dialogs/etk_properties_dialog.c
+
$(top_srcdir)/src/dialogs/etk_properties_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c
etk_iconbox_la_CFLAGS = @ETK_CFLAGS@
etk_iconbox_la_LDFLAGS = -module -avoid-version
etk_iconbox_la_LIBADD = @ETK_LIBS@
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- etk_list_viewer.c 28 Jul 2007 12:35:23 - 1.85
+++ etk_list_viewer.c 2 Aug 2007 03:30:32 - 1.86
@@ -6,6 +6,7 @@
#include time.h
#include Etk.h
#include entropy_etk_context_menu.h
+#include etk_user_interaction_dialog.h
#include etk_properties_dialog.h
#define EN_DND_COL_NUM 5
@@ -96,12 +97,12 @@
/* Compares two rows of the tree */
-static int _entropy_etk_list_type_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_type_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
int val;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -116,13 +117,13 @@
}
}
-static int _entropy_etk_list_filename_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_filename_compare_cb( Etk_Tree_Col *col,
Etk_Tree_Row *row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
int val;
int presort_folder;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -149,11 +150,11 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_size_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -172,11 +173,11 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_date_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -217,7 +218,7 @@
if (file) {
printf(Deleting '%s'...\n, file-file-filename);
- entropy_plugin_filesystem_file_remove(file-file,
(entropy_gui_component_instance*)data);
+ entropy_etk_delete_dialog_new(file-file,
(entropy_gui_component_instance*)data);
}
}
@@ -525,8 +526,8 @@
Etk_Tree_Col* col5;
char buffer[50];
char date_buffer[26];
- char* thumbnail_filename;
- char* thumbnail_key;
+ const char*
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: etk_user_interaction_dialog.h Log Message: * Fix warnings * Add delete confirmation dialog === RCS file: /cvs/e/e17/proto/entropy/src/include/etk_user_interaction_dialog.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etk_user_interaction_dialog.h 2 Mar 2006 06:10:55 - 1.2 +++ etk_user_interaction_dialog.h 2 Aug 2007 03:30:32 - 1.3 @@ -1,6 +1,7 @@ #ifndef __ETK_USER_INTERACTION_DIALOG_H_ #define __ETK_USER_INTERACTION_DIALOG_H_ +void entropy_etk_delete_dialog_new(entropy_generic_file* file, entropy_gui_component_instance* instance); void entropy_etk_user_interaction_dialog_new(entropy_file_operation* ); #endif - 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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_interaction_dialog.c
Log Message:
* Fix warnings
* Add delete confirmation dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_interaction_dialog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_interaction_dialog.c29 Dec 2006 13:02:53 - 1.9
+++ etk_interaction_dialog.c2 Aug 2007 03:30:32 - 1.10
@@ -17,6 +17,86 @@
etk_object_destroy(ETK_OBJECT(window));
}
+void etk_entropy_delete_dialog_cb(Etk_Object* w, void* user_data)
+{
+ Etk_Widget* window = NULL;
+ int result = (int)user_data;
+ entropy_generic_file* file;
+ entropy_gui_component_instance* instance;
+
+ window = etk_object_data_get(ETK_OBJECT(w), window);
+ file= etk_object_data_get(ETK_OBJECT(window), file);
+ instance = etk_object_data_get(ETK_OBJECT(window), instance);
+
+ etk_signal_disconnect(pressed, ETK_OBJECT(w),
ETK_CALLBACK(etk_entropy_delete_dialog_cb));
+
+ switch (result) {
+ case ENTROPY_USER_INTERACTION_RESPONSE_YES:
+ case ENTROPY_USER_INTERACTION_RESPONSE_YES_TO_ALL: {
+ entropy_plugin_filesystem_file_remove(file, instance);
+ }
+ break;
+ default: break;
+ }
+ etk_object_destroy(ETK_OBJECT(window));
+}
+
+void entropy_etk_delete_dialog_new(entropy_generic_file* file,
entropy_gui_component_instance* instance)
+{
+ char buf[PATH_MAX];
+ Etk_Widget* window = etk_window_new();
+ Etk_Widget* vbox= etk_vbox_new(ETK_TRUE,5);
+ Etk_Widget* hbox = etk_hbox_new(ETK_TRUE,5);
+ Etk_Widget* button;
+ Etk_Widget* label;
+
+ snprintf(buf, PATH_MAX, Are you sure you want to delete '%s/%s'? ,
file-path,file-filename);
+
+ etk_window_title_set(ETK_WINDOW(window), buf);
+
+ etk_container_add(ETK_CONTAINER(window), vbox);
+
+ label = etk_label_new(buf);
+ etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 5);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 5);
+
+ button = etk_button_new_with_label(Yes);
+ etk_container_add(ETK_CONTAINER(hbox), button);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
+ (int*)ENTROPY_USER_INTERACTION_RESPONSE_YES );
+ etk_object_data_set(ETK_OBJECT(button), window, window);
+ etk_widget_show(button);
+
+ button = etk_button_new_with_label(Yes to all);
+ etk_container_add(ETK_CONTAINER(hbox), button);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
+
(int*)ENTROPY_USER_INTERACTION_RESPONSE_YES_TO_ALL );
+ etk_object_data_set(ETK_OBJECT(button), window, window);
+ etk_widget_show(button);
+
+ button = etk_button_new();
+ etk_button_label_set(ETK_BUTTON(button), No);
+ etk_container_add(ETK_CONTAINER(hbox), button);
+
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
+ (int*)ENTROPY_USER_INTERACTION_RESPONSE_NO );
+ etk_object_data_set(ETK_OBJECT(button), window, window);
+ etk_widget_show(button);
+
+ button = etk_button_new_with_label(No to all);
+ etk_container_add(ETK_CONTAINER(hbox), button);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(etk_entropy_delete_dialog_cb),
+
(int*)ENTROPY_USER_INTERACTION_RESPONSE_NO_TO_ALL );
+ etk_object_data_set(ETK_OBJECT(button), window, window);
+ etk_widget_show(button);
+
+
+ etk_object_data_set(ETK_OBJECT(window), file, file);
+ etk_object_data_set(ETK_OBJECT(window), instance, instance);
+
+ etk_widget_show_all(window);
+}
+
void entropy_etk_user_interaction_dialog_new(entropy_file_operation* interact)
{
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c
Log Message:
Add a Shift+Del combo for those that know what they're doing
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- etk_list_viewer.c 2 Aug 2007 03:30:32 - 1.86
+++ etk_list_viewer.c 2 Aug 2007 04:36:02 - 1.87
@@ -218,7 +218,12 @@
if (file) {
printf(Deleting '%s'...\n, file-file-filename);
- entropy_etk_delete_dialog_new(file-file,
(entropy_gui_component_instance*)data);
+
+ 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);
+ }
}
}
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_properties_dialog.c
Log Message:
more work on properties dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_properties_dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_properties_dialog.c 30 Jun 2007 07:04:53 - 1.14
+++ etk_properties_dialog.c 29 Jul 2007 09:12:49 - 1.15
@@ -239,7 +239,8 @@
void etk_properties_dialog_new(Entropy_Generic_File* file)
{
About_Dialog *ad;
- char fullname[1024];
+ char buf[1024];
+ time_t stime;
ad = about_dialog_new();
ad-file = file;
@@ -248,10 +249,10 @@
if(ad ad-main.dialog) {
entropy_core_file_cache_add_reference(file-md5);
- snprintf(fullname,sizeof(fullname),%s/%s,
ad-file-path,ad-file-filename);
+ snprintf(buf,sizeof(buf),%s/%s, ad-file-path,ad-file-filename);
/*Setup the display*/
- etk_entry_text_set(ETK_ENTRY(ad-general.file_entry), fullname);
+ etk_entry_text_set(ETK_ENTRY(ad-general.file_entry), buf);
if (file-thumbnail) {
etk_image_set_from_file(ETK_IMAGE(ad-preview.image),
@@ -262,7 +263,12 @@
PACKAGE_DATA_DIR /icons/default.png,
NULL);
}
-
+ snprintf(buf,50,%lld kb, file-properties.st_size / 1024);
+ etk_entry_text_set(ETK_ENTRY(ad-general.size_entry), buf);
+
+ stime = file-properties.st_atime;
+ etk_entry_text_set(ETK_ENTRY(ad-general.lastm_entry), ctime(stime));
+ etk_entry_text_set(ETK_ENTRY(ad-general.ftype_entry), file-mime_type);
etk_widget_show_all(ad-main.dialog);
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_mime_dialog_main.c
Log Message:
Be smarter about add/edit behaviour
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_mime_dialog_main.c 28 Jul 2007 09:31:09 - 1.19
+++ etk_mime_dialog_main.c 29 Jul 2007 12:25:58 - 1.20
@@ -210,7 +210,8 @@
etk_tree_row_fields_get(row, col2, mime_type, NULL);
if (mime_type) {
- etk_mime_dialog_application_create(mime_type,action);
+ if ( (edit_action == NULL isedit == 0) ||
(edit_action isedit == 1))
+
etk_mime_dialog_application_create(mime_type,action);
}
}
}
-
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
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_mime_dialog_main.c Log Message: * Fixed mime dialog events * Default to not display hidden files * New TODO items === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- etk_mime_dialog_main.c 29 Jun 2007 01:01:43 - 1.18 +++ etk_mime_dialog_main.c 28 Jul 2007 09:31:09 - 1.19 @@ -325,7 +325,7 @@ etk_window_wmclass_set(ETK_WINDOW(mime_dialog_add_edit_window), mimedialog, mimedialog); etk_widget_size_request_set(ETK_WIDGET(mime_dialog_add_edit_window), 250, 80); - etk_signal_connect (delete_event, ETK_OBJECT (mime_dialog_add_edit_window), + etk_signal_connect (delete-event, ETK_OBJECT (mime_dialog_add_edit_window), ETK_CALLBACK (_etk_window_deleted_add_cb), NULL); table = etk_table_new(2,3,ETK_FALSE); @@ -402,7 +402,7 @@ etk_window_wmclass_set(ETK_WINDOW(window), mimedialog, mimedialog); etk_widget_size_request_set(ETK_WIDGET(window), 250, 80); - etk_signal_connect (delete_event, ETK_OBJECT (window), + etk_signal_connect (delete-event, ETK_OBJECT (window), ETK_CALLBACK (_etk_window_deleted_add_app_cb), NULL); table = etk_table_new(2,4,ETK_FALSE); @@ -484,7 +484,7 @@ etk_window_title_set(ETK_WINDOW(mime_dialog_window), Program Associations); etk_window_wmclass_set(ETK_WINDOW(mime_dialog_window), mimedialog, mimedialog); - etk_signal_connect (delete_event, ETK_OBJECT (mime_dialog_window), + etk_signal_connect (delete-event, ETK_OBJECT (mime_dialog_window), ETK_CALLBACK (_etk_window_deleted_cb), NULL); etk_widget_size_request_set(ETK_WIDGET(mime_dialog_window), 450, 500); - 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
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy Modified Files: TODO Log Message: * Fixed mime dialog events * Default to not display hidden files * New TODO items === RCS file: /cvs/e/e17/proto/entropy/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- TODO22 Apr 2006 01:15:44 - 1.3 +++ TODO28 Jul 2007 09:31:08 - 1.4 @@ -1,5 +1,9 @@ This is a list of things we need to fix: +* More comprehensive Open With dialog. +* Multicolumn list view +* Better visual indication of directory sorting order +* More icon set sizes * extractor plugin - fix odd behaviour (sliding window) and make the window move with the main entropy window if the latter is moved. how do we handle fullscreen mode or when there's no space to show the sliding window? @@ -8,7 +12,7 @@ This is a rough list of things we could implement: -[-] * more thumbnailers - pdf, ttf, text (makes more snese in icon view) +[-] * more thumbnailers - pdf (done), ttf, text (makes more snese in icon view) [-] * archives - ability to extract archives to a path [-] * right click drag menus - when we drag with the right click, it would be nice to display a context menu (might need etk work) - 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
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_config.c Log Message: * Fixed mime dialog events * Default to not display hidden files * New TODO items === RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- entropy_config.c25 Jul 2007 17:01:03 - 1.28 +++ entropy_config.c28 Jul 2007 09:31:08 - 1.29 @@ -623,7 +623,7 @@ entropy_config_misc_item_str_set(general.treeviewer, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.trackback, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.presortfolders, 1,ENTROPY_CONFIG_LOC_LIST); - entropy_config_misc_item_str_set(general.hiddenbackup, 1,ENTROPY_CONFIG_LOC_LIST); + entropy_config_misc_item_str_set(general.hiddenbackup, 0,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.iconsize, 48,ENTROPY_CONFIG_LOC_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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
thumbnailer.c
Log Message:
* Only accept IPC messages from our own server
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/thumbnailer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- thumbnailer.c 25 Jun 2007 11:37:09 - 1.15
+++ thumbnailer.c 27 Jul 2007 14:09:43 - 1.16
@@ -50,6 +50,10 @@
entropy_file_request* req;
char* md5;
+ if (!thumb) {
+ printf(Received NULL thumbnail - abort!\n);
+ return 0;
+ }
md5 = md5_entropy_local_file(thumb-path);
-
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
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: Makefile.am Log Message: * Check-in of CodeWarrior's contributed properties dialog === RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- Makefile.am 24 Oct 2006 09:01:42 - 1.43 +++ Makefile.am 30 Jun 2007 07:04:53 - 1.44 @@ -108,6 +108,7 @@ $(top_srcdir)/src/dialogs/etk_properties_dialog.c \ $(top_srcdir)/src/dialogs/etk_options_dialog.c \ $(top_srcdir)/src/dialogs/etk_file_cache_debug_dialog.c + layout_etk_simple_la_CFLAGS = @ETK_CFLAGS@ layout_etk_simple_la_LDFLAGS = -module -avoid-version layout_etk_simple_la_LIBADD = @ETK_LIBS@ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: Makefile.am Log Message: * Check-in of CodeWarrior's contributed properties dialog === RCS file: /cvs/e/e17/proto/entropy/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 31 Mar 2006 12:12:26 - 1.7 +++ Makefile.am 30 Jun 2007 07:04:53 - 1.8 @@ -20,8 +20,7 @@ entropy_config.c \ entropy_gui.c \ entropy_alert.c \ - entropy_gui_event_handlers.c - + entropy_gui_event_handlers.c entropy_CC = cc entropy_CFLAGS = @EWL_CFLAGS@ @EVFS_CFLAGS@ \ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_properties_dialog.c
Log Message:
* Check-in of CodeWarrior's contributed properties dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_properties_dialog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_properties_dialog.c 30 Dec 2006 13:43:34 - 1.13
+++ etk_properties_dialog.c 30 Jun 2007 07:04:53 - 1.14
@@ -1,214 +1,271 @@
#include Etk.h
#include entropy.h
#include time.h
+#include stdlib.h
+#include stdio.h
-typedef struct _Entropy_Etk_Properties_Dialog Entropy_Etk_Properties_Dialog;
-struct _Entropy_Etk_Properties_Dialog {
- Etk_Widget* window;
- Entropy_Generic_File* file;
+typedef struct _About_Dialog About_Dialog;
+
+About_Dialog *about_dialog_new();
+
+struct _About_Dialog
+{
+ Entropy_Generic_File* file;
+
+ /* Main window */
+ struct{
+ Etk_Widget *dialog; /* holds everything */
+ Etk_Widget *outer_vbox; /* has two rows */
+ Etk_Widget *top_hbox; /* has two cols */
+ Etk_Widget *top_vbox; /* has two rows */
+ } main;
+
+ /* General frame */
+ struct {
+ Etk_Widget *frame;
+ Etk_Widget *table;
+ Etk_Widget *file_label;
+ Etk_Widget *file_entry;
+ Etk_Widget *size_label;
+ Etk_Widget *size_entry;
+ Etk_Widget *lastm_label;
+ Etk_Widget *lastm_entry;
+ Etk_Widget *ftype_label;
+ Etk_Widget *ftype_entry;
+ } general;
+
+ /* Permissions frame */
+ struct {
+ Etk_Widget *frame;
+ Etk_Widget *table;
+ Etk_Widget *owner_label;
+ Etk_Widget *owner_entry;
+ Etk_Widget *others_read_cbox;
+ Etk_Widget *others_write_cbox;
+ Etk_Widget *owner_read_cbox;
+ Etk_Widget *owner_write_cbox;
+ } perm;
+
+ /* Preview frame */
+ struct {
+ Etk_Widget *frame;
+ Etk_Widget *image;
+ } preview;
+
+ /* Icon frame */
+ struct {
+ Etk_Widget *frame;
+ Etk_Widget *vbox;
+ Etk_Widget *table;
+ Etk_Widget *image;
+ Etk_Widget *thumb_radio;
+ Etk_Widget *default_radio;
+ Etk_Widget *edje_radio;
+ Etk_Widget *image_radio;
+ Etk_Widget *use_for_all_cbox;
+ } icon;
};
-Etk_Bool _etk_window_deleted_cb (Etk_Object * object, void *data)
+Etk_Bool _etk_about_dialog_window_deleted_cb (Etk_Object * object, void *data)
{
- Entropy_Etk_Properties_Dialog* dialog= data;
+ About_Dialog* dialog= data;
/*Remove the file reference*/
entropy_core_file_cache_remove_reference(dialog-file-md5);
- etk_object_destroy(ETK_OBJECT(dialog-window));
+ etk_object_destroy(ETK_OBJECT(dialog-main.dialog));
entropy_free(dialog);
return ETK_TRUE;
}
-void etk_properties_dialog_new(Entropy_Generic_File* file)
+/**
+ * Creates and about dialog and returns it
+ * @return returns an about dialog
+ */
+About_Dialog *about_dialog_new()
{
- Entropy_Etk_Properties_Dialog* dialog;
- Etk_Widget* notebook;
- Etk_Widget* vbox;
- Etk_Widget* button;
- Etk_Widget* hbox;
- Etk_Widget* ivbox;
- Etk_Widget* icon;
- Etk_Widget* label;
- Etk_Widget* pvbox;
- char* perms;
- char buf[50];
- time_t stime;
-
- /*First up, add a reference to this file*/
- printf(Adding reference to '%s/%s'- %s\n, file-path,
file-filename, file-md5);
- entropy_core_file_cache_add_reference(file-md5);
-
- /*Retrieve file permissions*/
- perms = entropy_generic_file_display_permissions_parse(file);
-
- dialog = entropy_malloc(sizeof(Entropy_Etk_Properties_Dialog));
- dialog-file = file;
-
- dialog-window = etk_window_new();
- etk_window_title_set(ETK_WINDOW(dialog-window), file-filename);
-
- etk_widget_size_request_set(dialog-window, 450, 520);
-
-
- vbox = etk_vbox_new(ETK_TRUE,0);
- etk_container_add(ETK_CONTAINER(dialog-window), vbox);
-
- notebook = etk_notebook_new();
- etk_box_append(ETK_BOX(vbox), notebook, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
- /*Main page*/
- ivbox = etk_vbox_new(ETK_FALSE,0);
- etk_notebook_page_append(ETK_NOTEBOOK(notebook), General, ivbox);
-
- hbox = etk_hbox_new(ETK_FALSE,0);
- etk_box_append(ETK_BOX(ivbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- if (file-thumbnail) {
- icon =
etk_image_new_from_file(file-thumbnail-thumbnail_filename, NULL);
- etk_box_append(ETK_BOX(hbox), icon, ETK_BOX_START,
ETK_BOX_NONE, 0);
- } else {
- icon = etk_image_new_from_file(PACKAGE_DATA_DIR
/icons/default.png, NULL);
- etk_box_append(ETK_BOX(hbox), icon, ETK_BOX_START,
ETK_BOX_NONE, 0);
- }
-
-
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
Make the program selection dialog work again
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- layout_etk_simple.c 13 May 2007 12:28:50 - 1.74
+++ layout_etk_simple.c 29 Jun 2007 01:01:43 - 1.75
@@ -327,6 +327,8 @@
/*Add to tracker*/
ecore_hash_set(_etk_layout_row_reference, row, structure_obj);
+
+ printf (LOADED: %s/%s\n, file-path, file-filename);
/*Add to layout/plugin tracker - this is to destroy if the user removes a
location*/
if (! (layouts = ecore_hash_get(_etk_layout_structure_plugin_reference,
structure_obj))) {
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_location_add_dialog.c etk_mime_dialog_main.c Log Message: Make the program selection dialog work again === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_location_add_dialog.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- etk_location_add_dialog.c 23 Aug 2006 10:45:26 - 1.13 +++ etk_location_add_dialog.c 29 Jun 2007 01:01:43 - 1.14 @@ -119,7 +119,7 @@ strcat(buffer, path); - printf(Final URI: '%s'\n, buffer); + /*printf(Final URI: '%s'\n, buffer);*/ structure = entropy_config_standard_structures_add((char*)name, buffer); (*dialog-add_callback)(dialog-instance, structure); === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- etk_mime_dialog_main.c 1 Mar 2007 16:30:08 - 1.17 +++ etk_mime_dialog_main.c 29 Jun 2007 01:01:43 - 1.18 @@ -229,6 +229,9 @@ Etk_Widget* tree = _etk_mime_dialog_sub_tree; Etk_Tree_Row* row; + /*Do we have a valid record?*/ + if (record 0) return; + binding = evas_list_nth(entropy_core_get_core()-config-Loaded_Config-mime_bindings, record); @@ -510,7 +513,7 @@ etk_tree_build(ETK_TREE(tree)); etk_box_append(ETK_BOX(hbox), tree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); - etk_signal_connect(row_selected, ETK_OBJECT( tree ), + etk_signal_connect(row-clicked, ETK_OBJECT( tree ), ETK_CALLBACK(_etk_mime_dialog_main_row_clicked), NULL); etk_mime_dialog_tree_populate(); - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_core.c Log Message: Make the program selection dialog work again === RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- entropy_core.c 29 Dec 2006 13:02:53 - 1.93 +++ entropy_core.c 29 Jun 2007 01:01:43 - 1.94 @@ -1339,6 +1339,8 @@ file = entropy_generic_file_new(); uri_path = evfs_parse_uri(uri); + /*printf(Direct after evfs: %s \n, uri_path-files[0]-path);*/ + /*Get the last /, after this is the filename (or dir name, or whatever)*/ /*printf(Path: '%s'\n, uri_path-files[0]-path);*/ pos = rindex(uri_path-files[0]-path, '/'); @@ -1359,6 +1361,8 @@ } strcpy(file-uri_base, uri_path-files[0]-plugin_uri); + + /*printf(After EVFS: %s/%s\n, file-path,file-filename);*/ /*Cache the file*/ listener = entropy_malloc(sizeof(entropy_file_listener)); - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_file_context_menu.c Log Message: * Open with... works again === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_file_context_menu.c 7 Mar 2007 09:56:33 - 1.20 +++ etk_file_context_menu.c 29 Jun 2007 04:12:39 - 1.21 @@ -457,7 +457,7 @@ menu = etk_menu_new(); _entropy_etk_context_menu = menu; - etk_signal_connect(popped_up, ETK_OBJECT(menu), ETK_CALLBACK(_entropy_etk_context_menu_popup_cb), NULL); + etk_signal_connect(popped-up, ETK_OBJECT(menu), ETK_CALLBACK(_entropy_etk_context_menu_popup_cb), NULL); _entropy_etk_context_menu_open_with_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* ETK API updates
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- layout_etk_simple.c 24 Jan 2007 22:49:13 - 1.72
+++ layout_etk_simple.c 13 Apr 2007 05:51:22 - 1.73
@@ -382,7 +382,7 @@
etk_box_append(ETK_BOX(gui-trackback_shell),
gui-trackback-gui_object, ETK_BOX_START, ETK_BOX_NONE,0);
etk_widget_show_all(ETK_WIDGET(gui-trackback-gui_object));
} else {
- etk_container_remove(ETK_CONTAINER(gui-trackback_shell),
gui-trackback-gui_object);
+ etk_container_remove(ETK_WIDGET(gui-trackback-gui_object));
}
}
/**/
@@ -409,7 +409,7 @@
etk_paned_position_set(ETK_PANED(gui-paned),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X);
} else {
etk_widget_hide(gui-tree);
- etk_container_remove(ETK_CONTAINER(gui-tree_shell), gui-tree);
+ etk_container_remove(ETK_WIDGET(gui-tree));
etk_paned_position_set(ETK_PANED(gui-paned), 0);
}
}
@@ -444,7 +444,7 @@
for (children =
etk_container_children_get(ETK_CONTAINER(gui-localshell)); children; ) {
widget = children-data;
- etk_container_remove(ETK_CONTAINER(gui-localshell), widget);
+ etk_container_remove(ETK_WIDGET(widget));
children = children-next;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* ETK API updates
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_options_dialog.c29 Dec 2006 13:02:53 - 1.14
+++ etk_options_dialog.c13 Apr 2007 05:51:21 - 1.15
@@ -77,7 +77,7 @@
for (children =
etk_container_children_get(ETK_CONTAINER(_entropy_etk_options_local_box));
children; ) {
widget = children-data;
-
etk_container_remove(ETK_CONTAINER(_entropy_etk_options_local_box), widget);
+ etk_container_remove(ETK_WIDGET(widget));
children = children-next;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c etk_trackback.c
Log Message:
* API changes
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- etk_list_viewer.c 24 Jan 2007 22:49:13 - 1.80
+++ etk_list_viewer.c 16 Mar 2007 15:48:01 - 1.81
@@ -257,7 +257,8 @@
for (iter = etk_tree_first_row_get(tree); iter; iter =
etk_tree_row_walk_next(iter, ETK_TRUE))
if (iter-selected == ETK_TRUE) rows = evas_list_append(rows, iter);
- drag = (ETK_WIDGET(tree))-drag;
+ //FIXME: Removed until DND works
+ //drag = (ETK_WIDGET(tree))-drag;
table = etk_table_new(5,5,ETK_FALSE);
count = evas_list_count(rows);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_trackback.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_trackback.c 16 Aug 2006 01:20:53 - 1.4
+++ etk_trackback.c 16 Mar 2007 15:48:02 - 1.5
@@ -142,15 +142,13 @@
ecore_list_goto_first(trackback-levels);
Etk_Widget* last_combo;
if ( (last_combo =
ecore_list_current(trackback-levels))) {
- Evas_List* l =
ETK_COMBOBOX(last_combo)-items;
- for (; l; ) {
- Etk_Combobox_Item* item =
l-data;
+ Etk_Combobox_Item* item = NULL;
+ for ( item =
ETK_COMBOBOX(last_combo)-first_item; item; item=item-next) {
if
(etk_combobox_item_data_get(item) == event_file) {
-
etk_combobox_item_activate(item);
+
etk_combobox_active_item_set(ETK_COMBOBOX(last_combo), item);
}
- l = l-next;
}
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
Patch from Mi Reflejo to add a 'view file' option to the context menu
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_file_context_menu.c 7 Sep 2006 13:40:15 - 1.19
+++ etk_file_context_menu.c 7 Mar 2007 09:56:33 - 1.20
@@ -20,6 +20,7 @@
Etk_Widget* _entropy_etk_context_menu_groups_remove_from_item = NULL;
Etk_Widget* _entropy_etk_context_menu_rename_menu_item = NULL;
+Etk_Widget* _entropy_etk_context_menu_view_menu_item = NULL;
Etk_Widget* _entropy_etk_context_menu_restore_trash_menu_item = NULL;
entropy_generic_file* _entropy_etk_context_menu_current_folder = NULL;
@@ -162,6 +163,30 @@
}
static void
+_entropy_etk_context_menu_file_view_cb(Etk_Object *obj, void *data)
+{
+ entropy_generic_file* file;
+
+ file = _entropy_etk_context_menu_current_file;
+
+ strcpy(file-mime_type, text/plain);
+ int i;
+ entropy_gui_event* gui_event;
+
+ i = (int)etk_object_data_get(obj, INDEX);
+
+ if (file) {
+ gui_event = entropy_malloc (sizeof (entropy_gui_event));
+ gui_event-event_type =
+ entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_ACTION_FILE);
+ gui_event-data = file;
+ gui_event-key = i;
+ entropy_core_layout_notify_event
(_entropy_etk_context_menu_current_instance,
+ gui_event, ENTROPY_EVENT_GLOBAL);
+ }
+}
+
+static void
_entropy_etk_context_menu_group_file_paste_cb(Etk_Object *object, void *data)
{
Entropy_Selection_Type stype;
@@ -503,6 +528,13 @@
etk_signal_connect(activated,
ETK_OBJECT(_entropy_etk_context_menu_rename_menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_file_rename_cb), NULL);
+ _entropy_etk_context_menu_view_menu_item =
+ _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL,
_(View/Edit file),
+ ETK_STOCK_ACCESSORIES_TEXT_EDITOR, ETK_MENU_SHELL(menu),NULL);
+
+ etk_signal_connect(activated,
ETK_OBJECT(_entropy_etk_context_menu_view_menu_item),
+
ETK_CALLBACK(_entropy_etk_context_menu_file_view_cb), NULL);
+
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL,
_(Properties), ETK_STOCK_DOCUMENT_PROPERTIES,
ETK_MENU_SHELL(menu),NULL);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_properties_cb), NULL);
@@ -537,6 +569,8 @@
_entropy_etk_context_menu_current_file = current_file;
_entropy_etk_context_menu_current_instance = instance;
+ entropy_generic_file* file;
+ file = _entropy_etk_context_menu_current_file;
if (!_entropy_etk_context_menu)
entropy_etk_context_menu_init();
@@ -544,6 +578,10 @@
/*Show*/
etk_widget_show_all(_entropy_etk_context_menu_open_with_item);
etk_widget_show_all(_entropy_etk_context_menu_rename_menu_item);
+ if (file (strcmp(file-mime_type, file/folder)))
+ etk_widget_show_all(_entropy_etk_context_menu_view_menu_item);
+ else
+ etk_widget_hide(_entropy_etk_context_menu_view_menu_item);
if (!strcmp(current_file-uri_base, trash))
etk_widget_show_all(_entropy_etk_context_menu_restore_trash_menu_item);
@@ -565,6 +603,7 @@
/*Hide*/
etk_widget_hide(_entropy_etk_context_menu_open_with_item);
etk_widget_hide(_entropy_etk_context_menu_rename_menu_item);
+ etk_widget_hide(_entropy_etk_context_menu_view_menu_item);
etk_widget_hide(_entropy_etk_context_menu_restore_trash_menu_item);
if (_entropy_etk_context_menu_selected_files)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy Modified Files: AUTHORS Log Message: Patch from Mi Reflejo to add a 'view file' option to the context menu === RCS file: /cvs/e/e17/proto/entropy/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- AUTHORS 20 Oct 2005 08:45:54 - 1.1 +++ AUTHORS 7 Mar 2007 09:56:32 - 1.2 @@ -1,2 +1,6 @@ ch4os [EMAIL PROTECTED] +Patches +--- +Mi Reflejo [EMAIL PROTECTED] (Patch for 'view file' option in context menu) + - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: etk_meta_plugin.c etk_structure_viewer.c Log Message: * Fixups for tree code === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_meta_plugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_meta_plugin.c 24 Jan 2007 22:49:13 - 1.4 +++ etk_meta_plugin.c 1 Mar 2007 16:30:08 - 1.5 @@ -157,6 +157,8 @@ instance-layout_parent = layout; instance-core = core; + Etk_Tree_Col* tree_col; + entropy_core_component_event_register (instance, entropy_core_gui_event_get (ENTROPY_GUI_EVENT_FILE_METADATA_AVAILABLE)); @@ -173,7 +175,8 @@ etk_tree_col_model_add(col_tree, etk_tree_model_text_new()); col_tree = etk_tree_col_new(ETK_TREE(view-list), _(Value), 200, 0.0); etk_tree_col_model_add(col_tree, etk_tree_model_text_new()); - etk_tree_build(ETK_TREE(view-list)); + + etk_tree_build(ETK_TREE(view-list)); etk_container_add(ETK_CONTAINER(view-window), view-list); === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- etk_structure_viewer.c 24 Jan 2007 22:49:13 - 1.34 +++ etk_structure_viewer.c 1 Mar 2007 16:30:08 - 1.35 @@ -74,7 +74,7 @@ entropy_gui_component_instance* instance; event_file_core* e_event; - /*FIXME - DND is disabled during the transition to tree2*/ + /*FIXME - DND is disabled during the transition to tree*/ return; ev = event; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_file_cache_debug_dialog.c etk_mime_dialog_main.c Log Message: * Fixups for tree code === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_cache_debug_dialog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_file_cache_debug_dialog.c 24 Jan 2007 22:49:13 - 1.6 +++ etk_file_cache_debug_dialog.c 1 Mar 2007 16:30:08 - 1.7 @@ -100,15 +100,17 @@ etk_box_append(ETK_BOX(vbox), tree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST); - tree_col = etk_tree_col_new(ETK_TREE(tree), _(Listeners), 125, 0.0); - etk_tree_col_model_add(tree_col, etk_tree_model_int_new()); + + tree_col = etk_tree_col_new(ETK_TREE(tree), _(Listeners), 125,0.0); + etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); // Not yet implemented in Tree2 //etk_tree_col_sort_func_set(tree_col, _entropy_etk_file_cache_dialog_listener_compare_cb, NULL); tree_col = etk_tree_col_new(ETK_TREE(tree), _(Filename), 150, 0.0); etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); -etk_tree_col_expand_set(tree_col, ETK_TRUE); + + etk_tree_col_expand_set(tree_col, ETK_TRUE); etk_tree_build(ETK_TREE(tree)); === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_mime_dialog_main.c 24 Jan 2007 22:49:13 - 1.16 +++ etk_mime_dialog_main.c 1 Mar 2007 16:30:08 - 1.17 @@ -498,12 +498,14 @@ _etk_mime_dialog_main_tree = tree; etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST); + tree_col = etk_tree_col_new(ETK_TREE(tree), _(Description), 125, 0.0); etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); - tree_col = etk_tree_col_new(ETK_TREE(tree), _(MIME Type), 150, 0.0); + tree_col = etk_tree_col_new(ETK_TREE(tree), _(MIME Type), 150,0.0); etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); -etk_tree_col_expand_set(tree_col, ETK_TRUE); + + etk_tree_col_expand_set(tree_col, ETK_TRUE); etk_tree_build(ETK_TREE(tree)); etk_box_append(ETK_BOX(hbox), tree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); @@ -543,9 +545,10 @@ tree_col = etk_tree_col_new(ETK_TREE(tree), _(Executable), 150, 0.0); etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); - tree_col = etk_tree_col_new(ETK_TREE(tree), _(Arguments), 150, 0.0); + tree_col = etk_tree_col_new(ETK_TREE(tree), _(Arguments), 125,0.0); etk_tree_col_model_add(tree_col, etk_tree_model_text_new()); + etk_tree_build(ETK_TREE(tree)); etk_box_append(ETK_BOX(vbox), tree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: etk_list_viewer.c Log Message: * Fix for recent tree2 api change (thanks MoOm!) === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- etk_list_viewer.c 5 Jan 2007 19:32:35 - 1.78 +++ etk_list_viewer.c 6 Jan 2007 18:45:25 - 1.79 @@ -677,7 +677,7 @@ date_buffer[strlen(date_buffer)-1] = '\0'; etk_tree2_freeze(ETK_TREE2(viewer-tree)); - etk_tree2_row_fields_set((Etk_Tree2_Row*)obj-icon, + etk_tree2_row_fields_set((Etk_Tree2_Row*)obj-icon, ETK_FALSE, col3, buffer, col5, date_buffer, NULL); @@ -735,7 +735,7 @@ col1 = etk_tree2_nth_col_get(ETK_TREE2(viewer-tree), 0); etk_tree2_freeze(ETK_TREE2(viewer-tree)); - etk_tree2_row_fields_set((Etk_Tree2_Row*)obj-icon, + etk_tree2_row_fields_set((Etk_Tree2_Row*)obj-icon, ETK_FALSE, col1, obj-thumbnail-thumbnail_filename, NULL, NULL); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c etk_structure_viewer.c layout_etk_simple.c
Log Message:
* Commit for new tree2 api (thanks hisham!)
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- etk_list_viewer.c 3 Jan 2007 02:04:28 - 1.77
+++ etk_list_viewer.c 5 Jan 2007 19:32:35 - 1.78
@@ -555,7 +555,7 @@
if (!file-retrieved_stat) {
new_row = etk_tree2_row_append(ETK_TREE2(viewer-tree), NULL,
- col1, thumbnail_filename,
+ col1, thumbnail_filename, NULL,
col2, file-filename,
col4, file-mime_type,
NULL);
@@ -568,7 +568,7 @@
date_buffer[strlen(date_buffer)-1] = '\0';
new_row = etk_tree2_row_append(ETK_TREE2(viewer-tree), NULL,
- col1, thumbnail_filename,
+ col1, thumbnail_filename, NULL,
col2, file-filename,
col3, buffer,
col4, file-mime_type,
@@ -671,7 +671,7 @@
col3 = etk_tree2_nth_col_get(ETK_TREE2(viewer-tree),
2);
col4 = etk_tree2_nth_col_get(ETK_TREE2(viewer-tree),
3);
col5 = etk_tree2_nth_col_get(ETK_TREE2(viewer-tree),
4);
-
+
snprintf(buffer,50, %lld Kb,
file_stat-stat_obj-st_size / 1024);
ctime_r(file_stat-stat_obj-st_mtime, date_buffer);
date_buffer[strlen(date_buffer)-1] = '\0';
@@ -736,7 +736,7 @@
etk_tree2_freeze(ETK_TREE2(viewer-tree));
etk_tree2_row_fields_set((Etk_Tree2_Row*)obj-icon,
- col1, obj-thumbnail-thumbnail_filename,
+ col1, obj-thumbnail-thumbnail_filename, NULL,
NULL);
etk_tree2_thaw(ETK_TREE2(viewer-tree));
@@ -824,22 +824,26 @@
viewer-tree = etk_tree2_new();
etk_tree2_mode_set(ETK_TREE2(viewer-tree), ETK_TREE2_MODE_LIST);
- viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Icon),
- etk_tree2_model_image_new(ETK_TREE2(viewer-tree),
ETK_TREE2_FROM_FILE), 48);
- viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree),
_(Filename),
- etk_tree2_model_text_new(ETK_TREE2(viewer-tree)), 150);
+ viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Icon),
48,0.0);
+ etk_tree2_col_model_add(viewer-tree_col1, etk_tree2_model_image_new());
+
+ viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree),
_(Filename), 150,0.0);
+ etk_tree2_col_model_add(viewer-tree_col1, etk_tree2_model_text_new());
+
etk_tree2_col_sort_set(viewer-tree_col1,
_entropy_etk_list_filename_compare_cb, NULL);
- viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Size),
- etk_tree2_model_text_new(ETK_TREE2(viewer-tree)),60);
+ viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Size),
60,0.0);
+ etk_tree2_col_model_add(viewer-tree_col1, etk_tree2_model_text_new());
etk_tree2_col_sort_set(viewer-tree_col1, _entropy_etk_list_size_compare_cb,
NULL);
- viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Type),
- etk_tree2_model_text_new(ETK_TREE2(viewer-tree)),65);
+ viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Type),
65,0.0);
+ etk_tree2_col_model_add(viewer-tree_col1, etk_tree2_model_text_new());
+
etk_tree2_col_sort_set(viewer-tree_col1, _entropy_etk_list_type_compare_cb,
NULL);
- viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Date
Modified),
- etk_tree2_model_text_new(ETK_TREE2(viewer-tree)),90);
+ viewer-tree_col1 = etk_tree2_col_new(ETK_TREE2(viewer-tree), _(Date
Modified), 90,0.0);
+ etk_tree2_col_model_add(viewer-tree_col1, etk_tree2_model_text_new());
+
etk_tree2_col_sort_set(viewer-tree_col1, _entropy_etk_list_date_compare_cb,
NULL);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- etk_structure_viewer.c 3 Jan 2007 01:47:39 - 1.32
+++ etk_structure_viewer.c 5 Jan 2007 19:32:35 - 1.33
@@ -180,11 +180,11 @@
if (!prow) {
- new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer-parent_visual)-tree,
(Etk_Tree2_Row*)viewer-parent_visual, col,
- PACKAGE_DATA_DIR /icons/folder.png,
_(file-filename), NULL);
+ new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer-parent_visual)-tree,
(Etk_Tree2_Row*)viewer-parent_visual, col,
+
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_structure_viewer.c layout_etk_simple.c
Log Message:
* etk_tree-etk_tree2 . DND temporarily disabled
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_structure_viewer.c 30 Dec 2006 13:43:34 - 1.31
+++ etk_structure_viewer.c 3 Jan 2007 01:47:39 - 1.32
@@ -16,7 +16,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree_Col* tree_col1;
+ Etk_Tree2_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* row_hash;
@@ -67,17 +67,20 @@
{
Etk_Event_Selection_Request *ev;
Etk_Selection_Data_Files *files;
- Etk_Tree* tree;
- Etk_Tree_Row* row;
+ Etk_Tree2* tree;
+ Etk_Tree2_Row* row;
int i;
entropy_etk_file_structure_viewer* viewer;
entropy_gui_component_instance* instance;
event_file_core* e_event;
+
+ /*FIXME - DND is disabled during the transition to tree2*/
+ return;
ev = event;
files = ev-data;
- tree = ETK_TREE(object);
- row = etk_tree_selected_row_get(tree);
+ tree = ETK_TREE2(object);
+ //row = etk_tree2_selected_row_get(tree);
instance = ecore_hash_get(instance_map_hash, row);
if (instance) {
@@ -120,7 +123,7 @@
}
}
-static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object,
Etk_Tree2_Row *row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_structure_viewer* viewer;
@@ -136,7 +139,7 @@
printf(Post\n);
instance = ecore_hash_get(instance_map_hash, row);
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (instance) {
viewer = instance-data;
e_event = ecore_hash_get(viewer-row_hash, row);
@@ -159,28 +162,28 @@
-Etk_Tree_Row*
+Etk_Tree2_Row*
structure_viewer_add_row (entropy_gui_component_instance * instance,
- entropy_generic_file * file, Etk_Tree_Row * prow)
+ entropy_generic_file * file, Etk_Tree2_Row * prow)
{
- Etk_Tree_Row* new_row;
+ Etk_Tree2_Row* new_row;
entropy_etk_file_structure_viewer* viewer;
event_file_core *event;
- Etk_Tree_Col* col;
- Etk_Tree_Row* parent;
+ Etk_Tree2_Col* col;
+ Etk_Tree2_Row* parent;
viewer = instance-data;
- parent = (Etk_Tree_Row*)viewer-parent_visual;
+ parent = (Etk_Tree2_Row*)viewer-parent_visual;
- col = etk_tree_nth_col_get(ETK_TREE(parent-tree), 0);
- etk_tree_freeze(ETK_TREE(viewer-tree));
+ col = etk_tree2_nth_col_get(ETK_TREE2(parent-tree), 0);
+ etk_tree2_freeze(ETK_TREE2(viewer-tree));
if (!prow) {
- new_row =
etk_tree_append_to_row((Etk_Tree_Row*)viewer-parent_visual, col,
+ new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer-parent_visual)-tree,
(Etk_Tree2_Row*)viewer-parent_visual, col,
PACKAGE_DATA_DIR /icons/folder.png,
_(file-filename), NULL);
} else {
- new_row = etk_tree_append_to_row(prow, col,
+ new_row = etk_tree2_row_append( ((Etk_Tree2_Row*)prow)-tree,
(Etk_Tree2_Row*)prow, col,
PACKAGE_DATA_DIR /icons/folder.png,
_(file-filename), NULL);
}
@@ -196,7 +199,7 @@
/*Save this file in this list of files we're responsible for */
ecore_list_append (viewer-files, event-file);
- etk_tree_thaw(ETK_TREE(viewer-tree));
+ etk_tree2_thaw(ETK_TREE2(viewer-tree));
return new_row;
}
@@ -212,7 +215,7 @@
switch (eevent-event_type) {
case ENTROPY_NOTIFY_FILELIST_REQUEST_EXTERNAL:
case ENTROPY_NOTIFY_FILELIST_REQUEST:{
- Etk_Tree_Row* row = NULL;
+ Etk_Tree2_Row* row = NULL;
entropy_generic_file *file;
entropy_generic_file *event_file =
((entropy_file_request *) eevent-data)-file;
@@ -253,7 +256,7 @@
}
if (row)
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (row) {
ecore_list_goto_first (el);
@@ -276,7 +279,7 @@
structure_viewer_add_row (comp, file,
row);
ecore_hash_set (viewer-loaded_dirs, row,
(int*)1);
}
- etk_tree_row_expand(row);
+ etk_tree2_row_unfold(row);
}
}
@@ -289,7 +292,7 @@
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c
Log Message:
* Port list viewer to tree2
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- etk_list_viewer.c 30 Dec 2006 13:43:34 - 1.76
+++ etk_list_viewer.c 3 Jan 2007 02:04:28 - 1.77
@@ -19,7 +19,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree_Col* tree_col1;
+ Etk_Tree2_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* gui_hash;
@@ -46,7 +46,7 @@
entropy_generic_file *file;
entropy_thumbnail *thumbnail;
entropy_gui_component_instance *instance;
- Etk_Tree_Row *icon;
+ Etk_Tree2_Row *icon;
};
@@ -96,7 +96,7 @@
/* Compares two rows of the tree */
-static int _entropy_etk_list_type_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_type_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -116,7 +116,7 @@
}
}
-static int _entropy_etk_list_filename_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_filename_compare_cb(Etk_Tree2 *tree,
Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -149,7 +149,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_size_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -172,7 +172,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_date_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -198,16 +198,15 @@
static void _etk_entropy_list_viewer_key_down_cb(Etk_Object *object, void
*event, void *data)
{
Etk_Event_Key_Down *key_event = event;
+ Etk_Tree2_Row* iter;
- Etk_Tree* tree;
- Evas_List* row_list;
+ Etk_Tree2* tree;
+ Evas_List* row_list = NULL;
gui_file* file;
-
- /*entropy_gui_component_instance* instance;
- entropy_etk_file_list_viewer* viewer;*/
- tree = ETK_TREE(object);
- row_list = etk_tree_selected_rows_get(tree);
+ tree = ETK_TREE2(object);
+ for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_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)) {
@@ -232,7 +231,7 @@
static void _entropy_etk_list_viewer_drag_begin_cb(Etk_Object *object, void
*data)
{
- Etk_Tree *tree;
+ Etk_Tree2 *tree;
const char **types;
unsigned int num_types;
Etk_Widget *drag;
@@ -241,7 +240,7 @@
entropy_etk_file_list_viewer* viewer;
char buffer[8192]; /* Um - help - what do we size this to? */
int count = 0;
- Evas_List* rows;
+ Evas_List* rows = NULL;
Etk_Widget* table;
int l=0,r=0,t=0,b=0;
int added_object = 0;
@@ -249,12 +248,14 @@
Etk_Widget* vbox;
Etk_Widget* label;
char label_buffer[50];
+ Etk_Tree2_Row* iter;
instance = data;
viewer = instance-data;
- tree = ETK_TREE(object);
- rows = etk_tree_selected_rows_get(tree);
+ tree = ETK_TREE2(object);
+ for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_row_walk_next(iter, ETK_TRUE))
+if (iter-selected == ETK_TRUE) rows = evas_list_append(rows, iter);
drag = (ETK_WIDGET(tree))-drag;
@@ -356,7 +357,7 @@
Ecore_List *file_remove_ref_list;
entropy_generic_file *obj;
gui_file *freeobj;
- Etk_Tree_Row* row;
+ Etk_Tree2_Row* row;
entropy_etk_file_list_viewer *view = comp-data;
@@ -400,7 +401,7 @@
}
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree2_Row
*row, Etk_Event_Mouse_Up *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_list_viewer* viewer;
@@ -428,7 +429,7 @@
gui_event-data = file-file;
entropy_core_layout_notify_event (file-instance, gui_event,
ENTROPY_EVENT_GLOBAL);
} else if (event-button == 2) {
-
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/utils
Modified Files:
entropy_queuer.c
Log Message:
* Compile again with image changes in etk
* Slight changed to audio queuer util
===
RCS file: /cvs/e/e17/proto/entropy/utils/entropy_queuer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entropy_queuer.c2 Aug 2006 05:53:59 - 1.2
+++ entropy_queuer.c30 Dec 2006 13:43:34 - 1.3
@@ -81,11 +81,11 @@
int attempts = 0;
int i;
- ecore_init(NULL, NULL);
+ ecore_init();
ecore_ipc_init();
if (argc == 1 || strcmp(argv[1], --enqueue)) {
- etk_init();
+ etk_init(NULL,NULL);
window = etk_window_new();
etk_widget_size_request_set(window, 450, 300);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_properties_dialog.c
Log Message:
* Compile again with image changes in etk
* Slight changed to audio queuer util
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_properties_dialog.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_properties_dialog.c 29 Dec 2006 13:02:53 - 1.12
+++ etk_properties_dialog.c 30 Dec 2006 13:43:34 - 1.13
@@ -66,10 +66,10 @@
etk_box_append(ETK_BOX(ivbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
if (file-thumbnail) {
- icon =
etk_image_new_from_file(file-thumbnail-thumbnail_filename);
+ icon =
etk_image_new_from_file(file-thumbnail-thumbnail_filename, NULL);
etk_box_append(ETK_BOX(hbox), icon, ETK_BOX_START,
ETK_BOX_NONE, 0);
} else {
- icon = etk_image_new_from_file(PACKAGE_DATA_DIR
/icons/default.png);
+ icon = etk_image_new_from_file(PACKAGE_DATA_DIR
/icons/default.png, NULL);
etk_box_append(ETK_BOX(hbox), icon, ETK_BOX_START,
ETK_BOX_NONE, 0);
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c etk_structure_viewer.c
Log Message:
* Compile again with image changes in etk
* Slight changed to audio queuer util
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- etk_list_viewer.c 29 Dec 2006 13:02:53 - 1.75
+++ etk_list_viewer.c 30 Dec 2006 13:43:34 - 1.76
@@ -285,9 +285,9 @@
label = etk_label_new(label_buffer);
if (file-file-thumbnail
file-file-thumbnail-thumbnail_filename) {
- image =
etk_image_new_from_file(file-file-thumbnail-thumbnail_filename);
+ image =
etk_image_new_from_file(file-file-thumbnail-thumbnail_filename,NULL);
} else {
- image = etk_image_new_from_file(PACKAGE_DATA_DIR
/icons/default.png);
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR
/icons/default.png, NULL);
}
etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE);
etk_widget_size_request_set(image, 48, 48);
@@ -400,7 +400,7 @@
}
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_list_viewer* viewer;
@@ -411,8 +411,15 @@
file = ecore_hash_get(etk_list_viewer_row_hash, row);
instance = file-instance;
viewer = instance-data;
+
+ printf(Event-button (ext): %d, event-button);
+ if (event-flags ETK_MOUSE_DOUBLE_CLICK) printf(Double!);
+ if (event-flags ETK_MOUSE_TRIPLE_CLICK) printf(Triple!);
+
+ printf(\n);
- if (event-flags EVAS_BUTTON_DOUBLE_CLICK event-button == 1) {
+ if ( (event-flags ETK_MOUSE_DOUBLE_CLICK) event-button == 1) {
+ printf(Event-button: %d\n, event-button);
printf(Row clicked, file is: %s\n, file-file-filename);
gui_event = entropy_malloc (sizeof (entropy_gui_event));
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etk_structure_viewer.c 29 Dec 2006 13:37:19 - 1.30
+++ etk_structure_viewer.c 30 Dec 2006 13:43:34 - 1.31
@@ -127,9 +127,13 @@
entropy_gui_event *gui_event;
event_file_core* e_event;
- if ( (!(event-button == 1 || event-button == 3)) || event-flags
EVAS_BUTTON_TRIPLE_CLICK
- || event-flags EVAS_BUTTON_DOUBLE_CLICK )
+ printf(Structure event: %d\n, event-button);
+
+ if ( (!(event-button == 1 || event-button == 3)) || event-flags
ETK_MOUSE_DOUBLE_CLICK
+ || event-flags ETK_MOUSE_TRIPLE_CLICK )
return;
+
+ printf(Post\n);
instance = ecore_hash_get(instance_map_hash, row);
etk_tree_row_select(row);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: Makefile.am Log Message: * EWL plugins are broken right now. LinuxTitan? === RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- Makefile.am 17 Sep 2006 09:10:56 - 1.42 +++ Makefile.am 24 Oct 2006 09:01:42 - 1.43 @@ -12,17 +12,17 @@ DISTRIB_THUMBNAILER_L = distrib_thumbnailer.la POSIX_L = posix.la -if HAVE_EWL -LAYOUT_L = layout_ewl_simple.la -EWL_LOCAL_ICON_L = ewl_local_icon.la -EWL_LIST_L = ewl_list.la -STRUCTURE_VIEWER_L = structure_viewer.la -else +#if HAVE_EWL +#LAYOUT_L = layout_ewl_simple.la +#EWL_LOCAL_ICON_L = ewl_local_icon.la +#EWL_LIST_L = ewl_list.la +#STRUCTURE_VIEWER_L = structure_viewer.la +#else LAYOUT_L = EWL_LOCAL_ICON_L = EWL_LIST_L = STRUCTURE_VIEWER_L = -endif +#endif SYSTEM_THUMBNAILER_L = system_thumbnailer.la ACTION_SIMPLE_L = action_simple.la - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: distribution_thumbnailer.c mime.c thumbnailer.c Log Message: * Small update for tga file thumbnailing. Really should get around to redoing the filetype registration for thumbnailers/mime === RCS file: /cvs/e/e17/proto/entropy/src/plugins/distribution_thumbnailer.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- distribution_thumbnailer.c 20 Jul 2006 15:19:19 - 1.8 +++ distribution_thumbnailer.c 23 Oct 2006 13:06:49 - 1.9 @@ -25,6 +25,7 @@ ecore_list_append (types, image/jpeg); ecore_list_append (types, image/png); ecore_list_append (types, image/gif); +ecore_list_append (types, image/tga); ecore_list_append (types, video/x-ms-wmv); ecore_list_append (types, video/mpeg); ecore_list_append (types, video/x-msvideo); === RCS file: /cvs/e/e17/proto/entropy/src/plugins/mime.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- mime.c 6 Sep 2006 11:09:22 - 1.14 +++ mime.c 23 Oct 2006 13:06:49 - 1.15 @@ -54,6 +54,7 @@ ecore_hash_set (mime_hash, .txt, text/plain); ecore_hash_set (mime_hash, .mov, video/quicktime); ecore_hash_set (mime_hash, .asf, video/x-ms-asf); + ecore_hash_set (mime_hash, .tga ,image/tga); plugin = entropy_malloc(sizeof(Entropy_Plugin_Mime)); === RCS file: /cvs/e/e17/proto/entropy/src/plugins/thumbnailer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- thumbnailer.c 7 Sep 2006 13:40:15 - 1.12 +++ thumbnailer.c 23 Oct 2006 13:06:49 - 1.13 @@ -32,6 +32,7 @@ ecore_list_append (types, video/mpeg); ecore_list_append (types, video/x-msvideo); ecore_list_append (types, video/quicktime); +ecore_list_append (types, image/tga); } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Options dialog work === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_options_dialog.c7 Oct 2006 09:40:29 - 1.12 +++ etk_options_dialog.c19 Oct 2006 11:47:53 - 1.13 @@ -252,17 +252,17 @@ /*Advanced*/ - /*button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); + button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Advanced Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame);*/ + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); /*Thumbnail*/ - /*button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); + button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Thumbnail Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); */ + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); //etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * ETK API changes === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_options_dialog.c2 Sep 2006 09:51:41 - 1.11 +++ etk_options_dialog.c7 Oct 2006 09:40:29 - 1.12 @@ -181,7 +181,7 @@ toolbar = etk_toolbar_new(); etk_toolbar_orientation_set(ETK_TOOLBAR(toolbar), ETK_TOOLBAR_HORIZ); - etk_toolbar_style_set(ETK_TOOLBAR(toolbar), ETK_TOOLBAR_ICONS); + etk_toolbar_style_set(ETK_TOOLBAR(toolbar), ETK_TOOLBAR_ICON); etk_box_append(ETK_BOX(vbox), toolbar, ETK_BOX_START, ETK_BOX_NONE, 0); etk_box_append(ETK_BOX(vbox),_entropy_etk_options_local_box , ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: Makefile.am Log Message: * Fix rename dialog in iconbox === RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- Makefile.am 31 Aug 2006 02:06:23 - 1.41 +++ Makefile.am 17 Sep 2006 09:10:56 - 1.42 @@ -138,6 +138,7 @@ $(top_srcdir)/src/entropy_debug.c \ $(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \ $(top_srcdir)/src/dialogs/etk_file_context_menu.c \ + $(top_srcdir)/src/dialogs/etk_file_rename_dialog.c \ $(top_srcdir)/src/dialogs/etk_properties_dialog.c etk_iconbox_la_CFLAGS = @ETK_CFLAGS@ etk_iconbox_la_LDFLAGS = -module -avoid-version - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
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
thumbnailer.c
Log Message:
* Big changes - copy/cut/paste events/requests now available to layout event
consumers
* This is also means that cut/copy/paste are now available from the main window
(as well as through Ctrl-(x|c|v)
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_icon_viewer.c 6 Sep 2006 11:09:22 - 1.20
+++ etk_icon_viewer.c 7 Sep 2006 13:40:15 - 1.21
@@ -49,6 +49,8 @@
entropy_generic_file * file);
void icon_viewer_remove_row(entropy_gui_component_instance * instance,
entropy_generic_file * file);
+Ecore_List*
+entropy_etk_icon_viewer_selected_get(entropy_etk_iconbox_viewer* viewer);
int
@@ -243,19 +245,13 @@
if (ctrl_pressed != ETK_TRUE)
etk_iconbox_unselect_all(ETK_ICONBOX(viewer-iconbox));
etk_iconbox_icon_select(icon);
- selected = ecore_list_new();
- for (icon = ETK_ICONBOX(viewer-iconbox)-first_icon; icon ; icon =
icon-next ) {
- if (etk_iconbox_is_selected(icon)) {
-file = etk_iconbox_icon_data_get(icon);
-ecore_list_append(selected, file);
-selected_count++;
- }
- }
-
- if (selected_count 1) {
- entropy_etk_context_menu_popup_multi(instance,selected);
- } else {
- entropy_etk_context_menu_popup(instance, file);
+ selected = entropy_etk_icon_viewer_selected_get(viewer);
+ if (ecore_list_nodes(selected)) {
+ if (ecore_list_nodes(selected) 1) {
+
entropy_etk_context_menu_popup_multi(instance,selected);
+ } else {
+ entropy_etk_context_menu_popup(instance, file);
+ }
}
ecore_list_destroy(selected);
}
@@ -335,9 +331,49 @@
}
break;
+ case ENTROPY_NOTIFY_COPY_REQUEST: {
+ Ecore_List* selected;
+ entropy_generic_file* file;
+
+ printf(ICONBOX: Copy request\n);
+
+ entropy_core_selected_files_clear();
+ 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);
+ }
+ }
+ break;
+
+ case ENTROPY_NOTIFY_CUT_REQUEST: {
+ printf(ICONBOX: Cut request\n);
+ }
+ break;
+
}
}
+Ecore_List*
+entropy_etk_icon_viewer_selected_get(entropy_etk_iconbox_viewer* viewer)
+{
+ Ecore_List* selected;
+ Etk_Iconbox_Icon* icon;
+ entropy_generic_file* file;
+
+ selected = ecore_list_new();
+ for (icon = ETK_ICONBOX(viewer-iconbox)-first_icon; icon ; icon =
icon-next ) {
+ if (etk_iconbox_is_selected(icon)) {
+file = etk_iconbox_icon_data_get(icon);
+ecore_list_append(selected, file);
+ }
+ }
+
+ return selected;
+}
+
+
void
icon_viewer_add_row (entropy_gui_component_instance * instance,
entropy_generic_file * file)
@@ -365,7 +401,6 @@
entropy_generic_file * file)
{
entropy_etk_iconbox_viewer* viewer;
- Etk_Iconbox_Icon* icon;
gui_file* event_file = NULL;
viewer = instance-data;
@@ -566,6 +601,15 @@
entropy_core_component_event_register (instance,
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_THUMBNAIL_AVAILABLE));
+
+ /*We want to know if the core sends copy/cut requests*/
+ entropy_core_component_event_register (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_COPY_REQUEST));
+
+ entropy_core_component_event_register (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_CUT_REQUEST));
etk_widget_show_all(viewer-vbox);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- etk_list_viewer.c 5 Sep 2006 08:10:11 - 1.72
+++ etk_list_viewer.c 7 Sep 2006 13:40:15 - 1.73
@@ -825,6 +825,15 @@
entropy_core_gui_event_get
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
* Big changes - copy/cut/paste events/requests now available to layout event
consumers
* This is also means that cut/copy/paste are now available from the main window
(as well as through Ctrl-(x|c|v)
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_file_context_menu.c 6 Sep 2006 11:09:22 - 1.18
+++ etk_file_context_menu.c 7 Sep 2006 13:40:15 - 1.19
@@ -168,7 +168,6 @@
Ecore_List* files = entropy_core_selected_files_get();
stype = entropy_core_selection_type_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;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy_gui.h entropy_gui_event_handler.h
notification_engine.h plugin_helper.h
Log Message:
* Big changes - copy/cut/paste events/requests now available to layout event
consumers
* This is also means that cut/copy/paste are now available from the main window
(as well as through Ctrl-(x|c|v)
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_gui.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- entropy_gui.h 17 Jul 2006 13:41:47 - 1.12
+++ entropy_gui.h 7 Sep 2006 13:40:15 - 1.13
@@ -18,6 +18,9 @@
#define ENTROPY_GUI_EVENT_EXTENDED_STAT
entropy_gui_event_extended_stat //Register that the next incoming stat
for a file
// is an extended stat - e.g. a properties dialog request
#define ENTROPY_GUI_EVENT_METADATA_GROUPS entropy_gui_event_metadata_groups
//Metadata groups available from file client
+#define ENTROPY_GUI_EVENT_COPY_REQUEST entropy_gui_event_copy_request
+#define ENTROPY_GUI_EVENT_CUT_REQUEST entropy_gui_event_cut_request
+#define ENTROPY_GUI_EVENT_PASTE_REQUEST entropy_gui_event_paste_request
#define ENTROPY_TOOLKIT_EWL ewl
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_gui_event_handler.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- entropy_gui_event_handler.h 17 Jul 2006 13:41:47 - 1.9
+++ entropy_gui_event_handler.h 7 Sep 2006 13:40:15 - 1.10
@@ -108,4 +108,19 @@
Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_metadata_groups_instance_data(entropy_gui_event* event,
entropy_gui_component_instance* requestor) ;
+/*Copy Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_copy_request_handler();
+Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_copy_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor) ;
+
+/*Cut request */
+Entropy_Gui_Event_Handler* entropy_event_handler_cut_request_handler();
+Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_cut_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor);
+
+/*Paste Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_paste_request_handler();
+Entropy_Gui_Event_Handler_Instance_Data*
+entropy_event_handler_paste_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor) ;
#endif
===
RCS file: /cvs/e/e17/proto/entropy/src/include/notification_engine.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- notification_engine.h 17 Jul 2006 13:41:47 - 1.13
+++ notification_engine.h 7 Sep 2006 13:40:15 - 1.14
@@ -18,7 +18,10 @@
ENTROPY_NOTIFY_FILE_METADATA_REQUEST = 13,
ENTROPY_NOTIFY_FILE_METADATA_AVAILABLE = 14,
ENTROPY_NOTIFY_EXTENDED_STAT = 15,
- ENTROPY_NOTIFY_METADATA_GROUPS = 16
+ ENTROPY_NOTIFY_METADATA_GROUPS = 16,
+ ENTROPY_NOTIFY_COPY_REQUEST = 17,
+ ENTROPY_NOTIFY_CUT_REQUEST = 18,
+ ENTROPY_NOTIFY_PASTE_REQUEST = 19
};
enum ENTROPY_GUI_EVENT_HINTS {
===
RCS file: /cvs/e/e17/proto/entropy/src/include/plugin_helper.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- plugin_helper.h 26 Aug 2006 12:59:15 - 1.25
+++ plugin_helper.h 7 Sep 2006 13:40:15 - 1.26
@@ -35,4 +35,8 @@
void entropy_plugin_filesystem_file_group_add(entropy_generic_file* file,
char* group);
void entropy_plugin_filesystem_file_group_remove(entropy_generic_file* file,
char* group);
+void entropy_event_copy_request(entropy_gui_component_instance* instance);
+void entropy_event_cut_request(entropy_gui_component_instance* instance);
+void entropy_event_paste_request(entropy_gui_component_instance* instance);
+
#endif
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c entropy_gui_event_handlers.c plugin_helper.c
Log Message:
* Big changes - copy/cut/paste events/requests now available to layout event
consumers
* This is also means that cut/copy/paste are now available from the main window
(as well as through Ctrl-(x|c|v)
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- entropy_core.c 6 Sep 2006 11:09:22 - 1.91
+++ entropy_core.c 7 Sep 2006 13:40:14 - 1.92
@@ -287,6 +287,9 @@
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT,
entropy_event_handler_user_interaction_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_EXTENDED_STAT,
entropy_event_handler_extended_stat_handler);
entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_METADATA_GROUPS,
entropy_event_handler_metadata_groups_handler);
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_COPY_REQUEST,
entropy_event_handler_copy_request_handler);
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_CUT_REQUEST,
entropy_event_handler_cut_request_handler);
+ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_PASTE_REQUEST,
entropy_event_handler_paste_request_handler);
//printf(\n\nDetails of thumbnailers:\n);
@@ -594,7 +597,7 @@
/*A function we need, unfortunately, because of the way dlopen works with
string refs, and the need of ecore_hash for
- * a pointer */
+ * a pointer. This isn't a big inefficiency - this is only called on plugin
create */
char* entropy_core_gui_event_get(char* event) {
if (!strcmp(event, ENTROPY_GUI_EVENT_FOLDER_CHANGE_CONTENTS)) {
return entropy_gui_event_folder_change_contents;
@@ -628,9 +631,14 @@
return entropy_gui_event_extended_stat;
} else if (!strcmp(event, ENTROPY_GUI_EVENT_METADATA_GROUPS)) {
return entropy_gui_event_metadata_groups;
- } else {
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_COPY_REQUEST)) {
+ return entropy_gui_event_copy_request;
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_CUT_REQUEST)) {
+ return entropy_gui_event_cut_request;
+ } else if (!strcmp(event, ENTROPY_GUI_EVENT_PASTE_REQUEST)) {
+ return entropy_gui_event_paste_request;
+ } else
return ;
- }
}
void generic_file_print(entropy_generic_file* file) {
@@ -999,7 +1007,7 @@
if (!found) {
/*Now add this component to this list*/
ecore_list_append(event_list, comp);
- //printf(Registered interest in '%s' for this gui
component\n, event);
+ /*printf(Registered interest in '%s' for this gui
component\n, event);*/
}
}
}
@@ -1072,9 +1080,8 @@
return;
}
- //printf (Got layout hash %p for layout at %p\n, lay_hash, layout);
-
- //printf(Called event call, for event: '%s'\n, event-event_type);
+ /*printf (Got layout hash %p for layout at %p\n, lay_hash, layout);
+ printf(Called event call, for event: '%s'\n, event-event_type);*/
/*Otherwise, get the list of instances that care about this event*/
el = ecore_hash_get(lay_hash, event-event_type);
@@ -1093,6 +1100,7 @@
ecore_list_goto_first(handlers);
while ( (handler = ecore_list_next(handlers))) {
+
data = (*handler-notify_event_cb)(event,instance);
if (data-notify) {
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_gui_event_handlers.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- entropy_gui_event_handlers.c5 Sep 2006 06:27:39 - 1.14
+++ entropy_gui_event_handlers.c7 Sep 2006 13:40:14 - 1.15
@@ -520,3 +520,91 @@
return data;
}
+
+/*Copy Request */
+Entropy_Gui_Event_Handler* entropy_event_handler_copy_request_handler()
+{
+ return entropy_gui_event_handler_new(
+ entropy_event_handler_copy_request_instance_data,
+ entropy_event_handler_instance_data_generic_cleanup);
+
+}
+
+Entropy_Gui_Event_Handler_Instance_Data*
entropy_event_handler_copy_request_instance_data(entropy_gui_event* event,
+ entropy_gui_component_instance* requestor)
+{
+ Entropy_Gui_Event_Handler_Instance_Data* data = NULL;
+ entropy_notify_event* ev = NULL;
+
+ data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data));
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c mime.c
Log Message:
* Squash warnings (my rule: one warning, per day - shouldn't take long)
* 'Cut' support! Finally!
* File create notify for icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_icon_viewer.c 5 Sep 2006 08:10:10 - 1.19
+++ etk_icon_viewer.c 6 Sep 2006 11:09:22 - 1.20
@@ -322,6 +322,19 @@
icon_viewer_remove_row(comp, (entropy_generic_file*)el);
}
break;
+
+ case ENTROPY_NOTIFY_FILE_CREATE:{
+ entropy_generic_file* file = el;
+
+ /*Check that this file is the current dir we are displaying*/
+ entropy_generic_file* parent_folder =
entropy_core_parent_folder_file_get(file);
+
+ if (parent_folder parent_folder == viewer-current_folder) {
+ icon_viewer_add_row (comp, file);
+ }
+ }
+ break;
+
}
}
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/mime.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- mime.c 6 Aug 2006 05:33:50 - 1.13
+++ mime.c 6 Sep 2006 11:09:22 - 1.14
@@ -57,7 +57,7 @@
plugin = entropy_malloc(sizeof(Entropy_Plugin_Mime));
- return plugin;
+ return ENTROPY_PLUGIN(plugin);
}
char *
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c
Log Message:
* Squash warnings (my rule: one warning, per day - shouldn't take long)
* 'Cut' support! Finally!
* File create notify for icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- entropy_core.c 5 Sep 2006 06:47:14 - 1.90
+++ entropy_core.c 6 Sep 2006 11:09:22 - 1.91
@@ -884,6 +884,16 @@
core_core-selected_files = ecore_list_new();
}
+void entropy_core_selection_type_set(Entropy_Selection_Type stype)
+{
+ core_core-selection_type = stype;
+}
+
+Entropy_Selection_Type entropy_core_selection_type_get()
+{
+ return core_core-selection_type;
+}
+
void entropy_core_selected_file_add(entropy_generic_file* file) {
ecore_list_append(core_core-selected_files, file);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy.h entropy_core.h
Log Message:
* Squash warnings (my rule: one warning, per day - shouldn't take long)
* 'Cut' support! Finally!
* File create notify for icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- entropy.h 5 Sep 2006 06:47:14 - 1.33
+++ entropy.h 6 Sep 2006 11:09:22 - 1.34
@@ -96,6 +96,8 @@
/*Selection engine functions*/
void entropy_core_selection_engine_init();
+void entropy_core_selection_type_set(Entropy_Selection_Type stype);
+Entropy_Selection_Type entropy_core_selection_type_get();
void entropy_core_selected_file_add(entropy_generic_file* file);
Ecore_List* entropy_core_selected_files_get();
void entropy_core_selected_files_clear();
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_core.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- entropy_core.h 2 Apr 2006 05:47:38 - 1.11
+++ entropy_core.h 6 Sep 2006 11:09:22 - 1.12
@@ -5,6 +5,11 @@
#include entropy.h
#include notification_engine.h
+typedef enum {
+ ENTROPY_SELECTION_COPY,
+ ENTROPY_SELECTION_CUT
+} Entropy_Selection_Type;
+
typedef struct _entropy_core_settings entropy_core_settings;
struct _entropy_core_settings {
char* layout_engine;
@@ -35,6 +40,8 @@
struct entropy_plugin* layout_plugin; /* The main layout plugin that we
are relying on */
Ecore_List* selected_files;
+ Entropy_Selection_Type selection_type;
+
Ecore_Hash* descent_hash;
Ecore_Hash* object_associate_hash;
Ecore_Hash* mime_action_hint;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
* Squash warnings (my rule: one warning, per day - shouldn't take long)
* 'Cut' support! Finally!
* File create notify for icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_file_context_menu.c 28 Aug 2006 10:47:12 - 1.17
+++ etk_file_context_menu.c 6 Sep 2006 11:09:22 - 1.18
@@ -164,8 +164,11 @@
static void
_entropy_etk_context_menu_group_file_paste_cb(Etk_Object *object, void *data)
{
+ Entropy_Selection_Type stype;
Ecore_List* files = entropy_core_selected_files_get();
+ stype = entropy_core_selection_type_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;
@@ -175,21 +178,50 @@
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);
+ if (f_uri) {
+ if (stype == ENTROPY_SELECTION_COPY) {
+
entropy_plugin_filesystem_file_copy_multi(files, f_uri,
+
_entropy_etk_context_menu_current_instance);
+ } else if (stype == ENTROPY_SELECTION_CUT) {
+
entropy_plugin_filesystem_file_move_multi(files, f_uri,
+
_entropy_etk_context_menu_current_instance);
+ } else {
+ printf(Unsupported copy type at
context menu paste\n);
+ }
+ }
} 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();
+ entropy_core_selection_type_set(ENTROPY_SELECTION_COPY);
+ 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);
+ }
+
+ }
+}
+
+/*No code reuse here - we may want to use special behaviour*/
+static void
+_entropy_etk_context_menu_group_file_cut_cb(Etk_Object *object, void *data)
+{
+ entropy_core_selected_files_clear();
+
+ entropy_core_selection_type_set(ENTROPY_SELECTION_CUT);
if (_entropy_etk_context_menu_mode == 0) {
entropy_core_selected_file_add(_entropy_etk_context_menu_current_file);
} else {
@@ -442,8 +474,12 @@
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_group_file_copy_cb),NULL);
+ menu_item =
_entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Cut
(Ctrl-x)),
ETK_STOCK_EDIT_CUT, ETK_MENU_SHELL(menu),NULL);
+ etk_signal_connect(activated, ETK_OBJECT(menu_item),
+ ETK_CALLBACK(_entropy_etk_context_menu_group_file_cut_cb),NULL);
+
menu_item =
_entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Paste
(Ctrl-v)),
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c layout_etk_simple.c
Log Message:
* Quieter operation
* Check to make sure a layout shell is not already registered to receive an
event, on register. Prevents double-ups
* Saner operation of multi-file select in icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_icon_viewer.c 1 Sep 2006 12:39:39 - 1.17
+++ etk_icon_viewer.c 5 Sep 2006 06:27:40 - 1.18
@@ -38,6 +38,27 @@
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value ) ;
+Entropy_Plugin* entropy_plugin_init (entropy_core * core);
+
+entropy_gui_component_instance *
+entropy_plugin_gui_instance_new (entropy_core * core,
entropy_gui_component_instance *
+ layout, void *data);
+
+void
+icon_viewer_add_row (entropy_gui_component_instance * instance,
+ entropy_generic_file * file);
+
+
+int
+entropy_plugin_type_get ();
+int
+entropy_plugin_sub_type_get ();
+char *
+entropy_plugin_identify ();
+char*
+entropy_plugin_toolkit_get() ;
+
+
/*- boilerplate -*/
typedef struct gui_file gui_file;
@@ -114,26 +135,6 @@
/*- End boilerplate -*/
-Entropy_Plugin* entropy_plugin_init (entropy_core * core);
-
-entropy_gui_component_instance *
-entropy_plugin_gui_instance_new (entropy_core * core,
entropy_gui_component_instance *
- layout, void *data);
-
-void
-icon_viewer_add_row (entropy_gui_component_instance * instance,
- entropy_generic_file * file);
-
-
-int
-entropy_plugin_type_get ();
-int
-entropy_plugin_sub_type_get ();
-char *
-entropy_plugin_identify ();
-char*
-entropy_plugin_toolkit_get() ;
-
int
entropy_plugin_type_get ()
{
@@ -203,6 +204,7 @@
entropy_generic_file* file;
Etk_Iconbox_Icon* icon;
Etk_Event_Mouse_Down *event;
+ Etk_Bool ctrl_pressed;
instance = data;
viewer = instance-data;
@@ -214,6 +216,7 @@
file = etk_iconbox_icon_data_get(icon);
+ ctrl_pressed = (event-modifiers ETK_MODIFIER_CTRL);
if (event-button == 1) {
if (event-flags ETK_MOUSE_DOUBLE_CLICK) {
@@ -222,7 +225,7 @@
}
}
} else if (event-button == 3) {
- etk_iconbox_unselect_all(icon-iconbox);
+ if (ctrl_pressed != ETK_TRUE) etk_iconbox_unselect_all(icon-iconbox);
etk_iconbox_icon_select(icon);
entropy_etk_context_menu_popup(instance, file);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- layout_etk_simple.c 2 Sep 2006 09:51:41 - 1.64
+++ layout_etk_simple.c 5 Sep 2006 06:27:40 - 1.65
@@ -52,6 +52,8 @@
Etk_Widget* trackback_shell;
Ecore_Hash* progress_hash; /*Track progress events-dialogs*/
+ Etk_Widget* tree_view_menu;
+
Ecore_Hash* properties_request_hash;
};
@@ -429,12 +431,12 @@
ev = event;
/*FIXME: How do we do modifiers now?*/
- /*if(evas_key_modifier_is_set(ev-modifiers, Control))
+ if ((ev-modifiers ETK_MODIFIER_CTRL))
{
if (!strcmp(ev-key, q)) {
layout_etk_simple_quit(instance-core);
}
- } else if (evas_key_modifier_is_set(ev-modifiers, Alt)) {
+ } else if ((ev-modifiers ETK_MODIFIER_ALT)) {
if (!strcmp(ev-key, i)) {
entropy_layout_etk_simple_local_view_set(instance,
gui-iconbox_viewer);
}
@@ -443,8 +445,7 @@
}
- }*/
-
+ }
}
/*Config related functions*/
@@ -843,11 +844,11 @@
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- menu_item = _entropy_etk_menu_check_item_new(_(Tree View),
ETK_MENU_SHELL(menu));
+ gui-tree_view_menu = _entropy_etk_menu_check_item_new(_(Tree View),
ETK_MENU_SHELL(menu));
if (entropy_config_misc_is_set(general.treeviewer)) {
- etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),ETK_TRUE
);
+
etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(gui-tree_view_menu),ETK_TRUE
);
}
- etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
+ etk_signal_connect(activated, ETK_OBJECT(gui-tree_view_menu),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
menu_item = _entropy_etk_menu_check_item_new(_(Trackback view),
ETK_MENU_SHELL(menu));
if (entropy_config_misc_is_set(general.trackback)) {
-
Using
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c entropy_gui_event_handlers.c
Log Message:
* Quieter operation
* Check to make sure a layout shell is not already registered to receive an
event, on register. Prevents double-ups
* Saner operation of multi-file select in icon view
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- entropy_core.c 2 Sep 2006 10:00:16 - 1.88
+++ entropy_core.c 5 Sep 2006 06:27:39 - 1.89
@@ -932,6 +932,8 @@
/*Register a component to get events created by others in the same layout
container*/
void entropy_core_component_event_register(entropy_gui_component_instance*
comp, char* event) {
entropy_gui_component_instance* layout;
+ entropy_gui_component_instance* iter;
+ int found = 0;
if (!comp-layout_parent) {
@@ -946,8 +948,6 @@
/*First we have to see if this layout is currently registered with the
core..*/
Ecore_Hash* event_hash = ecore_hash_get(core_core-layout_gui_events,
layout);
- //printf( * Registering a component...\n);
-
if (!event_hash) {
printf(Alert! - tried to register events for unreg layout
component, %p\n, layout);
} else {
@@ -955,20 +955,57 @@
if (!event_list) {
//printf(No events of this type(%p) yet registered for
this layout, making a new list..\n, event);
-
event_list = ecore_list_new();
ecore_hash_set(event_hash, event, event_list);
+ } else {
+ ecore_list_goto_first(event_list);
+ while ((iter = ecore_list_next(event_list))) {
+ if (iter == comp) {
+ found = 1;
+ }
+ }
+ }
+ if (!found) {
+ /*Now add this component to this list*/
+ ecore_list_append(event_list, comp);
+ //printf(Registered interest in '%s' for this gui
component\n, event);
}
+ }
+}
+
+void entropy_core_component_event_deregister(entropy_gui_component_instance*
comp, char* event)
+{
+ entropy_gui_component_instance* layout;
+ entropy_gui_component_instance* iter;
- /*Now add this component to this list*/
- ecore_list_append(event_list, comp);
+ if (!comp-layout_parent) {
+ /*This must be a layout (or the programmer has messed up,
+* use this as the layout*/
+ layout = comp;
+ } else {
+ layout = comp-layout_parent;
+ }
+
+ /*First we have to see if this layout is currently registered with the
core..*/
+ Ecore_Hash* event_hash = ecore_hash_get(core_core-layout_gui_events,
layout);
+
+ if (!event_hash) {
+ printf(Alert! - tried to de-register events for unreg layout
component, %p\n, layout);
+ } else {
+ Ecore_List* event_list = ecore_hash_get(event_hash, event);
+
+ if (event_list) {
+ ecore_list_goto_first(event_list);
+ while ((iter = ecore_list_current(event_list))) {
+ if (iter == comp) {
+ ecore_list_remove(event_list);
+ } else {
+ ecore_list_next(event_list);
+ }
+ }
+ }
-
-
- //printf(Registered interest in '%s' for this gui
component\n, event);
-
-
}
}
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_gui_event_handlers.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- entropy_gui_event_handlers.c17 Jul 2006 13:41:46 - 1.13
+++ entropy_gui_event_handlers.c5 Sep 2006 06:27:39 - 1.14
@@ -344,7 +344,6 @@
ev-data = request;
/*HACK/FIXME - see what happens if we expire events - this should be on
request*/
- printf(* Calling interceptor..\n);
entropy_notify_event_expire_requestor_layout(requestor);
res = entropy_plugin_filesystem_filelist_get(request);
-
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
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Deregistration on close
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- layout_etk_simple.c 5 Sep 2006 06:27:40 - 1.65
+++ layout_etk_simple.c 5 Sep 2006 06:47:14 - 1.66
@@ -87,11 +87,38 @@
{
entropy_gui_component_instance* instance = data;
- /*Decrement window reference counter*/
- _etk_layout_window_count--;
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_FILE_PROGRESS));
+
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+
(ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT));
+
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_EXTENDED_STAT));
+
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_FILE_STAT));
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+
(ENTROPY_GUI_EVENT_FILE_STAT_AVAILABLE));
- /*TODO - destroy this layout object, and deregister for events*/
+ entropy_core_component_event_deregister (instance,
+entropy_core_gui_event_get
+(ENTROPY_GUI_EVENT_METADATA_GROUPS));
+ /*Deregister this layout*/
+ entropy_core_layout_deregister(instance-core, instance);
+
+
+ /*TODO: Destroy plugin children, and layout*/
+
+ /*Decrement window reference counter*/
+ _etk_layout_window_count--;
+
etk_object_destroy(ETK_OBJECT(instance-gui_object));
if (_etk_layout_window_count == 0) {
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c
Log Message:
* Deregistration on close
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- entropy_core.c 5 Sep 2006 06:27:39 - 1.89
+++ entropy_core.c 5 Sep 2006 06:47:14 - 1.90
@@ -929,6 +929,26 @@
}
}
+/*Deregister a layout object..*/
+void entropy_core_layout_deregister(entropy_core* core,
entropy_gui_component_instance* comp)
+{
+ Ecore_Hash* hash;
+
+ /*First, make a new hash of event types for this new layout component,
this will be the event hash*/
+ if (comp) {
+ printf(DeRegistered layout: %p\n, comp);
+ hash = ecore_hash_get(core-layout_gui_events, comp);
+ if (hash) {
+ ecore_hash_destroy(hash);
+ ecore_hash_remove(core-layout_gui_events, comp);
+ }
+ //printf(DeRegistered a layout component with the core, layout
at: %p.., new hash at %p\n, comp,hash);
+ } else {
+ //printf (Cannot deregister a null layout container\n);
+ }
+
+}
+
/*Register a component to get events created by others in the same layout
container*/
void entropy_core_component_event_register(entropy_gui_component_instance*
comp, char* event) {
entropy_gui_component_instance* layout;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: entropy.h Log Message: * Deregistration on close === RCS file: /cvs/e/e17/proto/entropy/src/include/entropy.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- entropy.h 14 Apr 2006 02:20:17 - 1.32 +++ entropy.h 5 Sep 2006 06:47:14 - 1.33 @@ -63,11 +63,13 @@ int entropy_core_plugin_sub_type_get(entropy_plugin* plugin); entropy_plugin* entropy_plugins_type_get_first(int type, int subtype); void entropy_core_layout_register(entropy_core* core, entropy_gui_component_instance* comp); +void entropy_core_layout_deregister(entropy_core* core, entropy_gui_component_instance* comp); entropy_thumbnail* entropy_thumbnail_create(entropy_generic_file* e_file); char* entropy_layout_global_toolkit_get(); /*Event hierarchy functions*/ void entropy_core_component_event_register(entropy_gui_component_instance* comp, char* event); +void entropy_core_component_event_deregister(entropy_gui_component_instance* comp, char* event); void entropy_core_layout_notify_event(entropy_gui_component_instance* instance, entropy_gui_event* event, int event_type); char* entropy_core_gui_event_get(char* event); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- layout_etk_simple.c 5 Sep 2006 06:47:14 - 1.66
+++ layout_etk_simple.c 5 Sep 2006 07:05:49 - 1.67
@@ -50,6 +50,7 @@
Etk_Widget* popup;
Etk_Widget* localshell;
Etk_Widget* trackback_shell;
+ Etk_Widget* tree_shell;
Ecore_Hash* progress_hash; /*Track progress events-dialogs*/
Etk_Widget* tree_view_menu;
@@ -377,10 +378,12 @@
void entropy_etk_layout_tree_show(entropy_layout_gui* gui, int visible)
{
if (visible) {
+ etk_box_append(ETK_BOX(gui-tree_shell), gui-tree,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
etk_widget_show_all(gui-tree);
etk_paned_position_set(ETK_PANED(gui-paned),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X);
} else {
etk_widget_hide(gui-tree);
+ etk_container_remove(ETK_CONTAINER(gui-tree_shell), gui-tree);
etk_paned_position_set(ETK_PANED(gui-paned), 0);
}
}
@@ -723,20 +726,27 @@
/*Tree init*/
gui-tree = etk_tree_new();
- etk_paned_child1_set(ETK_PANED(gui-paned), gui-tree, ETK_FALSE);
+ gui-tree_shell = etk_vbox_new(ETK_FALSE,0);
+ etk_box_append(ETK_BOX(gui-tree_shell), gui-tree, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+
+ etk_paned_child1_set(ETK_PANED(gui-paned), gui-tree_shell, ETK_FALSE);
etk_tree_mode_set(ETK_TREE(gui-tree), ETK_TREE_MODE_TREE);
col = etk_tree_col_new(ETK_TREE(gui-tree), _(Folders),
etk_tree_model_icon_text_new(ETK_TREE(gui-tree),
ETK_TREE_FROM_FILE), 60);
etk_tree_col_expand_set(col, ETK_TRUE);
etk_tree_build(ETK_TREE(gui-tree));
+ etk_widget_size_request_set(ETK_WIDGET(gui-tree),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X, 50);
/*Register to receive events related to the treeview config*/
entropy_config_misc_callback_register(general.treeviewer,
_entropy_layout_etk_simple_config_cb, gui);
-
-
- etk_widget_size_request_set(ETK_WIDGET(gui-tree),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X, 50);
+ /*If we're configured not to show tree on start, don't show*/
+ if (!entropy_config_misc_is_set(general.treeviewer)) {
+ entropy_etk_layout_tree_show(gui,0);
+ } else {
+ etk_paned_position_set(ETK_PANED(gui-paned),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X);
+ }
/*LocalShell Init*/
gui-localshell = etk_vbox_new(ETK_TRUE,0);
@@ -942,7 +952,6 @@
/*Increment the window counter*/
_etk_layout_window_count++;
- etk_paned_position_set(ETK_PANED(gui-paned),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X);
etk_window_resize(ETK_WINDOW(window), ENTROPY_ETK_WINDOW_WIDTH,
ENTROPY_ETK_WINDOW_HEIGHT);
return layout;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
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:
* Event updates
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_icon_viewer.c 5 Sep 2006 06:27:40 - 1.18
+++ etk_icon_viewer.c 5 Sep 2006 08:10:10 - 1.19
@@ -47,6 +47,8 @@
void
icon_viewer_add_row (entropy_gui_component_instance * instance,
entropy_generic_file * file);
+void icon_viewer_remove_row(entropy_gui_component_instance * instance,
+ entropy_generic_file * file);
int
@@ -87,6 +89,16 @@
}
+void
+gui_file_remove_destroy_single(entropy_gui_component_instance * comp,
+ gui_file* file)
+{
+ entropy_etk_iconbox_viewer *view = comp-data;
+ ecore_hash_remove(view-gui_hash, file-file);
+ entropy_free(file);
+
+}
+
Ecore_List*
gui_object_destroy_and_free (entropy_gui_component_instance * comp,
Ecore_Hash * gui_hash)
@@ -202,6 +214,8 @@
entropy_gui_component_instance *instance;
entropy_etk_iconbox_viewer *viewer;
entropy_generic_file* file;
+ Ecore_List* selected;
+ int selected_count =0;
Etk_Iconbox_Icon* icon;
Etk_Event_Mouse_Down *event;
Etk_Bool ctrl_pressed;
@@ -209,6 +223,7 @@
instance = data;
viewer = instance-data;
event = event_info;
+ selected_count = 0;
if (!(icon = etk_iconbox_icon_get_at_xy(ETK_ICONBOX(viewer-iconbox),
event-canvas.x, event-canvas.y, ETK_FALSE, ETK_TRUE, ETK_TRUE)))
@@ -225,10 +240,24 @@
}
}
} else if (event-button == 3) {
- if (ctrl_pressed != ETK_TRUE) etk_iconbox_unselect_all(icon-iconbox);
+ if (ctrl_pressed != ETK_TRUE)
etk_iconbox_unselect_all(ETK_ICONBOX(viewer-iconbox));
etk_iconbox_icon_select(icon);
- entropy_etk_context_menu_popup(instance, file);
+ selected = ecore_list_new();
+ for (icon = ETK_ICONBOX(viewer-iconbox)-first_icon; icon ; icon =
icon-next ) {
+ if (etk_iconbox_is_selected(icon)) {
+file = etk_iconbox_icon_data_get(icon);
+ecore_list_append(selected, file);
+selected_count++;
+ }
+ }
+
+ if (selected_count 1) {
+ entropy_etk_context_menu_popup_multi(instance,selected);
+ } else {
+ entropy_etk_context_menu_popup(instance, file);
+ }
+ ecore_list_destroy(selected);
}
}
@@ -275,9 +304,8 @@
if (el comp) {
gui_file *obj;
entropy_thumbnail *thumb = (entropy_thumbnail *) el;
- entropy_etk_iconbox_viewer *view = comp-data;
- obj = ecore_hash_get (view-gui_hash, thumb-parent);
+ obj = ecore_hash_get (viewer-gui_hash, thumb-parent);
if (obj) {
etk_iconbox_icon_file_set(obj-icon,
thumb-thumbnail_filename, NULL);
@@ -288,6 +316,12 @@
}
} //End case
break;
+
+ case ENTROPY_NOTIFY_FILE_REMOVE_DIRECTORY:
+ case ENTROPY_NOTIFY_FILE_REMOVE:{
+icon_viewer_remove_row(comp, (entropy_generic_file*)el);
+ }
+ break;
}
}
@@ -312,6 +346,24 @@
}
entropy_core_file_cache_add_reference (file-md5);
+}
+
+void icon_viewer_remove_row(entropy_gui_component_instance * instance,
+ entropy_generic_file * file)
+{
+ entropy_etk_iconbox_viewer* viewer;
+ Etk_Iconbox_Icon* icon;
+ gui_file* event_file = NULL;
+
+ viewer = instance-data;
+
+ if (file) {
+ event_file = ecore_hash_get(viewer-gui_hash,file);
+ if (event_file) {
+ etk_iconbox_icon_del(event_file-icon);
+ gui_file_remove_destroy_single(instance,event_file);
+ }
+ }
}
static void _entropy_etk_icon_viewer_drag_begin_cb(Etk_Object *object, void
*data)
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- etk_list_viewer.c 1 Sep 2006 12:12:50 - 1.71
+++ etk_list_viewer.c 5 Sep 2006 08:10:11 - 1.72
@@ -22,7 +22,6 @@
Etk_Tree_Col* tree_col1;
Etk_Widget* parent_visual;
- Ecore_Hash* etk_list_viewer_row_hash;
Ecore_Hash* gui_hash;
Ecore_List *gui_events;
@@ -235,7 +234,7 @@
Etk_Tree *tree;
const char **types;
unsigned int num_types;
- Etk_Drag *drag;
+ Etk_Widget *drag;
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Start of config-callback system
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- layout_etk_simple.c 2 Sep 2006 01:34:25 - 1.62
+++ layout_etk_simple.c 2 Sep 2006 09:27:46 - 1.63
@@ -67,7 +67,7 @@
char* entropy_plugin_toolkit_get();
entropy_gui_component_instance* entropy_plugin_layout_create (entropy_core *
core);
void entropy_etk_layout_trackback_cb(Etk_Object* obj, void* data);
-
+void entropy_etk_layout_trackback_show(entropy_layout_gui* gui, int visible);
void entropy_layout_etk_simple_local_view_set(entropy_gui_component_instance*
instance,
entropy_gui_component_instance* local);
@@ -167,7 +167,8 @@
return menu_item;
}
-
+/*-*/
+/*Location related functions*/
static void _etk_layout_location_delete_confirm_cb(Etk_Object * object, void
*data)
{
entropy_gui_component_instance* instance = data;
@@ -210,51 +211,81 @@
}
-Entropy_Plugin*
-entropy_plugin_init (entropy_core * core)
+void layout_etk_simple_add_header(entropy_gui_component_instance* instance,
Entropy_Config_Structure* structure_obj)
{
- Entropy_Plugin_Gui* plugin;
- Entropy_Plugin* base;
-
- /*Init etk */
- etk_init (NULL, NULL);
+ void *(*structure_plugin_init) (entropy_core * core,
+ entropy_gui_component_instance *,
+ void* parent_visual,
+ void *data);
- plugin = entropy_malloc(sizeof(Entropy_Plugin_Gui));
- base = ENTROPY_PLUGIN(plugin);
+ entropy_plugin *structure;
+ entropy_generic_file* file;
+ Etk_Tree_Row* row;
+ Etk_Tree_Col* col;
+ entropy_layout_gui* gui = instance-data;
+ char* icon_string = NULL;
+ Ecore_List* layouts;
+ _layout_etk_row_structure_plugin* struct_ref = NULL;
+
+ col = etk_tree_nth_col_get(ETK_TREE(gui-tree), 0);
+
+ /*Parse the file from the URI*/
+ file = entropy_core_parse_uri (structure_obj-uri);
+
+ printf(Object for %s/%s is %p\n, file-path, file-filename, file);
+
+
+ /*This will be moved to a central function. TODO*/
+ if (!strcmp(file-uri_base, file))
+ icon_string = PACKAGE_DATA_DIR /icons/local-system.png;
+ else if (!strcmp(file-uri_base, smb))
+ icon_string = PACKAGE_DATA_DIR /icons/samba-system.png;
+ else if (!strcmp(file-uri_base,sftp))
+ icon_string = PACKAGE_DATA_DIR /icons/sftp-system.png;
+ else if (!strcmp(file-uri_base,vfolder))
+ icon_string = PACKAGE_DATA_DIR /icons/vfolder-system.png;
+
+
+ etk_tree_freeze(ETK_TREE(gui-tree));
+ row = etk_tree_append(ETK_TREE(gui-tree), col,
+ icon_string, structure_obj-name, NULL);
+ etk_tree_thaw(ETK_TREE(gui-tree));
- base-functions.entropy_plugin_init = entropy_plugin_init;
- plugin-gui_functions.layout_main = entropy_plugin_layout_main;
- plugin-gui_functions.layout_create = entropy_plugin_layout_create;
- plugin-gui_functions.toolkit_get= entropy_plugin_toolkit_get;
+
+ structure =
entropy_plugins_type_get_first(ENTROPY_PLUGIN_GUI_COMPONENT,ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW);
+ structure_plugin_init =
+ dlsym (structure-dl_ref, entropy_plugin_gui_instance_new);
- return base;
-}
+ /*We shouldn't really assume it's a folder - but it bootstraps us for
+* now- FIXME*/
+ strcpy(file-mime_type, file/folder);
+ file-filetype = FILE_FOLDER;
-char *
-entropy_plugin_identify ()
-{
- return (char *) etk;
-}
+ if (!strlen (file-mime_type)) {
+ entropy_mime_file_identify (file);
+ }
+
+ instance = (*structure_plugin_init)(instance-core, instance, row,file);
+ instance-plugin = structure;
-int
-entropy_plugin_type_get ()
-{
- return ENTROPY_PLUGIN_GUI_LAYOUT;
-}
+ /*Add to tracker*/
+ ecore_hash_set(_etk_layout_row_reference, row, structure_obj);
+
+ /*Add to layout/plugin tracker - this is to destroy if the user removes a
location*/
+ if (! (layouts = ecore_hash_get(_etk_layout_structure_plugin_reference,
structure_obj))) {
+ layouts = ecore_list_new();
+ ecore_hash_set(_etk_layout_structure_plugin_reference, structure_obj,
layouts);
+ }
-char*
-entropy_plugin_toolkit_get()
-{
- return ENTROPY_TOOLKIT_ETK;
-}
+ struct_ref = entropy_malloc(sizeof(_layout_etk_row_structure_plugin));
+ struct_ref-row = row;
+ struct_ref-structure_plugin = structure;
-void
-entropy_plugin_layout_main ()
-{
+ ecore_list_append(layouts, struct_ref);
- printf(Init ETK main...\n);
- etk_main ();
}
+/*--*/
+
void etk_layout_simple_exit_cb(Etk_Object* obj, void* data)
{
@@ -274,18 +305,30 @@
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy_config.h
Log Message:
* Start of config-callback system
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_config.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- entropy_config.h1 Sep 2006 11:07:51 - 1.13
+++ entropy_config.h2 Sep 2006 09:27:46 - 1.14
@@ -38,6 +38,8 @@
struct Entropy_Config_Item {
char* name;
char* value;
+
+ Ecore_Hash* callback_hash;
};
typedef struct Entropy_Config_Item Entropy_Config_Item;
@@ -73,6 +75,7 @@
void entropy_config_items_init();
void entropy_config_misc_item_str_set(char* item, char* value, int loc);
+void entropy_config_misc_callback_register(char* item, void (*cb)(char*,
void*), void* data);
char* entropy_config_misc_item_str_get(char* item);
#define ENTROPY_CONFIG_INT_UNDEFINED 65535
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Start of config-callback system
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- entropy_config.c2 Sep 2006 01:24:58 - 1.24
+++ entropy_config.c2 Sep 2006 09:27:46 - 1.25
@@ -680,6 +680,8 @@
void entropy_config_misc_item_str_set(char* item, char* value, int loc)
{
Entropy_Config_Item* c_item;
+ void (*cb)();
+ Ecore_List* keys;
if (loc == ENTROPY_CONFIG_LOC_HASH) {
if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
@@ -698,6 +700,17 @@
printf (hash Set (existing) '%s' -
'%s'\n,c_item-name, c_item-value);
}
+
+ if (c_item) {
+ if (c_item-callback_hash) {
+ keys = ecore_hash_keys(c_item-callback_hash);
+ ecore_list_goto_first(keys);
+ while ((cb = ecore_list_remove_first(keys))) {
+ (*cb)(item,
ecore_hash_get(c_item-callback_hash, cb));
+ }
+ ecore_list_destroy(keys);
+ }
+ }
} else if (loc == ENTROPY_CONFIG_LOC_LIST) {
c_item = calloc(1,sizeof(Entropy_Config_Item));
c_item-name = strdup(item);
@@ -706,6 +719,21 @@
_Entropy_Config-Loaded_Config-Misc_Config_Load =
evas_list_append(
_Entropy_Config-Loaded_Config-Misc_Config_Load,
c_item);
printf (Set '%s' - '%s'\n,item, value);
+ }
+}
+
+void entropy_config_misc_callback_register(char* item, void (*cb)(char*,
void*), void* data)
+{
+ Entropy_Config_Item* c_item;
+
+ c_item = ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config,
item);
+ if (c_item) {
+ if (!c_item-callback_hash)
+ c_item-callback_hash =
ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
+
+ ecore_hash_set(c_item-callback_hash, cb, data);
+ } else {
+ printf(Register called for non existent misc config item:
'%s'\n, item);
}
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Hookup items to config callback system
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- layout_etk_simple.c 2 Sep 2006 09:27:46 - 1.63
+++ layout_etk_simple.c 2 Sep 2006 09:51:41 - 1.64
@@ -68,6 +68,7 @@
entropy_gui_component_instance* entropy_plugin_layout_create (entropy_core *
core);
void entropy_etk_layout_trackback_cb(Etk_Object* obj, void* data);
void entropy_etk_layout_trackback_show(entropy_layout_gui* gui, int visible);
+void entropy_etk_layout_tree_show(entropy_layout_gui* gui, int visible);
void entropy_layout_etk_simple_local_view_set(entropy_gui_component_instance*
instance,
entropy_gui_component_instance* local);
@@ -330,12 +331,23 @@
}
/**/
+/*--*/
+/*Tree related functions*/
void entropy_etk_layout_tree_cb(Etk_Object* obj, void* data)
{
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance-data;
if (!etk_widget_is_visible(gui-tree)) {
+ entropy_etk_layout_tree_show(gui,1);
+ } else {
+ entropy_etk_layout_tree_show(gui,0);
+ }
+}
+
+void entropy_etk_layout_tree_show(entropy_layout_gui* gui, int visible)
+{
+ if (visible) {
etk_widget_show_all(gui-tree);
etk_paned_position_set(ETK_PANED(gui-paned),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X);
} else {
@@ -343,6 +355,7 @@
etk_paned_position_set(ETK_PANED(gui-paned), 0);
}
}
+/*--*/
void etk_local_viewer_cb(Etk_Object* obj, void* data)
{
@@ -448,6 +461,11 @@
entropy_etk_layout_trackback_show(gui, 1);
else
entropy_etk_layout_trackback_show(gui, 0);
+ } else if (!strcmp(option, general.treeviewer)) {
+ if (entropy_config_misc_is_set(general.treeviewer))
+ entropy_etk_layout_tree_show(gui,1);
+ else
+ entropy_etk_layout_tree_show(gui,0);
}
}
/**/
@@ -685,6 +703,11 @@
etk_tree_col_expand_set(col, ETK_TRUE);
etk_tree_build(ETK_TREE(gui-tree));
+ /*Register to receive events related to the treeview config*/
+ entropy_config_misc_callback_register(general.treeviewer,
_entropy_layout_etk_simple_config_cb, gui);
+
+
+
etk_widget_size_request_set(ETK_WIDGET(gui-tree),
ENTROPY_ETK_WINDOW_PANE_DEFAULT_X, 50);
/*LocalShell Init*/
@@ -821,7 +844,9 @@
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
menu_item = _entropy_etk_menu_check_item_new(_(Tree View),
ETK_MENU_SHELL(menu));
- etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),1 );
+ if (entropy_config_misc_is_set(general.treeviewer)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),ETK_TRUE
);
+ }
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
menu_item = _entropy_etk_menu_check_item_new(_(Trackback view),
ETK_MENU_SHELL(menu));
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Hookup items to config callback system === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- etk_options_dialog.c2 Sep 2006 01:24:58 - 1.10 +++ etk_options_dialog.c2 Sep 2006 09:51:41 - 1.11 @@ -212,7 +212,7 @@ ETK_BOX_START, ETK_BOX_NONE, 0); etk_box_append(ETK_BOX(ivbox), - etk_options_dialog_checkbox_new(Show tree view, general.treeview), + etk_options_dialog_checkbox_new(Show tree view, general.treeviewer), ETK_BOX_START, ETK_BOX_NONE, 0); etk_box_append(ETK_BOX(ivbox), @@ -296,7 +296,7 @@ entropy_etk_options_object_create(general.presortfolders); entropy_etk_options_object_create(general.hiddenbackup); entropy_etk_options_object_create(general.iconsize); - entropy_etk_options_object_create(general.treeview); + entropy_etk_options_object_create(general.treeviewer); entropy_etk_options_dialog_create(); } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_config.c Log Message: * Hookup items to config callback system === RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- entropy_config.c2 Sep 2006 09:27:46 - 1.25 +++ entropy_config.c2 Sep 2006 09:51:40 - 1.26 @@ -7,7 +7,7 @@ #include Eet.h #include stdarg.h -#define ENTROPY_CONFIG_VERSION 16 +#define ENTROPY_CONFIG_VERSION 17 static Entropy_Config* _Entropy_Config = 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c entropy_core.c
Log Message:
* Much quieter startup
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- entropy_config.c2 Sep 2006 09:51:40 - 1.26
+++ entropy_config.c2 Sep 2006 10:00:16 - 1.27
@@ -405,7 +405,7 @@
for (l =_Entropy_Config-Loaded_Config-Misc_Config_Load ; l; ) {
item = l-data;
ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
item-name, item);
- printf(Loaded misc '%s' - '%s'\n, item-name, item-value);
+ /*printf(Loaded misc '%s' - '%s'\n, item-name,
item-value);*/
l=l-next;
}
@@ -690,7 +690,7 @@
if (value) c_item-value = strdup(value);
ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config, c_item-name,
c_item);
- printf (hash Set '%s' - '%s'\n,c_item-name,
c_item-value);
+ /*printf (hash Set '%s' - '%s'\n,c_item-name,
c_item-value);*/
} else {
if (c_item-value) free(c_item-value);
if (value)
@@ -698,7 +698,7 @@
else
c_item-value = NULL;
- printf (hash Set (existing) '%s' -
'%s'\n,c_item-name, c_item-value);
+ /*printf (hash Set (existing) '%s' -
'%s'\n,c_item-name, c_item-value);*/
}
if (c_item) {
@@ -718,7 +718,7 @@
_Entropy_Config-Loaded_Config-Misc_Config_Load =
evas_list_append(
_Entropy_Config-Loaded_Config-Misc_Config_Load,
c_item);
- printf (Set '%s' - '%s'\n,item, value);
+ /*printf (Set '%s' - '%s'\n,item, value);*/
}
}
@@ -741,7 +741,7 @@
{
Entropy_Config_Item* res;
- printf(Looking for item for '%s'\n, item);
+ /*printf(Looking for item for '%s'\n, item);*/
res =
(Entropy_Config_Item*)ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config,
item);
if (res) {
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- entropy_core.c 17 Jul 2006 13:41:46 - 1.87
+++ entropy_core.c 2 Sep 2006 10:00:16 - 1.88
@@ -217,7 +217,7 @@
if (!strncmp(de-d_name + strlen(de-d_name) -3, .so, 3))
{
snprintf(plugin_path, 1024,%s/%s, PACKAGE_DATA_DIR
/plugins/, de-d_name);
- printf(Loading '%s'...\n, plugin_path);
+ /*printf(Loading '%s'...\n, plugin_path);*/
ecore_list_append(core-plugin_list,
create_plugin_object(plugin_path));
}
}
@@ -250,10 +250,10 @@
while ( (plugin = ecore_list_current(core-plugin_list)) ) {
int res = entropy_plugin_load(core, plugin);
if (res) {
- printf(Removing plugin from list..%s\n,
plugin-filename);
+ /*printf(Removing plugin from list..%s\n,
plugin-filename);*/
ecore_list_remove(core-plugin_list);
} else {
- printf(Going to next plugin...%s\n, plugin-filename);
+ /*printf(Going to next plugin...%s\n,
plugin-filename);*/
ecore_list_next(core-plugin_list);
}
@@ -659,7 +659,7 @@
entropy_plugin_identify =dlsym(plugin-dl_ref,
entropy_plugin_identify);
entropy_plugin_type_get = dlsym(plugin-dl_ref,
entropy_plugin_type_get);
entropy_plugin_sub_type_get = dlsym(plugin-dl_ref,
entropy_plugin_sub_type_get);
-printf(Plugin IDs as: '%s'\n, (*entropy_plugin_identify)());
+/*printf(Plugin IDs as: '%s'\n, (*entropy_plugin_identify)());*/
type = (*entropy_plugin_type_get)();
plugin-type = type;
@@ -938,7 +938,7 @@
/*This must be a layout (or the programmer has messed up,
* use this as the layout*/
layout = comp;
- printf( *** Layout registered itself to receive events\n);
+ /*printf( *** Layout registered itself to receive
events\n);*/
} else {
layout = comp-layout_parent;
}
-
Using Tomcat but need to do more? Need to support web services,
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Config version bump * Start to load/save global config === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_options_dialog.c31 Aug 2006 13:09:34 - 1.6 +++ etk_options_dialog.c1 Sep 2006 10:10:57 - 1.7 @@ -101,6 +101,7 @@ entropy_config_misc_item_set_str(key,c_obj-value); } + ecore_list_destroy(keys); } } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Config version bump
* Start to load/save global config
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- entropy_config.c31 Aug 2006 13:09:34 - 1.21
+++ entropy_config.c1 Sep 2006 10:10:57 - 1.22
@@ -7,7 +7,7 @@
#include Eet.h
#include stdarg.h
-#define ENTROPY_CONFIG_VERSION 14
+#define ENTROPY_CONFIG_VERSION 15
static Entropy_Config* _Entropy_Config = NULL;
@@ -310,7 +310,8 @@
char* data;
int size_ret;
int ok;
-
+ Evas_List* l;
+ Entropy_Config_Item* item;
Entropy_Config_Loaded* mimes;
if (_Entropy_Config) return _Entropy_Config;
@@ -384,9 +385,6 @@
entropy_config_loaded_config_free();
}
-
-
-
/*Load the eet config*/
conf_file = eet_open(_Entropy_Config-config_dir_and_file_eet,
EET_FILE_MODE_READ);
if (conf_file) {
@@ -399,11 +397,21 @@
}
/*--*/
+ /*Xlate misc list-hash*/
+ if (_Entropy_Config-Loaded_Config-Misc_Config)
+ ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+
+ _Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash,ecore_str_compare);
+
+ for (l =_Entropy_Config-Loaded_Config-Misc_Config_Load ; l; ) {
+ item = l-data;
+ ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
item-name, item);
+ printf(Loaded misc '%s' - '%s'\n, item-name, item-value);
+
+ l=l-next;
+ }
-
-
-
-
+
//Init ecore_config
ecore_config_init(entropy_config);
ecore_config_file_load(_Entropy_Config-config_dir_and_file);
@@ -469,11 +477,30 @@
int size_ret;
int ok;
Entropy_Config* config;
+ char* key;
+ Ecore_List* keys;
+ Entropy_Config_Item* item;
config = entropy_core_get_core()-config;
+ /*Xlate misc hash-list*/
+ if (config-Loaded_Config-Misc_Config_Load)
+ evas_list_free(config-Loaded_Config-Misc_Config_Load);
+
+ config-Loaded_Config-Misc_Config_Load = NULL;
+ keys = ecore_hash_keys(config-Loaded_Config-Misc_Config);
+ while ((key = ecore_list_remove_first(keys))) {
+ item = ecore_hash_get(config-Loaded_Config-Misc_Config,key);
+
+ if (item item-name item-value) {
+ config-Loaded_Config-Misc_Config_Load =
+
evas_list_append(config-Loaded_Config-Misc_Config_Load, item);
+ }
+ }
+ ecore_list_destroy(keys);
- conf_file = eet_open(config-config_dir_and_file_eet,
EET_FILE_MODE_WRITE);
+
+ conf_file = eet_open(config-config_dir_and_file_eet,
EET_FILE_MODE_WRITE);
if (conf_file) {
char buf[10];
/*Write the config version..*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- layout_etk_simple.c 31 Aug 2006 02:06:23 - 1.57
+++ layout_etk_simple.c 1 Sep 2006 11:07:51 - 1.58
@@ -562,6 +562,7 @@
Evas_List* structures;
Entropy_Config_Structure* structure;
+ int local_viewer_selected = 0;
/*Entropy related init */
@@ -675,10 +676,16 @@
if (local) {
local_plugin_init =
dlsym (local-dl_ref, entropy_plugin_gui_instance_new);
- instance = (*local_plugin_init)(core, layout,NULL);
- instance-plugin = local;
- gui-list_viewer = instance;
- etk_box_append(ETK_BOX(gui-localshell), instance-gui_object,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ gui-list_viewer = (*local_plugin_init)(core, layout,NULL);
+ gui-list_viewer-plugin = local;
+
+ if (entropy_config_misc_is_set(general.listviewer)) {
+ gui-list_viewer-active=1;
+ local_viewer_selected = 1;
+ etk_box_append(ETK_BOX(gui-localshell),
gui-list_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ } else {
+ gui-list_viewer-active=0;
+ }
}
/*Initialise the icon viewer*/
@@ -689,7 +696,14 @@
dlsym (local-dl_ref, entropy_plugin_gui_instance_new);
gui-iconbox_viewer = (*local_plugin_init)(core, layout,NULL);
gui-iconbox_viewer-plugin = local;
- gui-iconbox_viewer-active=0;
+
+ if (entropy_config_misc_is_set(general.iconviewer)) {
+ gui-iconbox_viewer-active=1;
+ local_viewer_selected = 1;
+ etk_box_append(ETK_BOX(gui-localshell),
gui-iconbox_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ } else {
+ gui-iconbox_viewer-active=0;
+ }
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: entropy_config.h Log Message: * Config load/save === RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_config.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- entropy_config.h31 Aug 2006 13:09:34 - 1.12 +++ entropy_config.h1 Sep 2006 11:07:51 - 1.13 @@ -56,7 +56,7 @@ void entropy_config_destroy(Entropy_Config* config); char* entropy_config_str_get(char* module, char* key); void entropy_config_str_set(char* module, char* key, char* value); - +int entropy_config_misc_is_set(char*); Evas_List* entropy_config_standard_structures_parse (entropy_gui_component_instance * instance, char *config); Entropy_Config_Structure* entropy_config_standard_structures_add (char *name, char *uri); @@ -72,9 +72,11 @@ Entropy_Config_Structure* entropy_config_structure_new(char* name, char* uri); void entropy_config_items_init(); -void entropy_config_misc_item_set_str(char* item, char* value); -char* entropy_config_misc_item_get_str(char* item); +void entropy_config_misc_item_str_set(char* item, char* value, int loc); +char* entropy_config_misc_item_str_get(char* item); #define ENTROPY_CONFIG_INT_UNDEFINED 65535 +#define ENTROPY_CONFIG_LOC_HASH 0 +#define ENTROPY_CONFIG_LOC_LIST 1 #endif - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- entropy_config.c1 Sep 2006 10:10:57 - 1.22
+++ entropy_config.c1 Sep 2006 11:07:51 - 1.23
@@ -7,7 +7,7 @@
#include Eet.h
#include stdarg.h
-#define ENTROPY_CONFIG_VERSION 15
+#define ENTROPY_CONFIG_VERSION 16
static Entropy_Config* _Entropy_Config = NULL;
@@ -351,6 +351,7 @@
if (stat(_Entropy_Config-config_dir_and_file_eet, eetstat)) {
//Make the dir..
+ _Entropy_Config-Loaded_Config = mimes;
entropy_config_defaults_populate(mimes);
@@ -380,8 +381,6 @@
eet_close(conf_file);
}
-
- _Entropy_Config-Loaded_Config = mimes;
entropy_config_loaded_config_free();
}
@@ -398,8 +397,8 @@
/*--*/
/*Xlate misc list-hash*/
- if (_Entropy_Config-Loaded_Config-Misc_Config)
- ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+ /*Init the misc hash*/
+ entropy_config_items_init();
_Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash,ecore_str_compare);
@@ -416,9 +415,6 @@
ecore_config_init(entropy_config);
ecore_config_file_load(_Entropy_Config-config_dir_and_file);
- /*Init the misc hash*/
- entropy_config_items_init();
-
return _Entropy_Config;
}
@@ -495,6 +491,7 @@
if (item item-name item-value) {
config-Loaded_Config-Misc_Config_Load =
evas_list_append(config-Loaded_Config-Misc_Config_Load, item);
+ printf(CONFIG SAVE: Wrote '%s' for '%s'\n,
item-name, item-value);
}
}
ecore_list_destroy(keys);
@@ -619,6 +616,15 @@
config-structures = evas_list_append(config-structures,
entropy_config_structure_new(Virtual Folders,
vfolder:///)
);
+
+ /*Default settings*/
+ entropy_config_misc_item_str_set(general.listviewer,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.iconviewer,
0,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.trackback,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.presortfolders,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.hiddenbackup,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.iconsize,
48,ENTROPY_CONFIG_LOC_LIST);
+
}
Evas_List *
@@ -664,27 +670,64 @@
void entropy_config_items_init()
{
+ if (_Entropy_Config-Loaded_Config-Misc_Config)
+ ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+
_Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash, ecore_str_compare);
}
-void entropy_config_misc_item_set_str(char* item, char* value)
+void entropy_config_misc_item_str_set(char* item, char* value, int loc)
{
Entropy_Config_Item* c_item;
-
- if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
+
+ if (loc == ENTROPY_CONFIG_LOC_HASH) {
+ if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
+ c_item = calloc(1,sizeof(Entropy_Config_Item));
+ c_item-name = strdup(item);
+ if (value) c_item-value = strdup(value);
+
+
ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config, c_item-name,
c_item);
+ printf (hash Set '%s' - '%s'\n,c_item-name,
c_item-value);
+ } else {
+ if (c_item-value) free(c_item-value);
+ if (value)
+ c_item-value = strdup(value);
+ else
+ c_item-value = NULL;
+
+ printf (hash Set (existing) '%s' -
'%s'\n,c_item-name, c_item-value);
+ }
+ } else if (loc == ENTROPY_CONFIG_LOC_LIST) {
c_item = calloc(1,sizeof(Entropy_Config_Item));
c_item-name = strdup(item);
- if (value) c_item-value = strdup(value);
- ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
c_item-name, c_item);
+ if (value) c_item-value = strdup(value);
- } else {
-
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_options_dialog.c1 Sep 2006 10:10:57 - 1.7
+++ etk_options_dialog.c1 Sep 2006 11:07:51 - 1.8
@@ -99,7 +99,7 @@
c_obj = ecore_hash_get(_entropy_global_options_hash,
key);
printf('%s' - '%s'\n, key, c_obj-value);
- entropy_config_misc_item_set_str(key,c_obj-value);
+ entropy_config_misc_item_str_set(key,c_obj-value,
ENTROPY_CONFIG_LOC_HASH);
}
ecore_list_destroy(keys);
}
@@ -170,7 +170,11 @@
etk_signal_connect(toggled, ETK_OBJECT(radio),
ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.iconviewer );
-
+ check = etk_check_button_new_with_label(Show trackback viewer);
+ etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.trackback);
+
check = etk_check_button_new_with_label(Sort folders before
files);
etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect(toggled, ETK_OBJECT(check),
@@ -248,6 +252,7 @@
entropy_etk_options_object_create(general.listviewer);
entropy_etk_options_object_create(general.iconviewer);
+ entropy_etk_options_object_create(general.trackback);
entropy_etk_options_object_create(general.presortfolders);
entropy_etk_options_object_create(general.hiddenbackup);
entropy_etk_options_object_create(general.iconsize);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- layout_etk_simple.c 1 Sep 2006 11:07:51 - 1.58
+++ layout_etk_simple.c 1 Sep 2006 11:27:35 - 1.59
@@ -49,6 +49,7 @@
Etk_Widget* popup;
Etk_Widget* localshell;
+ Etk_Widget* trackback_shell;
Ecore_Hash* progress_hash; /*Track progress events-dialogs*/
Ecore_Hash* properties_request_hash;
@@ -278,10 +279,11 @@
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance-data;
- if (!etk_widget_is_visible(gui-trackback-gui_object)) {
- etk_widget_show_all(gui-trackback-gui_object);
+ if (etk_container_is_child(ETK_CONTAINER(gui-trackback_shell),
gui-trackback-gui_object) == ETK_FALSE) {
+ etk_box_append(ETK_BOX(gui-trackback_shell),
gui-trackback-gui_object, ETK_BOX_START, ETK_BOX_NONE,0);
+ etk_widget_show_all(ETK_WIDGET(gui-trackback-gui_object));
} else {
- etk_widget_hide(gui-trackback-gui_object);
+ etk_container_remove(ETK_CONTAINER(gui-trackback_shell),
gui-trackback-gui_object);
}
}
@@ -536,7 +538,6 @@
Etk_Widget *window;
entropy_layout_gui *gui;
entropy_gui_component_instance *layout;
- entropy_gui_component_instance* instance= NULL;
void *(*local_plugin_init) (entropy_core * core,
entropy_gui_component_instance *,
@@ -653,6 +654,9 @@
gui-localshell = etk_vbox_new(ETK_TRUE,0);
etk_paned_child2_set(ETK_PANED(gui-paned), gui-localshell, ETK_TRUE);
+ /*Trackback container init*/
+ gui-trackback_shell = etk_vbox_new(ETK_TRUE,0);
+
/*Popup init*/
gui-popup = etk_menu_new();
etk_signal_connect(row_clicked, ETK_OBJECT( gui-tree ),
@@ -726,6 +730,10 @@
gui-trackback = (*local_plugin_init)(core, layout,NULL);
gui-trackback-plugin = trackback;
gui-trackback-active=1;
+
+ if (entropy_config_misc_is_set(general.trackback)) {
+ etk_box_append(ETK_BOX(gui-trackback_shell),
gui-trackback-gui_object, ETK_BOX_START, ETK_BOX_NONE, 0);
+ }
}
@@ -807,11 +815,7 @@
etk_box_append(ETK_BOX(vbox), menubar, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- if (trackback) {
- etk_box_append(ETK_BOX(vbox), gui-trackback-gui_object,
ETK_BOX_START, ETK_BOX_NONE, 0);
- }
-
+ etk_box_append(ETK_BOX(vbox), gui-trackback_shell, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox), gui-paned, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/*---*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- layout_etk_simple.c 1 Sep 2006 11:27:35 - 1.59
+++ layout_etk_simple.c 1 Sep 2006 11:59:45 - 1.60
@@ -783,7 +783,9 @@
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
menu_item = _entropy_etk_menu_check_item_new(_(Trackback view),
ETK_MENU_SHELL(menu));
- etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),1 );
+ if (entropy_config_misc_is_set(general.trackback)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_trackback_cb), layout);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* More config dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_options_dialog.c1 Sep 2006 11:07:51 - 1.8
+++ etk_options_dialog.c1 Sep 2006 11:59:45 - 1.9
@@ -14,9 +14,13 @@
Entropy_Etk_Options_Object* entropy_etk_options_object_create(char* name)
{
Entropy_Etk_Options_Object* obj;
+ char* val;
obj = calloc(1, sizeof(Entropy_Etk_Options_Object));
obj-name = strdup(name);
+ if ( (val = entropy_config_misc_item_str_get(name))) {
+ obj-value = strdup(val);
+ }
ecore_hash_set(_entropy_global_options_hash, obj-name, obj);
@@ -97,9 +101,11 @@
keys = ecore_hash_keys(_entropy_global_options_hash);
while ((key = ecore_list_remove_first(keys))) {
c_obj = ecore_hash_get(_entropy_global_options_hash,
key);
- printf('%s' - '%s'\n, key, c_obj-value);
-
- entropy_config_misc_item_str_set(key,c_obj-value,
ENTROPY_CONFIG_LOC_HASH);
+
+ if (c_obj-value) {
+ printf('%s' - '%s'\n, key, c_obj-value);
+
entropy_config_misc_item_str_set(key,c_obj-value, ENTROPY_CONFIG_LOC_HASH);
+ }
}
ecore_list_destroy(keys);
}
@@ -117,6 +123,42 @@
}
+Etk_Widget* etk_options_dialog_checkbox_new(char* label, char* config_item)
+{
+ Etk_Widget* check;
+
+check = etk_check_button_new_with_label(label);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
config_item);
+
+ if (entropy_config_misc_is_set(config_item))
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check),
ETK_TRUE);
+ else
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check),
ETK_FALSE);
+
+ return check;
+}
+
+Etk_Widget* etk_options_dialog_radiobutton_new(char* label, char* config_item,
Etk_Widget* from)
+{
+ Etk_Widget* radio;
+
+if (!from)
+ radio = etk_radio_button_new_with_label(label,NULL);
+ else
+ radio = etk_radio_button_new_with_label_from_widget(label,
ETK_RADIO_BUTTON(from));
+
+ etk_signal_connect(toggled, ETK_OBJECT(radio),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
config_item);
+
+ if (entropy_config_misc_is_set(config_item))
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(radio),
ETK_TRUE);
+ else
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(radio),
ETK_FALSE);
+
+ return radio;
+}
+
void entropy_etk_options_dialog_create()
{
Etk_Widget* toolbar;
@@ -127,7 +169,6 @@
Etk_Widget* ivbox;
Etk_Widget* iivbox;
Etk_Widget* radio;
- Etk_Widget* check;
Etk_Widget* hbox;
Etk_Widget* slider;
Etk_Widget* label;
@@ -161,29 +202,24 @@
iivbox = etk_vbox_new(ETK_FALSE,0);
etk_container_add(ETK_CONTAINER(iframe), iivbox);
- radio = etk_radio_button_new_with_label(List view, NULL);
- etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
- etk_signal_connect(toggled, ETK_OBJECT(radio),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.listviewer );
- radio = etk_radio_button_new_with_label_from_widget(Icon view,
ETK_RADIO_BUTTON(radio));
- etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
- etk_signal_connect(toggled, ETK_OBJECT(radio),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.iconviewer );
-
- check = etk_check_button_new_with_label(Show trackback viewer);
- etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
- etk_signal_connect(toggled, ETK_OBJECT(check),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.trackback);
+ radio=etk_options_dialog_radiobutton_new(Icon view,
general.iconviewer, NULL);
+ etk_box_append(ETK_BOX(iivbox),radio , ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_box_append(ETK_BOX(iivbox), etk_options_dialog_radiobutton_new(
+ List view, general.listviewer, radio),
ETK_BOX_START, ETK_BOX_NONE, 0);
+
+ etk_box_append(ETK_BOX(ivbox),
+ etk_options_dialog_checkbox_new(Show trackback
viewer,
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c layout_etk_simple.c
Log Message:
* More config work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- etk_list_viewer.c 24 Aug 2006 23:18:03 - 1.70
+++ etk_list_viewer.c 1 Sep 2006 12:12:50 - 1.71
@@ -120,21 +120,27 @@
{
gui_file *file1, *file2;
int val;
+ int presort_folder;
if (!tree || !row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
file2 = ecore_hash_get(etk_list_viewer_row_hash, row2);
+
+ presort_folder = entropy_config_misc_is_set(general.presortfolders);
if (file1 file2) {
val = strcasecmp(file1-file-filename, file2-file-filename);
-if ( !strcmp(file1-file-mime_type, file/folder)
strcmp(file2-file-mime_type, file/folder))
-return -1;
-else if (!strcmp(file2-file-mime_type, file/folder)
strcmp(file1-file-mime_type, file/folder))
-return 1;
-else
+if (presort_folder) {
+if ( !strcmp(file1-file-mime_type, file/folder)
strcmp(file2-file-mime_type, file/folder))
+return -1;
+else if (!strcmp(file2-file-mime_type, file/folder)
strcmp(file1-file-mime_type, file/folder))
+return 1;
+else
+return val;
+} else
return val;
} else {
printf(Could not locate file!\n);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- layout_etk_simple.c 1 Sep 2006 11:59:45 - 1.60
+++ layout_etk_simple.c 1 Sep 2006 12:12:50 - 1.61
@@ -686,9 +686,11 @@
if (entropy_config_misc_is_set(general.listviewer)) {
gui-list_viewer-active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui-list_viewer-gui_object);
etk_box_append(ETK_BOX(gui-localshell),
gui-list_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui-list_viewer-active=0;
+ etk_widget_show(gui-list_viewer-gui_object);
}
}
@@ -704,9 +706,11 @@
if (entropy_config_misc_is_set(general.iconviewer)) {
gui-iconbox_viewer-active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui-iconbox_viewer-gui_object);
etk_box_append(ETK_BOX(gui-localshell),
gui-iconbox_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui-iconbox_viewer-active=0;
+ etk_widget_show(gui-iconbox_viewer-gui_object);
}
}
@@ -795,11 +799,17 @@
menu_item = _entropy_etk_radio_item_new(_(List View (Alt-l)), NULL,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), VISUAL, gui-list_viewer);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set(general.listviewer)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
menu_item = _entropy_etk_radio_item_new(_(Icon View (Alt-i)), menu_item,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), VISUAL, gui-iconbox_viewer);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set(general.iconviewer)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
/*Debug menu*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Bugfixes
* More config items
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_icon_viewer.c 26 Aug 2006 12:59:15 - 1.16
+++ etk_icon_viewer.c 1 Sep 2006 12:39:39 - 1.17
@@ -36,6 +36,8 @@
};
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value ) ;
+
/*- boilerplate -*/
typedef struct gui_file gui_file;
@@ -169,14 +171,8 @@
return base;
}
-void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value )
{
- entropy_gui_component_instance *instance;
- entropy_etk_iconbox_viewer *viewer;
-
- instance = data;
- viewer = instance-data;
-
etk_iconbox_model_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer-iconbox)),
(value*2) + 14,
value + 22,
@@ -189,6 +185,17 @@
0, value + 2, (value*2) + 4, 12, 0.5,0);
}
+void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+{
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+
+ instance = data;
+ viewer = instance-data;
+
+ entropy_etk_icon_viewer_icon_size_set(viewer, value);
+}
+
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data)
{
entropy_gui_component_instance *instance;
@@ -309,7 +316,7 @@
Etk_Iconbox *iconbox;
const char **types;
unsigned int num_types;
- Etk_Drag *drag;
+ Etk_Widget *drag;
Etk_Widget *image;
entropy_gui_component_instance* instance;
entropy_etk_iconbox_viewer* viewer;
@@ -388,8 +395,8 @@
printf(Drag buffer: %s\n, buffer);
- etk_drag_types_set(drag, types, num_types);
- etk_drag_data_set(drag, buffer, strlen(buffer)+1);
+ etk_drag_types_set(ETK_DRAG(drag), types, num_types);
+ etk_drag_data_set(ETK_DRAG(drag), buffer, strlen(buffer)+1);
@@ -412,6 +419,7 @@
entropy_etk_iconbox_viewer *viewer;
char **dnd_types;
int dnd_types_num=0;
+ char* size;
instance = entropy_gui_component_instance_new ();
@@ -422,6 +430,11 @@
/*Make the various widgets*/
viewer-vbox = etk_vbox_new(ETK_FALSE,0);
+
+ instance-gui_object = viewer-vbox;
+ instance-core = core;
+ instance-data = viewer;
+ instance-layout_parent = layout;
/*Make the slider*/
viewer-slider = etk_hslider_new(10,128, 48, 1, 1);
@@ -432,7 +445,10 @@
viewer-iconbox = etk_iconbox_new();
etk_box_append(ETK_BOX(viewer-vbox), viewer-iconbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+ if ((size = entropy_config_misc_item_str_get(general.iconsize))) {
+ etk_range_value_set(ETK_RANGE(viewer-slider), atoi(size));
+ entropy_etk_icon_viewer_icon_size_set(viewer, atoi(size));
+ }
/*etk_iconbox_model_icon_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer-iconbox)),
0,0,64,64,1,1);*/
@@ -440,11 +456,6 @@
etk_signal_connect(mouse_down, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
- instance-gui_object = viewer-vbox;
- instance-core = core;
- instance-data = viewer;
- instance-layout_parent = layout;
-
/*DND Setup*/
/* dnd_types_num = 1;
dnd_types = entropy_malloc(dnd_types_num* sizeof(char*));
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_config.c Log Message: * Comment these out until auto-hide is done === RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- entropy_config.c1 Sep 2006 11:07:51 - 1.23 +++ entropy_config.c2 Sep 2006 01:24:58 - 1.24 @@ -620,6 +620,7 @@ /*Default settings*/ entropy_config_misc_item_str_set(general.listviewer, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.iconviewer, 0,ENTROPY_CONFIG_LOC_LIST); + entropy_config_misc_item_str_set(general.treeviewer, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.trackback, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.presortfolders, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.hiddenbackup, 1,ENTROPY_CONFIG_LOC_LIST); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Comment these out until auto-hide is done === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_options_dialog.c1 Sep 2006 11:59:45 - 1.9 +++ etk_options_dialog.c2 Sep 2006 01:24:58 - 1.10 @@ -211,6 +211,10 @@ etk_options_dialog_checkbox_new(Show trackback viewer, general.trackback), ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(ivbox), + etk_options_dialog_checkbox_new(Show tree view, general.treeview), + ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(ivbox), etk_options_dialog_checkbox_new(Show folders before files, general.presortfolders), ETK_BOX_START, ETK_BOX_NONE, 0); @@ -248,20 +252,20 @@ /*Advanced*/ - button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); + /*button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Advanced Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame);*/ /*Thumbnail*/ - button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); + /*button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Thumbnail Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); */ - etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460); + //etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460); hbox = etk_hbox_new(ETK_FALSE,5); @@ -292,6 +296,7 @@ entropy_etk_options_object_create(general.presortfolders); entropy_etk_options_object_create(general.hiddenbackup); entropy_etk_options_object_create(general.iconsize); + entropy_etk_options_object_create(general.treeview); entropy_etk_options_dialog_create(); } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: layout_etk_simple.c Log Message: * Disable debug menu === RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- layout_etk_simple.c 1 Sep 2006 12:12:50 - 1.61 +++ layout_etk_simple.c 2 Sep 2006 01:34:25 - 1.62 @@ -813,11 +813,11 @@ /*Debug menu*/ - menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Debug), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL); + /*menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Debug), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL); menu = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu)); menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(File Cache), ETK_STOCK_PLACES_FOLDER_SAVED_SEARCH, ETK_MENU_SHELL(menu), NULL); - etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(etk_file_cache_dialog_cb), layout); + etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(etk_file_cache_dialog_cb), layout);*/ /*Help menu*/ menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Help), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy_config.h
Log Message:
* More config dialog work - nearly there.
===
RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_config.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- entropy_config.h30 Mar 2006 04:02:03 - 1.10
+++ entropy_config.h31 Aug 2006 10:42:09 - 1.11
@@ -32,14 +32,20 @@
};
typedef struct Entropy_Config_Loaded Entropy_Config_Loaded;
+struct Entropy_Config_Item {
+ char* name;
+ char* value;
+};
+typedef struct Entropy_Config_Item Entropy_Config_Item;
struct Entropy_Config {
char* config_dir;
char* config_dir_and_file;
char* config_dir_and_file_eet;
-
Entropy_Config_Loaded* Loaded_Config;
+ Ecore_Hash* Misc_Config;
+ Evas_List* MisC_Config_Load;
};
typedef struct Entropy_Config Entropy_Config;
@@ -64,6 +70,9 @@
void entropy_config_defaults_populate(Entropy_Config_Loaded* config);
Entropy_Config_Structure* entropy_config_structure_new(char* name, char* uri);
+void entropy_config_items_init();
+void entropy_config_misc_item_set_str(char* item, char* value);
+char* entropy_config_misc_item_get_str(char* item);
#define ENTROPY_CONFIG_INT_UNDEFINED 65535
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* More config dialog work - nearly there.
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- entropy_config.c15 Jul 2006 12:50:54 - 1.19
+++ entropy_config.c31 Aug 2006 10:42:09 - 1.20
@@ -299,6 +299,9 @@
_Entropy_Config = entropy_malloc(sizeof(Entropy_Config));
mimes = entropy_malloc(sizeof(Entropy_Config_Loaded));
+ /*Init the misc hash*/
+ entropy_config_items_init();
+
i = strlen(entropy_core_home_dir_get()) + strlen(/.e/entropy) + 2;
_Entropy_Config-config_dir = entropy_malloc(i * sizeof(char));
@@ -486,8 +489,6 @@
}
-
-
/*Config helper functions*/
void entropy_config_defaults_populate(Entropy_Config_Loaded* config)
{
@@ -573,14 +574,8 @@
config-structures = evas_list_append(config-structures,
entropy_config_structure_new(Virtual Folders,
vfolder:///)
);
-
-
-
-
}
-
-
Evas_List *
entropy_config_standard_structures_parse (entropy_gui_component_instance *
instance,
char *config)
@@ -622,3 +617,18 @@
free (eg);
}
+void entropy_config_items_init()
+{
+ _Entropy_Config-Misc_Config = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
+}
+
+void entropy_config_misc_item_set_str(char* item, char* value)
+{
+ ecore_hash_set(_Entropy_Config-Misc_Config, strdup(item),
strdup(value));
+ printf (Set '%s' - '%s'\n,item, value);
+}
+
+char* entropy_config_misc_item_get_str(char* item)
+{
+ return ecore_hash_get(_Entropy_Config-Misc_Config, item);
+}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* Yet more options dialog work. The core is now there :)
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_options_dialog.c31 Aug 2006 10:53:22 - 1.3
+++ etk_options_dialog.c31 Aug 2006 11:13:34 - 1.4
@@ -11,7 +11,7 @@
char* value;
} Entropy_Etk_Options_Object;
-void entropy_etk_options_object_create(char* name)
+Entropy_Etk_Options_Object* entropy_etk_options_object_create(char* name)
{
Entropy_Etk_Options_Object* obj;
@@ -19,6 +19,8 @@
obj-name = strdup(name);
ecore_hash_set(_entropy_global_options_hash, obj-name, obj);
+
+ return obj;
}
/*CB Handlers*/
@@ -63,6 +65,11 @@
etk_widget_show_all(frame);
}
+void entropy_etk_options_dialog_close(Etk_Object* obj, void* data)
+{
+ etk_widget_hide(_entropy_etk_options_dialog);
+}
+
void entropy_etk_options_dialog_create()
{
Etk_Widget* toolbar;
@@ -73,8 +80,8 @@
Etk_Widget* ivbox;
Etk_Widget* iivbox;
Etk_Widget* radio;
-
- _entropy_global_options_hash = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
+ Etk_Widget* check;
+ Etk_Widget* hbox;
_entropy_etk_options_dialog = etk_window_new();
@@ -87,14 +94,13 @@
etk_toolbar_style_set(ETK_TOOLBAR(toolbar), ETK_TOOLBAR_ICONS);
etk_box_append(ETK_BOX(vbox), toolbar, ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_box_append(ETK_BOX(vbox),_entropy_etk_options_local_box ,
ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox),_entropy_etk_options_local_box ,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
/*General settings*/
button = etk_tool_button_new_from_stock(ETK_STOCK_APPLICATIONS_SYSTEM);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
/*General frame*/
- /*etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_location_radio_cb), dialog );*/
frame = etk_frame_new(General Settings);
etk_box_append(ETK_BOX(_entropy_etk_options_local_box), frame,
ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame);
@@ -108,11 +114,18 @@
radio = etk_radio_button_new_with_label(List view, NULL);
etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_signal_connect(toggled, ETK_OBJECT(radio),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.listviewer );
radio = etk_radio_button_new_with_label_from_widget(Icon view,
ETK_RADIO_BUTTON(radio));
etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
-
-
-
+ etk_signal_connect(toggled, ETK_OBJECT(radio),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.iconviewer );
+
+
+ check = etk_check_button_new_with_label(Sort folders before
files);
+ etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.presortfolders );
/*Advanced*/
button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM);
@@ -129,13 +142,36 @@
etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460);
+
+
+ hbox = etk_hbox_new(ETK_FALSE,5);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
+
+ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(entropy_etk_options_dialog_close), (void*)0);
+ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_APPLY);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(entropy_etk_options_dialog_close), (void*)1);
+ button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CANCEL);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_signal_connect(pressed, ETK_OBJECT(button),
ETK_CALLBACK(entropy_etk_options_dialog_close), (void*)2);
}
void entropy_etk_options_dialog_show()
{
- if (!_entropy_etk_options_dialog)
+ if (!_entropy_etk_options_dialog) {
+ Entropy_Etk_Options_Object* obj;
+
+ _entropy_global_options_hash =
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* Yet more options dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_options_dialog.c31 Aug 2006 11:13:34 - 1.4
+++ etk_options_dialog.c31 Aug 2006 12:29:15 - 1.5
@@ -46,6 +46,24 @@
}
}
+void entropy_etk_options_slider_generic_cb(Etk_Object* obj, double value,
void* data)
+{
+ char* name;
+ char px[10];
+ Entropy_Etk_Options_Object* opt;
+
+ name = (char*)data;
+
+ opt = ecore_hash_get(_entropy_global_options_hash, name);
+ if (opt) {
+ snprintf(px,sizeof(px), %.0f, value);
+ if (opt-value) free(opt-value);
+ opt-value = strdup(px);
+
+ printf(Set '%s' for '%s'\n, opt-name, opt-value);
+ }
+}
+
void entropy_etk_options_dialog_frame_set(Etk_Object* obj, void* data)
{
Etk_Widget* frame;
@@ -70,6 +88,18 @@
etk_widget_hide(_entropy_etk_options_dialog);
}
+void etk_options_dialog_slider_cb(Etk_Object* obj, double value, void* data)
+{
+ Etk_Widget* label;
+ char px[10];
+
+ label = data;
+ snprintf(px,sizeof(px), %.0f, value);
+ etk_label_set(ETK_LABEL(label), px);
+
+
+}
+
void entropy_etk_options_dialog_create()
{
Etk_Widget* toolbar;
@@ -82,6 +112,8 @@
Etk_Widget* radio;
Etk_Widget* check;
Etk_Widget* hbox;
+ Etk_Widget* slider;
+ Etk_Widget* label;
_entropy_etk_options_dialog = etk_window_new();
@@ -125,7 +157,38 @@
check = etk_check_button_new_with_label(Sort folders before
files);
etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect(toggled, ETK_OBJECT(check),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.presortfolders );
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.presortfolders);
+ check = etk_check_button_new_with_label(Show hidden and backup
files);
+ etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.hiddenbackup);
+
+ iframe = etk_frame_new(Icon View Settings);
+ etk_box_append(ETK_BOX(ivbox), iframe, ETK_BOX_START, ETK_BOX_NONE,
0);
+ iivbox = etk_vbox_new(ETK_FALSE,0);
+ etk_container_add(ETK_CONTAINER(iframe), iivbox);
+
+ label = etk_label_new(Icon size (pixels));
+ etk_box_append(ETK_BOX(iivbox), label, ETK_BOX_START,
ETK_BOX_NONE, 0);
+
+ hbox = etk_hbox_new(ETK_FALSE,0);
+ etk_box_append(ETK_BOX(iivbox), hbox, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ slider = etk_hslider_new(10,128, 48, 1, 1);
+ etk_box_append(ETK_BOX(hbox), slider, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ label = etk_label_new();
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_signal_connect(value_changed, ETK_OBJECT(slider),
ETK_CALLBACK(etk_options_dialog_slider_cb),
+ label);
+ etk_signal_connect(value_changed, ETK_OBJECT(slider),
ETK_CALLBACK(entropy_etk_options_slider_generic_cb),
+ general.iconsize);
+
+
+ iframe = etk_frame_new(List View Settings);
+ etk_box_append(ETK_BOX(ivbox), iframe, ETK_BOX_START, ETK_BOX_NONE,
0);
+
+
+
+
/*Advanced*/
button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM);
@@ -169,6 +232,8 @@
entropy_etk_options_object_create(general.listviewer);
entropy_etk_options_object_create(general.iconviewer);
entropy_etk_options_object_create(general.presortfolders);
+ entropy_etk_options_object_create(general.hiddenbackup);
+ entropy_etk_options_object_create(general.iconsize);
entropy_etk_options_dialog_create();
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* Hook config further into config_core
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_options_dialog.c31 Aug 2006 12:29:15 - 1.5
+++ etk_options_dialog.c31 Aug 2006 13:09:34 - 1.6
@@ -85,7 +85,23 @@
void entropy_etk_options_dialog_close(Etk_Object* obj, void* data)
{
+ Entropy_Etk_Options_Object* c_obj;
+ Ecore_List* keys;
+ char* key;
+
etk_widget_hide(_entropy_etk_options_dialog);
+
+ if ((int)data == 0) {
+ printf(Save config selected..\n);
+
+ keys = ecore_hash_keys(_entropy_global_options_hash);
+ while ((key = ecore_list_remove_first(keys))) {
+ c_obj = ecore_hash_get(_entropy_global_options_hash,
key);
+ printf('%s' - '%s'\n, key, c_obj-value);
+
+ entropy_config_misc_item_set_str(key,c_obj-value);
+ }
+ }
}
void etk_options_dialog_slider_cb(Etk_Object* obj, double value, void* data)
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Hook config further into config_core
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- entropy_config.c31 Aug 2006 10:42:09 - 1.20
+++ entropy_config.c31 Aug 2006 13:09:34 - 1.21
@@ -16,6 +16,7 @@
static Eet_Data_Descriptor *_entropy_config_mime_binding_edd;
static Eet_Data_Descriptor *_entropy_config_mime_binding_action_edd;
static Eet_Data_Descriptor *_entropy_config_structure_edd;
+static Eet_Data_Descriptor *_entropy_config_item_edd;
void entropy_config_loaded_config_free()
@@ -118,6 +119,25 @@
EET_DATA_DESCRIPTOR_ADD_LIST(_entropy_config_mime_binding_edd,
Entropy_Config_Mime_Binding, actions, actions,
_entropy_config_mime_binding_action_edd);
+ _entropy_config_item_edd =
+ eet_data_descriptor_new(entropy_config_item,
sizeof(Entropy_Config_Item),
+ (void *(*)(void *))evas_list_next,
+ (void *(*)(void *, void *))evas_list_append,
+ (void *(*)(void *))evas_list_data,
+ (void *(*)(void *))evas_list_free,
+ (void (*)
+ (void *,
+int (*)(void *, const char *, void *, void *),
+void *))evas_hash_foreach, (void *(*)(void *,
+ const
char
+ *,
+ void *))
+ evas_hash_add, (void (*)(void *))evas_hash_free);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_entropy_config_item_edd,
Entropy_Config_Item,
+ name, name, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_entropy_config_item_edd,
Entropy_Config_Item,
+ value, value, EET_T_STRING);
+
_entropy_config_structure_edd =
eet_data_descriptor_new(entropy_config_mime_binding,
sizeof(Entropy_Config_Structure),
(void *(*)(void *))evas_list_next,
@@ -138,8 +158,6 @@
uri, uri, EET_T_STRING);
-
-
_entropy_config_loaded_edd =
eet_data_descriptor_new(entropy_config_loaded,
sizeof(Entropy_Config_Loaded),
(void *(*)(void *))evas_list_next,
@@ -158,7 +176,8 @@
_entropy_config_mime_binding_edd);
EET_DATA_DESCRIPTOR_ADD_LIST(_entropy_config_loaded_edd,
Entropy_Config_Loaded, structures, structures,
_entropy_config_structure_edd);
-
+ EET_DATA_DESCRIPTOR_ADD_LIST(_entropy_config_loaded_edd,
Entropy_Config_Loaded, Misc_Config_Load, Misc_Config_Load,
+ _entropy_config_item_edd);
}
@@ -299,10 +318,6 @@
_Entropy_Config = entropy_malloc(sizeof(Entropy_Config));
mimes = entropy_malloc(sizeof(Entropy_Config_Loaded));
- /*Init the misc hash*/
- entropy_config_items_init();
-
-
i = strlen(entropy_core_home_dir_get()) + strlen(/.e/entropy) + 2;
_Entropy_Config-config_dir = entropy_malloc(i * sizeof(char));
snprintf(_Entropy_Config-config_dir, i, %s/%s,
entropy_core_home_dir_get(), /.e/entropy);
@@ -393,6 +408,9 @@
ecore_config_init(entropy_config);
ecore_config_file_load(_Entropy_Config-config_dir_and_file);
+ /*Init the misc hash*/
+ entropy_config_items_init();
+
return _Entropy_Config;
}
@@ -619,16 +637,27 @@
void entropy_config_items_init()
{
- _Entropy_Config-Misc_Config = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
+ _Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash, ecore_str_compare);
}
void entropy_config_misc_item_set_str(char* item, char* value)
{
- ecore_hash_set(_Entropy_Config-Misc_Config, strdup(item),
strdup(value));
+ Entropy_Config_Item* c_item;
+
+ if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
+ c_item = calloc(1,sizeof(Entropy_Config_Item));
+ c_item-name = strdup(item);
+ if (value) c_item-value = strdup(value);
+ ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
c_item-name, c_item);
+
+ } else {
+ if (c_item-value) free(c_item-value);
+ if (value) c_item-value = strdup(c_item-value);
+ }
printf (Set '%s' - '%s'\n,item, value);
}
char*
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_theme.c
Log Message:
* Oops - sorry dude, not quite :)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_theme.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_theme.c 31 Aug 2006 19:41:31 - 1.7
+++ etk_theme.c 1 Sep 2006 02:42:57 - 1.8
@@ -277,7 +277,7 @@
if ((home = getenv(HOME)))
{
/* TODO: etk_config_dir_get? */
- path = malloc(strlen(home) + strlen(subdir) + strlen(/.etk//.edj) +
strlen(theme_name) + 1);
+ path = malloc(strlen(home) + strlen(subdir) + strlen(/.e/etk//.edj) +
strlen(theme_name) + 1);
sprintf(path, %s/.e/etk/%s/%s.edj, home, subdir, theme_name);
if (ecore_file_exists(path))
return path;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am layout_etk_simple.c
Log Message:
* Options dialog stub
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Makefile.am 17 Jul 2006 13:41:47 - 1.40
+++ Makefile.am 31 Aug 2006 02:06:23 - 1.41
@@ -106,6 +106,7 @@
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
$(top_srcdir)/src/dialogs/etk_mime_dialog_main.c \
$(top_srcdir)/src/dialogs/etk_properties_dialog.c \
+ $(top_srcdir)/src/dialogs/etk_options_dialog.c \
$(top_srcdir)/src/dialogs/etk_file_cache_debug_dialog.c
layout_etk_simple_la_CFLAGS = @ETK_CFLAGS@
layout_etk_simple_la_LDFLAGS = -module -avoid-version
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- layout_etk_simple.c 24 Aug 2006 23:18:03 - 1.56
+++ layout_etk_simple.c 31 Aug 2006 02:06:23 - 1.57
@@ -5,6 +5,7 @@
#include etk_progress_dialog.h
#include etk_properties_dialog.h
#include etk_user_interaction_dialog.h
+#include entropy_etk_options_dialog.h
#include etk_mime_dialog.h
#include etk_file_cache_dialog.h
#include entropy_etk_context_menu.h
@@ -267,6 +268,11 @@
etk_mime_dialog_create();
}
+void entropy_etk_options_dialog_cb(Etk_Object* obj, void* data)
+{
+ entropy_etk_options_dialog_show();
+}
+
void entropy_etk_layout_trackback_cb(Etk_Object* obj, void* data)
{
entropy_gui_component_instance* instance = data;
@@ -740,6 +746,10 @@
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Program
Associations..),
ETK_STOCK_EMBLEM_SYMBOLIC_LINK, ETK_MENU_SHELL(menu), NULL);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_mime_dialog_cb), layout);
+
+ menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Options..),
+ ETK_STOCK_EMBLEM_SYMBOLIC_LINK, ETK_MENU_SHELL(menu), NULL);
+ etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_options_dialog_cb), layout);
/*View menu*/
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(View),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), 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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Added Files: entropy_etk_options_dialog.h Log Message: * Options dialog stub - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Added Files: etk_options_dialog.c Log Message: * Options dialog stub - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_file_context_menu.c Log Message: * Add restore function checks * Better icons for context menu === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_file_context_menu.c 26 Aug 2006 12:59:15 - 1.16 +++ etk_file_context_menu.c 28 Aug 2006 10:47:12 - 1.17 @@ -404,24 +404,31 @@ etk_signal_connect(popped_up, ETK_OBJECT(menu), ETK_CALLBACK(_entropy_etk_context_menu_popup_cb), NULL); _entropy_etk_context_menu_open_with_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Open With), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, + _(Open With), ETK_STOCK_APPLICATION_X_EXECUTABLE, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_context_menu_open_with = etk_menu_new(); - etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_open_with_item), ETK_MENU(_entropy_etk_context_menu_open_with)); + etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_open_with_item), + ETK_MENU(_entropy_etk_context_menu_open_with)); _entropy_etk_context_menu_groups_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Groups), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Groups), + ETK_STOCK_EMBLEM_IMPORTANT, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_context_menu_groups = etk_menu_new(); - etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_item), ETK_MENU(_entropy_etk_context_menu_groups)); + etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_item), + ETK_MENU(_entropy_etk_context_menu_groups)); _entropy_etk_context_menu_groups_add_to_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Add to..), ETK_STOCK_EDIT_COPY, + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Add to..), ETK_STOCK_DIALOG_APPLY, ETK_MENU_SHELL(_entropy_etk_context_menu_groups),NULL); + _entropy_etk_context_menu_groups_add_to = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_add_to_item), ETK_MENU(_entropy_etk_context_menu_groups_add_to)); _entropy_etk_context_menu_groups_remove_from_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Remove from..), ETK_STOCK_EDIT_COPY, + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Remove from..), ETK_STOCK_DIALOG_CLOSE, ETK_MENU_SHELL(_entropy_etk_context_menu_groups),NULL); _entropy_etk_context_menu_groups_remove_from = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_remove_from_item), @@ -429,44 +436,56 @@ 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, _(Copy (Ctrl-c)), + ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Cut (Ctrl-x)), ETK_STOCK_EDIT_CUT, 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); 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); + _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), +
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: plugin_base.h plugin_helper.h Log Message: * Make double click actually work * Trash restore work === RCS file: /cvs/e/e17/proto/entropy/src/include/plugin_base.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- plugin_base.h 20 Aug 2006 05:51:11 - 1.15 +++ plugin_base.h 26 Aug 2006 12:59:15 - 1.16 @@ -77,6 +77,7 @@ void (*group_file_add) (entropy_generic_file * file,char*); void (*group_file_remove) (entropy_generic_file * file,char*); + void (*file_trash_restore) (Ecore_List* files, entropy_gui_component_instance* instance); } file_functions; === RCS file: /cvs/e/e17/proto/entropy/src/include/plugin_helper.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- plugin_helper.h 20 Aug 2006 05:51:11 - 1.24 +++ plugin_helper.h 26 Aug 2006 12:59:15 - 1.25 @@ -14,6 +14,7 @@ int entropy_plugin_filesystem_file_copy(entropy_generic_file* source, char* dest, entropy_gui_component_instance* requester); int entropy_plugin_filesystem_file_copy_multi(Ecore_List* files, char* dest, entropy_gui_component_instance* requester); int entropy_plugin_filesystem_file_move_multi(Ecore_List* files, char* dest, entropy_gui_component_instance* requester); +int entropy_plugin_filesystem_file_trash_restore(Ecore_List* files, entropy_gui_component_instance* requester); int entropy_plugin_filesystem_file_move(entropy_generic_file* source, char* dest, entropy_gui_component_instance* requester); void entropy_plugin_filesystem_directory_create(entropy_generic_file* file, char* dir); Ecore_List* entropy_plugin_filesystem_filelist_get(entropy_file_request* request); @@ -21,6 +22,7 @@ void entropy_plugin_operation_respond(long operation, int response); void entropy_plugin_filesystem_file_rename(entropy_generic_file* file, char* dest); void entropy_event_extended_stat_expect(Entropy_Generic_File* file, entropy_gui_component_instance* instance); + void entropy_plugin_filesystem_metadata_groups_get(entropy_gui_component_instance* instance) ; - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
* Make double click actually work
* Trash restore work
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_file_context_menu.c 20 Aug 2006 05:51:11 - 1.15
+++ etk_file_context_menu.c 26 Aug 2006 12:59:15 - 1.16
@@ -20,6 +20,7 @@
Etk_Widget* _entropy_etk_context_menu_groups_remove_from_item = NULL;
Etk_Widget* _entropy_etk_context_menu_rename_menu_item = NULL;
+Etk_Widget* _entropy_etk_context_menu_restore_trash_menu_item = NULL;
entropy_generic_file* _entropy_etk_context_menu_current_folder = NULL;
entropy_generic_file* _entropy_etk_context_menu_current_file = NULL;
@@ -230,6 +231,20 @@
}
static void
+_entropy_etk_context_menu_trash_restore_cb(Etk_Object *object, void *data)
+{
+ Ecore_List* files;
+
+ files = ecore_list_new();
+ ecore_list_append(files, _entropy_etk_context_menu_current_file);
+
+ entropy_plugin_filesystem_file_trash_restore(
+ files, _entropy_etk_context_menu_current_instance);
+
+ ecore_list_destroy(files);
+}
+
+static void
_entropy_etk_context_menu_group_file_add_remove_cb(Etk_Object *object, void
*data)
{
const char* label;
@@ -448,6 +463,15 @@
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_trash_copy_cb), NULL);
+ /*Trash restore*/
+ _entropy_etk_context_menu_restore_trash_menu_item =
+ _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Restore
from Trash (test)),
+ ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL);
+
+ etk_signal_connect(activated,
ETK_OBJECT(_entropy_etk_context_menu_restore_trash_menu_item),
+
ETK_CALLBACK(_entropy_etk_context_menu_trash_restore_cb), NULL);
+
+
}
entropy_etk_context_menu_metadata_groups_populate();
@@ -467,6 +491,11 @@
etk_widget_show_all(_entropy_etk_context_menu_open_with_item);
etk_widget_show_all(_entropy_etk_context_menu_rename_menu_item);
+ if (!strcmp(current_file-uri_base, trash))
+
etk_widget_show_all(_entropy_etk_context_menu_restore_trash_menu_item);
+ else
+ etk_widget_hide(_entropy_etk_context_menu_restore_trash_menu_item);
+
/*Mode = single*/
_entropy_etk_context_menu_mode = 0;
@@ -482,6 +511,7 @@
/*Hide*/
etk_widget_hide(_entropy_etk_context_menu_open_with_item);
etk_widget_hide(_entropy_etk_context_menu_rename_menu_item);
+ etk_widget_hide(_entropy_etk_context_menu_restore_trash_menu_item);
if (_entropy_etk_context_menu_selected_files)
ecore_list_destroy(_entropy_etk_context_menu_selected_files);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c filesystem.c
Log Message:
* Make double click actually work
* Trash restore work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_icon_viewer.c 26 Aug 2006 04:15:32 - 1.15
+++ etk_icon_viewer.c 26 Aug 2006 12:59:15 - 1.16
@@ -438,7 +438,7 @@
0,0,64,64,1,1);*/
- etk_signal_connect(mouse_up, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
+ etk_signal_connect(mouse_down, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
instance-gui_object = viewer-vbox;
instance-core = core;
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- filesystem.c20 Aug 2006 05:51:11 - 1.76
+++ filesystem.c26 Aug 2006 12:59:15 - 1.77
@@ -29,6 +29,8 @@
void entropy_filesystem_file_copy (entropy_generic_file * file, char *path_to,
entropy_gui_component_instance * instance);
void entropy_filesystem_file_copy_multi (Ecore_List* files, char *path_to,
entropy_gui_component_instance * instance);
void entropy_filesystem_file_move_multi (Ecore_List* files, char *path_to,
entropy_gui_component_instance * instance);
+void entropy_filesystem_file_trash_restore (Ecore_List* files,
entropy_gui_component_instance * instance);
+
void entropy_filesystem_file_move (entropy_generic_file * file, char *path_to,
entropy_gui_component_instance * instance);
@@ -617,6 +619,7 @@
plugin-file_functions.file_copy_multi = entropy_filesystem_file_copy_multi;
plugin-file_functions.file_move_multi = entropy_filesystem_file_move_multi;
plugin-file_functions.file_move = entropy_filesystem_file_move;
+ plugin-file_functions.file_trash_restore =
entropy_filesystem_file_trash_restore;
plugin-file_functions.file_rename = entropy_filesystem_file_rename;
plugin-file_functions.operation_respond =
entropy_filesystem_operation_respond;
@@ -1123,4 +1126,22 @@
entropy_filesystem_metadata_groups_retrieve()
{
return metadata_groups;
+}
+
+
+void entropy_filesystem_file_trash_restore (Ecore_List* files,
entropy_gui_component_instance * instance)
+{
+ long id;
+ entropy_generic_file* file;
+ Ecore_List* evfs_files;
+
+ evfs_files = ecore_list_new();
+ ecore_list_goto_first(files);
+ while ( (file = ecore_list_next(files)) ) {
+ ecore_list_append(evfs_files, evfs_parse_uri_single(file-uri));
+ }
+
+ /*Track the restore action */
+ id = evfs_client_file_trash_restore (con, evfs_files);
+ ecore_hash_set(evfs_dir_requests, (long*)id, instance);
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
plugin_helper.c
Log Message:
* Make double click actually work
* Trash restore work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugin_helper.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- plugin_helper.c 20 Aug 2006 05:51:11 - 1.28
+++ plugin_helper.c 26 Aug 2006 12:59:15 - 1.29
@@ -257,6 +257,21 @@
return 1;
}
+int entropy_plugin_filesystem_file_trash_restore(Ecore_List* files,
entropy_gui_component_instance* requester)
+{
+ entropy_gui_component_instance *instance = requester;
+ Entropy_Plugin_File* plugin =
+ENTROPY_PLUGIN_FILE(entropy_plugins_type_get_first
(ENTROPY_PLUGIN_BACKEND_FILE,
+ ENTROPY_PLUGIN_SUB_TYPE_ALL));
+
+ if (plugin) {
+ (*plugin-file_functions.file_trash_restore) (files, instance);
+ }
+
+ return 1;
+}
+
+
int entropy_plugin_filesystem_file_move(entropy_generic_file* source, char*
dest, entropy_gui_component_instance* requester)
{
entropy_gui_component_instance *instance = requester;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
filesystem.c
Log Message:
* Leak catch
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- filesystem.c26 Aug 2006 12:59:15 - 1.77
+++ filesystem.c26 Aug 2006 13:17:00 - 1.78
@@ -1134,14 +1134,21 @@
long id;
entropy_generic_file* file;
Ecore_List* evfs_files;
+ evfs_filereference* ref;
evfs_files = ecore_list_new();
ecore_list_goto_first(files);
while ( (file = ecore_list_next(files)) ) {
- ecore_list_append(evfs_files, evfs_parse_uri_single(file-uri));
+ printf(Parsing %s\n, file-uri);
+ if ( (ref = evfs_parse_uri_single(file-uri))) {
+ ecore_list_append(evfs_files, ref);
+ }
}
/*Track the restore action */
id = evfs_client_file_trash_restore (con, evfs_files);
ecore_hash_set(evfs_dir_requests, (long*)id, instance);
+
+ ecore_list_destroy(files);
+ ecore_list_destroy(evfs_files);
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Double click support
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_icon_viewer.c 24 Aug 2006 23:18:03 - 1.14
+++ etk_icon_viewer.c 26 Aug 2006 04:15:32 - 1.15
@@ -35,6 +35,7 @@
Ecore_Hash* properties_request_hash;
};
+void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
/*- boilerplate -*/
typedef struct gui_file gui_file;
@@ -188,7 +189,7 @@
0, value + 2, (value*2) + 4, 12, 0.5,0);
}
-void _etk_entropy_click_cb(Etk_Object *object, void *event_info, void *data)
+void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data)
{
entropy_gui_component_instance *instance;
entropy_etk_iconbox_viewer *viewer;
@@ -208,8 +209,10 @@
file = etk_iconbox_icon_data_get(icon);
if (event-button == 1) {
- if (file) {
- entropy_event_action_file(file,instance);
+ if (event-flags ETK_MOUSE_DOUBLE_CLICK) {
+ if (file) {
+ entropy_event_action_file(file,instance);
+ }
}
} else if (event-button == 3) {
etk_iconbox_unselect_all(icon-iconbox);
@@ -435,7 +438,7 @@
0,0,64,64,1,1);*/
- etk_signal_connect(mouse_up, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_etk_entropy_click_cb), instance);
+ etk_signal_connect(mouse_up, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
instance-gui_object = viewer-vbox;
instance-core = core;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
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 etk_structure_viewer.c
layout_etk_simple.c
Log Message:
* New ETK API fixup
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_icon_viewer.c 16 Aug 2006 01:20:53 - 1.13
+++ etk_icon_viewer.c 24 Aug 2006 23:18:03 - 1.14
@@ -194,7 +194,7 @@
entropy_etk_iconbox_viewer *viewer;
entropy_generic_file* file;
Etk_Iconbox_Icon* icon;
- Etk_Event_Mouse_Up_Down *event;
+ Etk_Event_Mouse_Down *event;
instance = data;
viewer = instance-data;
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- etk_list_viewer.c 16 Aug 2006 01:20:53 - 1.69
+++ etk_list_viewer.c 24 Aug 2006 23:18:03 - 1.70
@@ -191,7 +191,7 @@
/* Called when the user presses a key */
static void _etk_entropy_list_viewer_key_down_cb(Etk_Object *object, void
*event, void *data)
{
- Etk_Event_Key_Up_Down *key_event = event;
+ Etk_Event_Key_Down *key_event = event;
Etk_Tree* tree;
Evas_List* row_list;
@@ -394,7 +394,7 @@
}
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up_Down *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_list_viewer* viewer;
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_structure_viewer.c 6 Aug 2006 10:01:10 - 1.27
+++ etk_structure_viewer.c 24 Aug 2006 23:18:03 - 1.28
@@ -4,7 +4,7 @@
#include limits.h
#include Etk.h
#include etk_progress_dialog.h
-#include entropy_etk_context_menu.h;
+#include entropy_etk_context_menu.h
static int etk_callback_setup = 0;
static Ecore_Hash* instance_map_hash = NULL;
@@ -120,7 +120,7 @@
}
}
-static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_structure_viewer* viewer;
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- layout_etk_simple.c 16 Aug 2006 01:20:53 - 1.55
+++ layout_etk_simple.c 24 Aug 2006 23:18:03 - 1.56
@@ -191,7 +191,7 @@
}
static void _etk_layout_row_clicked(Etk_Object *object,
- Etk_Tree_Row *row, Etk_Event_Mouse_Up_Down *event, void *data)
+ Etk_Tree_Row *row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance-data;
@@ -358,13 +358,14 @@
void
_entropy_etk_layout_key_down_cb(Etk_Object *object, void *event, void *data)
{
- Etk_Event_Key_Up_Down *ev;
+ Etk_Event_Key_Down *ev;
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance-data;
ev = event;
- if(evas_key_modifier_is_set(ev-modifiers, Control))
+ /*FIXME: How do we do modifiers now?*/
+ /*if(evas_key_modifier_is_set(ev-modifiers, Control))
{
if (!strcmp(ev-key, q)) {
layout_etk_simple_quit(instance-core);
@@ -378,7 +379,7 @@
}
- }
+ }*/
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
