/soc/2015/mmcc/main: a06fddb594ed: convert GTK stock items to ic...
Michael McConville <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: a06fddb594ed58ee1b86fefd6dd5d71ad9d0b2fc Author: Michael McConville <[email protected]> Date: 2015-06-25 16:46 -0400 Branch: default URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/a06fddb594ed Description: convert GTK stock items to icons, except a few non-obvious ones diffstat: pidgin/gtkaccount.c | 8 ++-- pidgin/gtkblist.c | 46 ++++++++++++++-------------- pidgin/gtkcertmgr.c | 2 +- pidgin/gtkconv.c | 22 ++++++------ pidgin/gtkdebug.c | 2 +- pidgin/gtkdialogs.c | 2 +- pidgin/gtkdocklet.c | 4 +- pidgin/gtknotify.c | 10 +++--- pidgin/gtkplugin.c | 2 +- pidgin/gtkpounce.c | 8 ++-- pidgin/gtkprefs.c | 2 +- pidgin/gtkprivacy.c | 6 +- pidgin/gtkrequest.c | 12 +++--- pidgin/gtkroomlist.c | 10 +++--- pidgin/gtksavedstatuses.c | 20 ++++++------ pidgin/gtksmiley-manager.c | 6 +- pidgin/gtkstatusbox.c | 6 +- pidgin/gtkutils.c | 16 ++++---- pidgin/gtkwebview.c | 18 +++++----- pidgin/gtkwebviewtoolbar.c | 14 ++++---- pidgin/gtkwhiteboard.c | 2 +- pidgin/pidginstock.c | 46 ++++++++++++++-------------- pidgin/plugins/disco/gtkdisco.c | 10 +++--- pidgin/plugins/gevolution/add_buddy_dialog.c | 4 +- pidgin/plugins/gevolution/assoc-buddy.c | 4 +- pidgin/plugins/screencap.c | 4 +- pidgin/plugins/themeedit-icon.c | 6 +- pidgin/plugins/themeedit.c | 4 +- pidgin/plugins/xmppconsole.c | 6 +- 29 files changed, 151 insertions(+), 151 deletions(-) diffs (truncated from 1069 to 300 lines): diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -1668,11 +1668,11 @@ pidgin_account_dialog_show_continue(Purp add_voice_options(dialog); /* Cancel button */ - pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CANCEL, G_CALLBACK(cancel_account_prefs_cb), dialog); + pidgin_dialog_add_button(GTK_DIALOG(win), _("_Cancel"), G_CALLBACK(cancel_account_prefs_cb), dialog); /* Save button */ button = pidgin_dialog_add_button(GTK_DIALOG(win), - (type == PIDGIN_ADD_ACCOUNT_DIALOG) ? GTK_STOCK_ADD : GTK_STOCK_SAVE, + (type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("_Add") : _("_Save"), G_CALLBACK(ok_account_prefs_cb), dialog); if (dialog->account == NULL) @@ -2420,12 +2420,12 @@ pidgin_accounts_window_show(void) gtk_widget_set_sensitive(button, FALSE); /* Delete button */ - button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_DELETE, G_CALLBACK(ask_delete_account_cb), dialog); + button = pidgin_dialog_add_button(GTK_DIALOG(win), _("_Delete"), G_CALLBACK(ask_delete_account_cb), dialog); dialog->delete_button = button; gtk_widget_set_sensitive(button, FALSE); /* Close button */ - pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, G_CALLBACK(close_accounts_cb), dialog); + pidgin_dialog_add_button(GTK_DIALOG(win), _("_Close"), G_CALLBACK(close_accounts_cb), dialog); purple_signal_connect(pidgin_accounts_get_handle(), "account-modified", accounts_window, diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -1143,7 +1143,7 @@ pidgin_blist_joinchat_show(void) chat_account_filter_func, (GCallback)do_joinchat); gtk_dialog_add_buttons(GTK_DIALOG(data->rq_data.window), _("Room _List"), 1, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, PIDGIN_STOCK_CHAT, GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->rq_data.window), GTK_RESPONSE_OK); @@ -1564,7 +1564,7 @@ pidgin_blist_make_buddy_menu(GtkWidget * pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), contact, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, + pidgin_new_item_from_stock(menu, _("_Remove"), _("_Remove"), G_CALLBACK(pidgin_blist_remove_cb), contact, 0, 0, NULL); } else if (!sub || contact_expanded) { @@ -1572,7 +1572,7 @@ pidgin_blist_make_buddy_menu(GtkWidget * pidgin_append_blist_node_privacy_menu(menu, node); pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), buddy, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, + pidgin_new_item_from_stock(menu, _("_Remove"), _("_Remove"), G_CALLBACK(pidgin_blist_remove_cb), buddy, 0, 0, NULL); } @@ -1715,13 +1715,13 @@ create_group_menu (PurpleBlistNode *node GtkWidget *item; menu = gtk_menu_new(); - item = pidgin_new_item_from_stock(menu, _("Add _Buddy..."), GTK_STOCK_ADD, + item = pidgin_new_item_from_stock(menu, _("Add _Buddy..."), _("_Add"), G_CALLBACK(pidgin_blist_add_buddy_cb), node, 0, 0, NULL); gtk_widget_set_sensitive(item, purple_connections_get_all() != NULL); - item = pidgin_new_item_from_stock(menu, _("Add C_hat..."), GTK_STOCK_ADD, + item = pidgin_new_item_from_stock(menu, _("Add C_hat..."), _("_Add"), G_CALLBACK(pidgin_blist_add_chat_cb), node, 0, 0, NULL); gtk_widget_set_sensitive(item, pidgin_blist_joinchat_is_showable()); - pidgin_new_item_from_stock(menu, _("_Delete Group"), GTK_STOCK_REMOVE, + pidgin_new_item_from_stock(menu, _("_Delete Group"), _("_Remove"), G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Rename"), NULL, G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL); @@ -1766,7 +1766,7 @@ create_chat_menu(PurpleBlistNode *node, G_CALLBACK(chat_components_edit), node, 0, 0, NULL); pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, + pidgin_new_item_from_stock(menu, _("_Remove"), _("_Remove"), G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL); add_buddy_icon_menu_items(menu, node); @@ -1789,14 +1789,14 @@ create_contact_menu (PurpleBlistNode *no pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS, G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE, + pidgin_new_item_from_stock(menu, _("_Remove"), _("_Remove"), G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL); add_buddy_icon_menu_items(menu, node); pidgin_separator(menu); - pidgin_new_item_from_stock(menu, _("_Collapse"), GTK_STOCK_ZOOM_OUT, + pidgin_new_item_from_stock(menu, _("_Collapse"), _("Zoom _Out"), G_CALLBACK(pidgin_blist_collapse_contact_cb), node, 0, 0, NULL); @@ -1822,12 +1822,12 @@ create_buddy_menu(PurpleBlistNode *node, if(gtknode->contact_expanded) { pidgin_new_item_from_stock(menu, _("_Collapse"), - GTK_STOCK_ZOOM_OUT, + _("Zoom _Out"), G_CALLBACK(pidgin_blist_collapse_contact_cb), node, 0, 0, NULL); } else { pidgin_new_item_from_stock(menu, _("_Expand"), - GTK_STOCK_ZOOM_IN, + _("Zoom _In"), G_CALLBACK(pidgin_blist_expand_contact_cb), node, 0, 0, NULL); } @@ -3627,10 +3627,10 @@ static const GtkActionEntry blist_menu_e { "ViewUserLog", NULL, N_("View User _Log..."), "<control>L", NULL, pidgin_dialogs_log }, { "ShowMenu", NULL, N_("Sh_ow"), NULL, NULL, NULL }, { "SortMenu", NULL, N_("_Sort Buddies"), NULL, NULL, NULL }, - { "AddBuddy", GTK_STOCK_ADD, N_("_Add Buddy..."), "<control>B", NULL, pidgin_blist_add_buddy_cb }, - { "AddChat", GTK_STOCK_ADD, N_("Add C_hat..."), NULL, NULL, pidgin_blist_add_chat_cb }, - { "AddGroup", GTK_STOCK_ADD, N_("Add _Group..."), NULL, NULL, purple_blist_request_add_group }, - { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", NULL, purple_core_quit }, + { "AddBuddy", N_("_Add"), N_("_Add Buddy..."), "<control>B", NULL, pidgin_blist_add_buddy_cb }, + { "AddChat", N_("_Add"), N_("Add C_hat..."), NULL, NULL, pidgin_blist_add_chat_cb }, + { "AddGroup", N_("_Add"), N_("Add _Group..."), NULL, NULL, purple_blist_request_add_group }, + { "Quit", N_("_Quit"), N_("_Quit"), "<control>Q", NULL, purple_core_quit }, /* Accounts menu */ { "AccountsMenu", NULL, N_("_Accounts"), NULL, NULL, NULL }, @@ -3642,7 +3642,7 @@ static const GtkActionEntry blist_menu_e { "Certificates", NULL, N_("_Certificates"), NULL, NULL, pidgin_certmgr_show }, { "CustomSmileys", PIDGIN_STOCK_TOOLBAR_SMILEY, N_("Custom Smile_ys"), "<control>Y", NULL, pidgin_smiley_manager_show }, { "Plugins", PIDGIN_STOCK_TOOLBAR_PLUGINS, N_("Plu_gins"), "<control>U", NULL, pidgin_plugin_dialog_show }, - { "Preferences", GTK_STOCK_PREFERENCES, N_("Pr_eferences"), "<control>P", NULL, pidgin_prefs_show }, + { "Preferences", N_("Pr_eferences"), N_("Pr_eferences"), "<control>P", NULL, pidgin_prefs_show }, { "Privacy", NULL, N_("Pr_ivacy"), NULL, NULL, pidgin_privacy_dialog_show }, { "SetMood", NULL, N_("Set _Mood"), "<control>D", NULL, set_mood_show }, { "FileTransfers", PIDGIN_STOCK_TOOLBAR_TRANSFER, N_("_File Transfers"), "<control>T", NULL, G_CALLBACK(gtk_blist_show_xfer_dialog_cb) }, @@ -3651,13 +3651,13 @@ static const GtkActionEntry blist_menu_e /* Help */ { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, - { "OnlineHelp", GTK_STOCK_HELP, N_("Online _Help"), "F1", NULL, gtk_blist_show_onlinehelp_cb }, + { "OnlineHelp", N_("Online _Help"), N_("Online _Help"), "F1", NULL, gtk_blist_show_onlinehelp_cb }, { "BuildInformation", NULL, N_("_Build Information"), NULL, NULL, pidgin_dialogs_buildinfo }, { "DebugWindow", NULL, N_("_Debug Window"), NULL, NULL, toggle_debug }, { "DeveloperInformation", NULL, N_("De_veloper Information"), NULL, NULL, pidgin_dialogs_developers }, { "PluginInformation", NULL, N_("_Plugin Information"), NULL, NULL, pidgin_dialogs_plugins_info }, { "TranslatorInformation", NULL, N_("_Translator Information"), NULL, NULL, pidgin_dialogs_translators }, - { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, pidgin_dialogs_about }, + { "About", N_("_About"), N_("_About"), NULL, NULL, pidgin_dialogs_about }, }; /* Toggle items */ @@ -5900,7 +5900,7 @@ static void pidgin_blist_show(PurpleBudd gtk_box_pack_start(GTK_BOX(content_area), gtkblist->headline_label, TRUE, TRUE, 0); - close = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + close = gtk_image_new_from_stock(_("_Close"), GTK_ICON_SIZE_MENU); close = pidgin_create_small_button(close); gtk_widget_set_tooltip_text(close, _("Close")); gtk_info_bar_add_action_widget(GTK_INFO_BAR(infobar), close, @@ -7097,8 +7097,8 @@ pidgin_blist_request_add_buddy(PurpleAcc G_CALLBACK(add_buddy_select_account_cb), NULL, G_CALLBACK(add_buddy_cb)); gtk_dialog_add_buttons(GTK_DIALOG(data->rq_data.window), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_ADD, GTK_RESPONSE_OK, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Add"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->rq_data.window), GTK_RESPONSE_OK); @@ -7282,8 +7282,8 @@ pidgin_blist_request_add_chat(PurpleAcco G_CALLBACK(add_chat_resp_cb))); gtk_dialog_add_buttons(GTK_DIALOG(data->chat_data.rq_data.window), _("Room List"), 1, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_ADD, GTK_RESPONSE_OK, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Add"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->chat_data.rq_data.window), GTK_RESPONSE_OK); diff --git a/pidgin/gtkcertmgr.c b/pidgin/gtkcertmgr.c --- a/pidgin/gtkcertmgr.c +++ b/pidgin/gtkcertmgr.c @@ -629,7 +629,7 @@ pidgin_certmgr_show(void) gtk_widget_show(dlg->notebook); /* Close button */ - dlg->closebutton = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, + dlg->closebutton = pidgin_dialog_add_button(GTK_DIALOG(win), _("_Close"), G_CALLBACK(certmgr_close_cb), dlg); /* Add the defined certificate managers */ diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -1724,10 +1724,10 @@ create_chat_menu(PurpleChatConversation if (!is_me && protocol && !(purple_protocol_get_options(protocol) & OPT_PROTO_UNIQUE_CHATNAME)) { if ((buddy = purple_blist_find_buddy(account, who)) != NULL) - button = pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE, + button = pidgin_new_item_from_stock(menu, _("Remove"), _("_Remove"), G_CALLBACK(menu_chat_add_remove_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); else - button = pidgin_new_item_from_stock(menu, _("Add"), GTK_STOCK_ADD, + button = pidgin_new_item_from_stock(menu, _("Add"), _("_Add"), G_CALLBACK(menu_chat_add_remove_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); if (gc == NULL) @@ -1736,7 +1736,7 @@ create_chat_menu(PurpleChatConversation g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); } - button = pidgin_new_item_from_stock(menu, _("Last Said"), GTK_STOCK_INDEX, + button = pidgin_new_item_from_stock(menu, _("Last Said"), _("_Index"), G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL); g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free); if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who)) @@ -2976,7 +2976,7 @@ icon_menu(GtkWidget *widget, GdkEventBut pidgin_new_item_from_stock(menu, _("Hide Icon"), NULL, G_CALLBACK(remove_icon), gtkconv, 0, 0, NULL); - pidgin_new_item_from_stock(menu, _("Save Icon As..."), GTK_STOCK_SAVE_AS, + pidgin_new_item_from_stock(menu, _("Save Icon As..."), _("Save _As"), G_CALLBACK(icon_menu_save_cb), gtkconv, 0, 0, NULL); @@ -3160,10 +3160,10 @@ static GtkActionEntry menu_entries[] = { "ConversationMenu", NULL, N_("_Conversation"), NULL, NULL, NULL }, { "NewInstantMessage", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("New Instant _Message..."), "<control>M", NULL, G_CALLBACK(menu_new_conv_cb) }, { "JoinAChat", PIDGIN_STOCK_CHAT, N_("Join a _Chat..."), NULL, NULL, G_CALLBACK(menu_join_chat_cb) }, - { "Find", GTK_STOCK_FIND, N_("_Find..."), NULL, NULL, G_CALLBACK(menu_find_cb) }, + { "Find", N_("_Find"), N_("_Find..."), NULL, NULL, G_CALLBACK(menu_find_cb) }, { "ViewLog", NULL, N_("View _Log"), NULL, NULL, G_CALLBACK(menu_view_log_cb) }, - { "SaveAs", GTK_STOCK_SAVE_AS, N_("_Save As..."), NULL, NULL, G_CALLBACK(menu_save_as_cb) }, - { "ClearScrollback", GTK_STOCK_CLEAR, N_("Clea_r Scrollback"), "<control>L", NULL, G_CALLBACK(menu_clear_cb) }, + { "SaveAs", N_("Save _As"), N_("_Save As..."), NULL, NULL, G_CALLBACK(menu_save_as_cb) }, + { "ClearScrollback", N_("_Clear"), N_("Clea_r Scrollback"), "<control>L", NULL, G_CALLBACK(menu_clear_cb) }, #ifdef USE_VV { "MediaMenu", NULL, N_("M_edia"), NULL, NULL, NULL }, @@ -3181,11 +3181,11 @@ static GtkActionEntry menu_entries[] = { "Alias", NULL, N_("Al_ias..."), NULL, NULL, G_CALLBACK(menu_alias_cb) }, { "Block", PIDGIN_STOCK_TOOLBAR_BLOCK, N_("_Block..."), NULL, NULL, G_CALLBACK(menu_block_cb) }, { "Unblock", PIDGIN_STOCK_TOOLBAR_UNBLOCK, N_("_Unblock..."), NULL, NULL, G_CALLBACK(menu_unblock_cb) }, - { "Add", GTK_STOCK_ADD, N_("_Add..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, - { "Remove", GTK_STOCK_REMOVE, N_("_Remove..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, + { "Add", N_("_Add"), N_("_Add..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, + { "Remove", N_("_Remove"), N_("_Remove..."), NULL, NULL, G_CALLBACK(menu_add_remove_cb) }, { "InsertLink", PIDGIN_STOCK_TOOLBAR_INSERT_LINK, N_("Insert Lin_k..."), NULL, NULL, G_CALLBACK(menu_insert_link_cb) }, { "InsertImage", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, N_("Insert Imag_e..."), NULL, NULL, G_CALLBACK(menu_insert_image_cb) }, - { "Close", GTK_STOCK_CLOSE, N_("_Close"), NULL, NULL, G_CALLBACK(menu_close_conv_cb) }, + { "Close", N_("_Close"), N_("_Close"), NULL, NULL, G_CALLBACK(menu_close_conv_cb) }, /* Options */ { "OptionsMenu", NULL, N_("_Options"), NULL, NULL, NULL }, @@ -9010,7 +9010,7 @@ build_warn_close_dialog(PidginConvWindow warn_close_dialog = gtk_dialog_new_with_buttons(_("Confirm close"), GTK_WINDOW(gtkwin->window), GTK_DIALOG_MODAL, _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + _("_Close"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(warn_close_dialog), GTK_RESPONSE_OK); diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c --- a/pidgin/gtkdebug.c +++ b/pidgin/gtkdebug.c @@ -498,7 +498,7 @@ debug_window_new(void) gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item)); /* regex toggle button */ - item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_FIND); + item = gtk_toggle_tool_button_new_from_stock(_("_Find")); gtk_tool_item_set_is_important(item, TRUE); win->filter = GTK_WIDGET(item); gtk_tool_button_set_label(GTK_TOOL_BUTTON(win->filter), _("Filter")); diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c +++ b/pidgin/gtkdialogs.c @@ -497,7 +497,7 @@ pidgin_build_help_dialog(const char *tit pidgin_webview_append_html(PIDGIN_WEBVIEW(webview), string->str); - button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE, + button = pidgin_dialog_add_button(GTK_DIALOG(win), _("_Close"), G_CALLBACK(destroy_win), win); gtk_widget_set_can_default(button, TRUE); diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits