diff options
| author | RichardHitt <rbh00@netcom.com> | 2012-12-03 15:54:51 -0800 |
|---|---|---|
| committer | RichardHitt <rbh00@netcom.com> | 2012-12-03 15:54:51 -0800 |
| commit | c956b913b33ce598857c645bb526c6746241243f (patch) | |
| tree | c84fe9c41a23d22c10fe14beff4392f702072de9 /src/fe-gtk | |
| parent | 6e5a48daedaf15b27416e3ad68444ad3ec3d16a0 (diff) | |
| parent | ed54ea08b2edbe7b161656c82d379c048d681d00 (diff) | |
Merge pull request #296 from TingPing/tray
Tray improvements
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 5c0d02ce..07207a99 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -524,17 +524,22 @@ tray_check_hide (GtkWidget *menu) tray_menu_destroy (menu, NULL); } } + +static void +tray_menu_settings (GtkWidget * wid, gpointer none) +{ + extern void setup_open (void); + setup_open (); +} #endif static void tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) { static GtkWidget *menu; -#ifndef WIN32 GtkWidget *submenu; GtkWidget *item; int away_status; -#endif /* ph may have an invalid context now */ hexchat_set_context (ph, hexchat_find_context (ph, NULL, NULL)); @@ -554,7 +559,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL); tray_make_item (menu, NULL, tray_menu_quit_cb, NULL); -#ifndef WIN32 /* somehow this is broken on win32 */ +#ifndef WIN32 /* submenus are buggy on win32 */ submenu = mg_submenu (menu, _("_Blink on")); blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message")); blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message")); @@ -562,6 +567,10 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) /*blink_item (BIT_FILEOFFER, submenu, _("File Offer"));*/ submenu = mg_submenu (menu, _("_Change status")); +#else /* so show away/back in main tray menu */ + submenu = menu; +#endif + away_status = tray_find_away_status (); item = tray_make_item (submenu, _("_Away"), tray_foreach_server, "away"); if (away_status == 1) @@ -570,13 +579,14 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) if (away_status == 2) gtk_widget_set_sensitive (item, FALSE); + menu_add_plugin_items (menu, "\x5$TRAY", NULL); +#ifdef WIN32 tray_make_item (menu, NULL, tray_menu_quit_cb, NULL); + mg_create_icon_item (_("_Preferences"), GTK_STOCK_PREFERENCES, menu, tray_menu_settings, NULL); #endif - + tray_make_item (menu, NULL, tray_menu_quit_cb, NULL); mg_create_icon_item (_("_Quit"), GTK_STOCK_QUIT, menu, tray_menu_quit_cb, NULL); - menu_add_plugin_items (menu, "\x5$TRAY", NULL); - g_object_ref (menu); g_object_ref_sink (menu); g_object_unref (menu); |