Mercurial > pidgin
changeset 32683:d8c74de25b5f
Apply some updates to UI Manager version of blist menu: Change the key
shortcut for Set Mood to Ctrl+D, Add Plugin Information menu item to
Help menu.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 08 Oct 2011 23:26:28 +0000 |
| parents | bfcb739c2e06 |
| children | 4db67977daae |
| files | pidgin/gtkblist.c |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sat Oct 08 23:01:54 2011 +0000 +++ b/pidgin/gtkblist.c Sat Oct 08 23:26:28 2011 +0000 @@ -3607,6 +3607,8 @@ #if 1 /* TODO: fill out tooltips... */ static const GtkActionEntry blist_menu_entries[] = { +/* NOTE: Do not set any accelerator to Control+O. It is mapped by + gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */ /* Buddies menu */ { "BuddiesMenu", NULL, N_("_Buddies"), NULL, NULL, NULL }, { "NewInstantMessage", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("New Instant _Message..."), "<control>M", NULL, pidgin_dialogs_im }, @@ -3633,7 +3635,7 @@ { "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 }, { "Privacy", NULL, N_("Pr_ivacy"), NULL, NULL, pidgin_privacy_dialog_show }, - { "SetMood", NULL, N_("Set _Mood"), "<control>O", NULL, set_mood_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) }, { "RoomList", NULL, N_("R_oom List"), NULL, NULL, pidgin_roomlist_dialog_show }, { "SystemLog", NULL, N_("System _Log"), NULL, NULL, gtk_blist_show_systemlog_cb }, @@ -3644,6 +3646,7 @@ { "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 }, }; @@ -3713,6 +3716,7 @@ "<menuitem action='BuildInformation'/>" "<menuitem action='DebugWindow'/>" "<menuitem action='DeveloperInformation'/>" + "<menuitem action='PluginInformation'/>" "<menuitem action='TranslatorInformation'/>" "<separator/>" "<menuitem action='About'/>" @@ -3723,9 +3727,6 @@ #else static GtkItemFactoryEntry blist_menu[] = { -/* NOTE: Do not set any accelerator to Control+O. It is mapped by - gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */ - /* Buddies menu */ { N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL }, { N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgin_dialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, @@ -8376,4 +8377,5 @@ sort_merge_id = gtk_ui_manager_add_ui_from_string(gtkblist->ui, ui_string->str, -1, NULL); g_string_free(ui_string, TRUE); -} \ No newline at end of file +} +