Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c
Log Message:
Latest patch from my best buddy elm:
Use e17 internal eap editor
don't allow icon options for unmatched app icons
show border menu when right click on ap icons
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_mod_main.c 12 Dec 2005 14:38:33 -0000 1.92
+++ e_mod_main.c 12 Dec 2005 23:34:05 -0000 1.93
@@ -848,14 +848,17 @@
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "Icon Options");
- e_menu_item_submenu_set(mi, eb->icon_menu);
- if (eb->selected_ic)
- e_menu_item_icon_edje_set(mi, eb->selected_ic->app->path, "icon");
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
+ if (eb->selected_ic && (eb->selected_ic->app != _engage_unmatched_app))
+ {
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, "Icon Options");
+ e_menu_item_submenu_set(mi, eb->icon_menu);
+ if (eb->selected_ic)
+ e_menu_item_icon_edje_set(mi, eb->selected_ic->app->path, "icon");
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_separator_set(mi, 1);
+ }
/* Enabled */
mi = e_menu_item_new(mn);
@@ -2029,6 +2032,14 @@
e_border_raise(ai->border);
e_desk_show(ai->border->desk);
}
+ if (ev->button == 3)
+ {
+ e_int_border_menu_show(ai->border,
+ ev->output.x,
+ ev->output.y, 0,
+ ev->timestamp);
+ e_util_container_fake_mouse_up_all_later(ai->ic->eb->con);
+ }
}
static void
@@ -2494,30 +2505,7 @@
Engage_Bar *eb;
eb = data;
- // the following is stolen from e17/e/src/bin/e_border.c
- char *file;
- char *command;
- char *full;
- Ecore_Exe *process;
-
- if (eb->selected_ic)
- {
-
- file = eb->selected_ic->app->path;
- command = "e_util_eapp_edit ";
- full = malloc(strlen(file) + strlen(command) + 1);
- strcpy(full, command);
- strcat(full, file);
-
- process = ecore_exe_run(full, NULL);
- if (!process || !ecore_exe_pid_get(process))
- {
- e_error_dialog_show(_("Icon Edit Error"),
- _("Error starting icon editor\n\n"
- "please install e_util_eapp_edit\n"
- "or make sure it is in your PATH\n"));
- }
- }
+ e_eap_edit_show(eb->con, eb->selected_ic->app);
}
static void
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
