fix recent menu api break

SVN revision: 52044
This commit is contained in:
Miculcy Brian 2010-09-09 14:48:37 +00:00
parent 6ef574001d
commit 5021100caf
1 changed files with 17 additions and 15 deletions

View File

@ -359,60 +359,62 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
ev = event_info;
if ((ev->button == 3) && (!cpu_conf->menu))
{
E_Menu *mn;
E_Menu *ma, *mg, *mo;
E_Menu_Item *mi;
int cx, cy, cw, ch;
mn = e_menu_new();
cpu_conf->menu_interval = mn;
ma = e_menu_new();
e_menu_post_deactivate_callback_set(ma, _menu_cb_post, inst);
cpu_conf->menu = ma;
mo = e_menu_new();
cpu_conf->menu_interval = mo;
mi = e_menu_item_new(mn);
mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, D_("Fast (0.5 sec)"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (inst->ci->interval <= 0.5) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _cpu_menu_fast, inst);
mi = e_menu_item_new(mn);
mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, D_("Medium (1 sec)"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (inst->ci->interval > 0.5) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _cpu_menu_medium, inst);
mi = e_menu_item_new(mn);
mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, D_("Normal (2 sec)"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (inst->ci->interval >= 2.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _cpu_menu_normal, inst);
mi = e_menu_item_new(mn);
mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, D_("Slow (5 sec)"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (inst->ci->interval >= 5.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _cpu_menu_slow, inst);
mi = e_menu_item_new(mn);
mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, D_("Very Slow (30 sec)"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (inst->ci->interval >= 30.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _cpu_menu_very_slow, inst);
mn = e_menu_new();
cpu_conf->menu = mn;
e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
mi = e_menu_item_new(mn);
mg = e_menu_new();
mi = e_menu_item_new(mg);
e_menu_item_label_set(mi, D_("Time Between Updates"));
e_menu_item_submenu_set(mi, cpu_conf->menu_interval);
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
e_gadcon_client_util_menu_items_append(inst->gcc, ma, mg, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch);
e_menu_activate_mouse(mn,
e_menu_activate_mouse(ma,
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);