e-modules/mail: always show inboxes in top-level
SVN revision: 58003
This commit is contained in:
parent
394a0ff350
commit
3254557194
|
@ -226,11 +226,18 @@ _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
m = e_menu_new ();
|
m = e_menu_new ();
|
||||||
|
mi = e_menu_item_new (m);
|
||||||
|
e_menu_item_label_set (mi, D_("Settings"));
|
||||||
|
e_util_menu_item_theme_icon_set(mi, "preferences-system");
|
||||||
|
e_menu_item_callback_set (mi, _mail_menu_cb_configure, inst);
|
||||||
|
|
||||||
|
m = e_gadcon_client_util_menu_items_append (inst->gcc, m, 0);
|
||||||
|
e_menu_post_deactivate_callback_set (m, _mail_menu_cb_post, inst);
|
||||||
|
mail_config->menu = m;
|
||||||
|
|
||||||
if ((inst->ci->boxes) && (eina_list_count (inst->ci->boxes) > 0))
|
if ((inst->ci->boxes) && (eina_list_count (inst->ci->boxes) > 0))
|
||||||
{
|
{
|
||||||
E_Menu_Item *mm;
|
mi = NULL;
|
||||||
|
|
||||||
snprintf (buf, sizeof (buf), "%s/module.edj",
|
snprintf (buf, sizeof (buf), "%s/module.edj",
|
||||||
e_module_dir_get (mail_config->module));
|
e_module_dir_get (mail_config->module));
|
||||||
|
|
||||||
|
@ -241,23 +248,19 @@ _mail_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
|
||||||
cb = l->data;
|
cb = l->data;
|
||||||
if (!cb)
|
if (!cb)
|
||||||
continue;
|
continue;
|
||||||
mi = e_menu_item_new (m);
|
mi = e_menu_item_new_relative (m, mi);
|
||||||
snprintf (buf, sizeof (buf), "%s: %d/%d", cb->name, cb->num_new,
|
snprintf (buf, sizeof (buf), "%s: %d/%d", cb->name, cb->num_new,
|
||||||
cb->num_total);
|
cb->num_total);
|
||||||
e_menu_item_label_set (mi, buf);
|
e_menu_item_label_set (mi, buf);
|
||||||
if ((cb->exec) && (cb->use_exec))
|
if ((cb->exec) && (cb->use_exec))
|
||||||
e_menu_item_callback_set (mi, _mail_menu_cb_exec, cb);
|
e_menu_item_callback_set (mi, _mail_menu_cb_exec, cb);
|
||||||
}
|
}
|
||||||
|
if (mi)
|
||||||
|
{
|
||||||
|
mi = e_menu_item_new_relative(m, mi);
|
||||||
|
e_menu_item_separator_set(mi, 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mi = e_menu_item_new (m);
|
|
||||||
e_menu_item_label_set (mi, D_("Settings"));
|
|
||||||
e_util_menu_item_theme_icon_set(mi, "preferences-system");
|
|
||||||
e_menu_item_callback_set (mi, _mail_menu_cb_configure, inst);
|
|
||||||
|
|
||||||
m = e_gadcon_client_util_menu_items_append (inst->gcc, m, 0);
|
|
||||||
e_menu_post_deactivate_callback_set (m, _mail_menu_cb_post, inst);
|
|
||||||
mail_config->menu = m;
|
|
||||||
|
|
||||||
e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h);
|
e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h);
|
||||||
e_menu_activate_mouse (m,
|
e_menu_activate_mouse (m,
|
||||||
|
|
Loading…
Reference in New Issue