enlightenment
/
enlightenment-module-news
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e-modules: update do e_gadcon_util_cliet_menu_append api changes. allowing to have settings menu in toplevel again 

SVN revision: 57828
This commit is contained in:
Hannes Janetzek 2011-03-17 17:24:53 +00:00
parent 74ad4c2ceb
commit 16e1e60764
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/news_menu.c
View File

@ -27,8 +27,8 @@ news_menu_item_show(News_Item *ni)
E_Menu *mn;
mn = e_menu_new();
mn = e_gadcon_client_util_menu_items_append(ni->gcc, mn, 0);
e_menu_post_deactivate_callback_set(mn, _cb_item_deactivate_post, ni);
_menu_append(mn, ni);
ni->menu = mn;
@ -51,17 +51,19 @@ news_menu_feed_show(News_Feed *f)
char buf[256];
mn = e_menu_new();
mn = e_gadcon_client_util_menu_items_append(f->item->gcc, mn, 0);
e_menu_post_deactivate_callback_set(mn, _cb_feed_deactivate_post, f);
mi = e_menu_item_new(mn);
_menu_append(mn, f->item);
mi = e_menu_item_new_relative(mn, NULL);
snprintf(buf, sizeof(buf), "Feed (%s) Properties", f->name);
e_menu_item_label_set(mi, D_(buf));
if (f->icon && f->icon[0])
e_menu_item_icon_file_set(mi, f->icon);
e_menu_item_callback_set(mi, _cb_configure_feed, f);
_menu_append(mn, f->item);
f->menu = mn;
return 1;
@ -118,7 +120,7 @@ news_menu_browser_hide(News_Item *ni)
static void
_menu_append(E_Menu *ma, News_Item *ni)
{
E_Menu *mg, *mn;
E_Menu *mn;
E_Menu_Item *mi;
if (ni->config->feed_refs)
@ -137,16 +139,11 @@ _menu_append(E_Menu *ma, News_Item *ni)
e_menu_item_callback_set(mi, _cb_item_update, ni);
}
mi = e_menu_item_new(ma);
e_menu_item_label_set(mi, D_("Gadget Contents"));
news_theme_menu_icon_set(mi, "icon");
e_menu_item_callback_set(mi, _cb_configure_item_content, ni);
mi = e_menu_item_new(ma);
e_menu_item_separator_set(mi, 1);
mn = e_menu_new();
mi = e_menu_item_new_relative(ma, NULL);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_("Gadget"));
e_util_menu_item_theme_icon_set(mi, "preferences-system");
@ -162,13 +159,16 @@ _menu_append(E_Menu *ma, News_Item *ni)
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set(mi, _cb_configure_main, NULL);
mi = e_menu_item_new(ma);
mi = e_menu_item_new_relative(ma, NULL);
e_menu_item_label_set(mi, D_("Settings"));
e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_submenu_set(mi, mn);
mg = e_menu_new();
e_gadcon_client_util_menu_items_append(ni->gcc, ma, mg, 0);
mi = e_menu_item_new_relative(ma, NULL);
e_menu_item_label_set(mi, D_("Gadget Contents"));
news_theme_menu_icon_set(mi, "icon");
e_menu_item_callback_set(mi, _cb_configure_item_content, ni);
}
static void