parent
32e588dfda
commit
b2000416d3
|
@ -48,7 +48,7 @@ e_int_config_places_module(E_Container *con, const char *params)
|
|||
snprintf(buf, sizeof(buf), "%s/e-module-places.edj", places_conf->module->dir);
|
||||
|
||||
/* create new config dialog */
|
||||
cfd = e_config_dialog_new(con, D_("Places Configuration"), "Places",
|
||||
cfd = e_config_dialog_new(con, D_("Places Settings"), "Places",
|
||||
"fileman/places", buf, 0, v, NULL);
|
||||
places_conf->cfd = cfd;
|
||||
return cfd;
|
||||
|
|
|
@ -414,26 +414,30 @@ _places_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
|
|||
ev = event;
|
||||
if ((ev->button == 3) && (!inst->menu))
|
||||
{
|
||||
E_Menu *ma, *mg;
|
||||
|
||||
/* grab current zone */
|
||||
zone = e_util_zone_current_get(e_manager_current_get());
|
||||
|
||||
/* create popup menu */
|
||||
inst->menu = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(inst->menu, _places_cb_menu_post,
|
||||
inst);
|
||||
ma = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(ma, _places_cb_menu_post, inst);
|
||||
inst->menu = ma;
|
||||
|
||||
mi = e_menu_item_new(inst->menu);
|
||||
e_menu_item_label_set(mi, D_("Configuration"));
|
||||
mg = e_menu_new();
|
||||
|
||||
mi = e_menu_item_new(mg);
|
||||
e_menu_item_label_set(mi, D_("Settings"));
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-system");
|
||||
e_menu_item_callback_set(mi, _places_cb_menu_configure, NULL);
|
||||
|
||||
/* Each Gadget Client has a utility menu from the Container */
|
||||
e_gadcon_client_util_menu_items_append(inst->gcc, inst->menu, 0);
|
||||
e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0);
|
||||
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
|
||||
NULL, NULL);
|
||||
|
||||
/* show the menu relative to gadgets position */
|
||||
e_menu_activate_mouse(inst->menu, zone, (x + ev->output.x),
|
||||
e_menu_activate_mouse(ma, zone, (x + ev->output.x),
|
||||
(y + ev->output.y), 1, 1,
|
||||
E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
|
||||
evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
|
||||
|
|
Loading…
Reference in New Issue