# HG changeset patch # User Richard Laager # Date 1132699148 0 # Node ID bc2b9f9259790fe3cd1122f25823b4f97ee506a9 # Parent ffedae3d315633df14a368b22360df8ecde6b398 [gaim-migrate @ 14493] Abuse some GTK+ stock icons for Gaim menu items. I'm not terribly attached to these, so we can pull them if they suck... or we could make new icons that don't suck. ;) committer: Tailor Script diff -r ffedae3d3156 -r bc2b9f925979 src/gtkblist.c --- a/src/gtkblist.c Tue Nov 22 18:56:53 2005 +0000 +++ b/src/gtkblist.c Tue Nov 22 22:39:08 2005 +0000 @@ -981,15 +981,15 @@ buddy, 0, 0, NULL); } - gaim_new_item_from_stock(menu, _("Add Buddy _Pounce"), NULL, + gaim_new_item_from_stock(menu, _("Add Buddy _Pounce"), GAIM_STOCK_POUNCE, G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL); if(((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) { - gaim_new_item_from_stock(menu, _("View _Log"), NULL, + gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), contact, 0, 0, NULL); } else if (!sub) { - gaim_new_item_from_stock(menu, _("View _Log"), NULL, + gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL); } @@ -1089,7 +1089,7 @@ G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL); gaim_new_check_item(menu, _("Auto-Join"), G_CALLBACK(gtk_blist_menu_autojoin_cb), node, autojoin); - gaim_new_item_from_stock(menu, _("View _Log"), NULL, + gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); gaim_gtk_append_blist_node_proto_menu(menu, c->account->gc, node); @@ -1112,7 +1112,7 @@ menu = gtk_menu_new(); - gaim_new_item_from_stock(menu, _("View _Log"), NULL, + gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG, G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL); @@ -2423,7 +2423,7 @@ { N_("/Buddies/New Instant _Message..."), "M", gaim_gtkdialogs_im, 0, "", GAIM_STOCK_IM }, { N_("/Buddies/Join a _Chat..."), "C", gaim_gtk_blist_joinchat_show, 0, "", GAIM_STOCK_CHAT }, { N_("/Buddies/Get User _Info..."), "I", gaim_gtkdialogs_info, 0, "", GAIM_STOCK_INFO }, - { N_("/Buddies/View User _Log..."), "L", gaim_gtkdialogs_log, 0, NULL }, + { N_("/Buddies/View User _Log..."), "L", gaim_gtkdialogs_log, 0, "", GAIM_STOCK_LOG }, { "/Buddies/sep1", NULL, NULL, 0, "" }, { N_("/Buddies/Show _Offline Buddies"), NULL, gaim_gtk_blist_edit_mode_cb, 1, ""}, { N_("/Buddies/Show _Empty Groups"), NULL, gaim_gtk_blist_show_empty_groups_cb, 1, ""}, @@ -2438,24 +2438,24 @@ /* Tools */ { N_("/_Tools"), NULL, NULL, 0, "" }, - { N_("/Tools/Account Ac_tions"), NULL, NULL, 0, "" }, + { N_("/Tools/Account Ac_tions"), NULL, NULL, 0, "", GAIM_STOCK_ACTION }, { "/Tools/sep1", NULL, NULL, 0, "" }, { N_("/Tools/A_ccounts"), "A", gaim_gtk_accounts_window_show, 0, "", GAIM_STOCK_ACCOUNTS }, - { N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, NULL }, + { N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, "", GAIM_STOCK_POUNCE }, { N_("/Tools/Plu_gins"), "U", gaim_gtk_plugin_dialog_show, 0, "", GAIM_STOCK_PLUGIN }, { N_("/Tools/Pr_eferences"), "P", gaim_gtk_prefs_show, 0, "", GTK_STOCK_PREFERENCES }, { N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "", GTK_STOCK_DIALOG_ERROR }, { "/Tools/sep2", NULL, NULL, 0, "" }, { N_("/Tools/_File Transfers"), "T", gaim_show_xfer_dialog, 0, "", GAIM_STOCK_FILE_TRANSFER }, { N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, "", GTK_STOCK_INDEX }, - { N_("/Tools/View System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, NULL }, + { N_("/Tools/View System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "", GAIM_STOCK_LOG }, { "/Tools/sep3", NULL, NULL, 0, "" }, { N_("/Tools/Mute _Sounds"), "S", gaim_gtk_blist_mute_sounds_cb, 0, ""}, /* Help */ { N_("/_Help"), NULL, NULL, 0, "" }, { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "", GTK_STOCK_HELP }, - { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, NULL }, + { N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "", GAIM_STOCK_DEBUG }, { N_("/Help/_About"), NULL, gaim_gtkdialogs_about, 0, "", GAIM_STOCK_ABOUT }, }; @@ -3371,6 +3371,7 @@ GtkCellRenderer *rend; GtkTreeViewColumn *column; GtkWidget *menu; + GtkWidget *account_actions_menu; GtkWidget *sw; GtkWidget *vpane; GtkAccelGroup *accel_group; @@ -3424,7 +3425,9 @@ gtk_widget_show(menu); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), menu, FALSE, FALSE, 0); - protomenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Account Actions")); + protomenu = gtk_menu_new(); + account_actions_menu = gtk_item_factory_get_item(gtkblist->ift, N_("/Tools/Account Actions")); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(account_actions_menu), protomenu); /****************************** GtkVPaned ************************************/ vpane = gtk_vpaned_new(); diff -r ffedae3d3156 -r bc2b9f925979 src/gtkconv.c --- a/src/gtkconv.c Tue Nov 22 18:56:53 2005 +0000 +++ b/src/gtkconv.c Tue Nov 22 22:39:08 2005 +0000 @@ -2468,7 +2468,7 @@ { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, "", GTK_STOCK_FIND }, - { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, NULL }, + { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "", GAIM_STOCK_LOG }, { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, "", GTK_STOCK_SAVE_AS }, { N_("/Conversation/Clear"), "L", menu_clear_cb, 0, "", GTK_STOCK_CLEAR }, @@ -2477,7 +2477,7 @@ { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "", GAIM_STOCK_FILE_TRANSFER }, { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, - 0, NULL }, + 0, "", GAIM_STOCK_POUNCE }, { N_("/Conversation/_Get Info"), "O", menu_get_info_cb, 0, "", GAIM_STOCK_INFO }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, diff -r ffedae3d3156 -r bc2b9f925979 src/gtkstock.c --- a/src/gtkstock.c Tue Nov 22 18:56:53 2005 +0000 +++ b/src/gtkstock.c Tue Nov 22 22:39:08 2005 +0000 @@ -38,6 +38,7 @@ { { GAIM_STOCK_ABOUT, "buttons", "about_menu.png" }, { GAIM_STOCK_ACCOUNTS, "buttons", "accounts.png" }, + { GAIM_STOCK_ACTION, NULL, GTK_STOCK_EXECUTE }, #if GTK_CHECK_VERSION(2,6,0) { GAIM_STOCK_ALIAS, NULL, GTK_STOCK_EDIT }, #else @@ -52,6 +53,7 @@ #else { GAIM_STOCK_CONNECT, "icons", "stock_connect_16.png" }, #endif + { GAIM_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { GAIM_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, { GAIM_STOCK_DIALOG_AUTH, "dialogs", "gaim_auth.png" }, { GAIM_STOCK_DIALOG_COOL, "dialogs", "gaim_cool.png" }, @@ -89,6 +91,7 @@ #endif { GAIM_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_LINK, "buttons", "insert-link-small.png" }, + { GAIM_STOCK_LOG, NULL, GTK_STOCK_DND_MULTIPLE }, { GAIM_STOCK_LOGO, "gaim", "logo.png" }, { GAIM_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, #if GTK_CHECK_VERSION(2,6,0) @@ -102,6 +105,7 @@ #else { GAIM_STOCK_PLUGIN, "icons", "stock_disconnect_16.png" }, #endif + { GAIM_STOCK_POUNCE, NULL, GTK_STOCK_REDO }, { GAIM_STOCK_OPEN_MAIL, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_SEND, "buttons", "send-im.png" }, { GAIM_STOCK_SIGN_ON, NULL, GTK_STOCK_EXECUTE }, diff -r ffedae3d3156 -r bc2b9f925979 src/gtkstock.h --- a/src/gtkstock.h Tue Nov 22 18:56:53 2005 +0000 +++ b/src/gtkstock.h Tue Nov 22 22:39:08 2005 +0000 @@ -31,6 +31,7 @@ /*@{*/ #define GAIM_STOCK_ABOUT "gaim-about" #define GAIM_STOCK_ACCOUNTS "gaim-accounts" +#define GAIM_STOCK_ACTION "gaim-action" #define GAIM_STOCK_ALIAS "gaim-alias" #define GAIM_STOCK_AWAY "gaim-away" #define GAIM_STOCK_BGCOLOR "gaim-bgcolor" @@ -38,6 +39,7 @@ #define GAIM_STOCK_CHAT "gaim-chat" #define GAIM_STOCK_CLEAR "gaim-clear" #define GAIM_STOCK_CONNECT "gaim-connect" +#define GAIM_STOCK_DEBUG "gaim-debug" #define GAIM_STOCK_DIALOG_AUTH "gaim-dialog-auth" #define GAIM_STOCK_DIALOG_COOL "gaim-dialog-cool" #define GAIM_STOCK_DIALOG_ERROR "gaim-dialog-error" @@ -63,12 +65,14 @@ #define GAIM_STOCK_INFO "gaim-info" #define GAIM_STOCK_INVITE "gaim-invite" #define GAIM_STOCK_LINK "gaim-link" +#define GAIM_STOCK_LOG "gaim-log" #define GAIM_STOCK_LOGO "gaim-logo" #define GAIM_STOCK_MODIFY "gaim-modify" #define GAIM_STOCK_OPEN_MAIL "gaim-stock-open-mail" #define GAIM_STOCK_PAUSE "gaim-pause" #define GAIM_STOCK_PENDING "gaim-pending" #define GAIM_STOCK_PLUGIN "gaim-plugin" +#define GAIM_STOCK_POUNCE "gaim-pounce" #define GAIM_STOCK_SEND "gaim-send" #define GAIM_STOCK_SIGN_OFF "gaim-sign-off" #define GAIM_STOCK_SIGN_ON "gaim-sign-on"