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 -0000 1.17
+++ etk_icon_viewer.c 5 Sep 2006 06:27:40 -0000 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 -0000 1.64
+++ layout_etk_simple.c 5 Sep 2006 06:27:40 -0000 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 Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
