DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a shortcut to the help contents

Browse Source
This commit is contained in:
Pierre Pronchery 2013-04-11 03:22:20 +02:00
parent b56798df8c
commit 420b591860
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/systray.c
View File

@ -115,7 +115,6 @@ static void _systray_on_activate(gpointer data)
/* systray_on_popup_menu */ /* systray_on_popup_menu */
static void _popup_menu_on_show_about(gpointer data);
static void _popup_menu_on_show_contacts(gpointer data); static void _popup_menu_on_show_contacts(gpointer data);
static void _popup_menu_on_show_dialer(gpointer data); static void _popup_menu_on_show_dialer(gpointer data);
static void _popup_menu_on_show_logs(gpointer data); static void _popup_menu_on_show_logs(gpointer data);
@ -124,6 +123,8 @@ static void _popup_menu_on_show_write(gpointer data);
static void _popup_menu_on_show_settings(gpointer data); static void _popup_menu_on_show_settings(gpointer data);
static void _popup_menu_on_resume(gpointer data); static void _popup_menu_on_resume(gpointer data);
static void _popup_menu_on_suspend(gpointer data); static void _popup_menu_on_suspend(gpointer data);
static void _popup_menu_on_contents(gpointer data);
static void _popup_menu_on_show_about(gpointer data);
static void _popup_menu_on_quit(gpointer data); static void _popup_menu_on_quit(gpointer data);
static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button, static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button,
@ -156,7 +157,12 @@ static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button,
{ "gtk-media-pause", "S_uspend telephony", { "gtk-media-pause", "S_uspend telephony",
_popup_menu_on_suspend }, _popup_menu_on_suspend },
{ NULL, NULL, NULL }, { NULL, NULL, NULL },
{ "help-contents", "_Contents", _popup_menu_on_contents },
#if GTK_CHECK_VERSION(2, 6, 0)
{ GTK_STOCK_ABOUT, "_About", _popup_menu_on_show_about }, { GTK_STOCK_ABOUT, "_About", _popup_menu_on_show_about },
#else
{ NULL, "_About", _popup_menu_on_show_about },
#endif
{ NULL, NULL, NULL }, { NULL, NULL, NULL },
{ "gtk-quit", "_Quit", _popup_menu_on_quit }, { "gtk-quit", "_Quit", _popup_menu_on_quit },
}; };
@ -172,10 +178,13 @@ static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button,
continue; continue;
} }
menuitem = gtk_image_menu_item_new_with_mnemonic(items[i].name); menuitem = gtk_image_menu_item_new_with_mnemonic(items[i].name);
if(items[i].icon != NULL)
{
image = gtk_image_new_from_icon_name(items[i].icon, image = gtk_image_new_from_icon_name(items[i].icon,
GTK_ICON_SIZE_MENU); GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(
image); menuitem), image);
}
g_signal_connect_swapped(menuitem, "activate", G_CALLBACK( g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(
items[i].callback), systray); items[i].callback), systray);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@ -184,6 +193,11 @@ static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button,
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, time); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, time);
} }
static void _popup_menu_on_contents(gpointer data)
{
desktop_help_contents(PACKAGE, "phone");
}
static void _popup_menu_on_show_about(gpointer data) static void _popup_menu_on_show_about(gpointer data)
{ {
Systray * systray = data; Systray * systray = data;