diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 5236e71ad..fdfa3745d 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -546,6 +546,10 @@ Keys for buffers / windows Switch to IRC raw buffer + `/server raw` +| Alt + J then Alt + S | + Switch to IRC server buffer + + `/server jump` + | Alt + digit (0-9) | Switch to buffer by number (0 = 10) + `/buffer *N` diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 00857590f..8af13ac62 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -559,9 +559,13 @@ Touches pour les tampons / fenêtres `/input jump_last_buffer` | Alt + J puis Alt + R | - Effacer entièrement la ligne de commande + + Sauter au tampon IRC de données brutes + `/server raw` +| Alt + J puis Alt + S | + Sauter au tampon IRC du serveur + + `/server jump` + | Alt + chiffre (0-9) | Sauter au tampon qui porte ce numéro (0 = 10) + `/buffer *N` diff --git a/po/cs.po b/po/cs.po index 0c1363e40..5ccf4cdb9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -3356,7 +3356,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[list [jméno_serveru]] | [listfull [jméno_serveru]] | [add jméno_serveru " "jméno_hosta [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd " @@ -3384,6 +3384,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/de.po b/po/de.po index 961aa8e13..1c128f938 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -3354,7 +3354,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname " @@ -3378,6 +3378,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/es.po b/po/es.po index 6b46f4519..1e4b5be9c 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" @@ -3338,7 +3338,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[nombre_de_servidor] | [nombre_de_servidor nombre/IP puerto [-auto | -" "noauto] [-ipv6] [-ssl] [-pwd contraseña] [-nicks alias1 alias2 alias3] [-" @@ -3363,6 +3363,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/fr.po b/po/fr.po index f098632f0..74a87a4b2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" -"PO-Revision-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" +"PO-Revision-Date: 2009-06-11 12:27+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -3507,12 +3507,12 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/" "port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur " "nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep " -"nom_serveur] | [del nom_serveur] | [deloutq] | [raw]" +"nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]" msgid "" " list: list servers (no parameter implies this list)\n" @@ -3531,6 +3531,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" @@ -3563,6 +3564,7 @@ msgstr "" " deloutq: supprimer la file d'attente des messages sortants pour tous les " "serveurs (tous les messages que WeeChat est actuellement en train " "d'envoyer)\n" +" jump: sauter au tampon du serveur\n" " raw: ouvre le tampon avec les données brutes IRC\n" "\n" "Exemples:\n" diff --git a/po/hu.po b/po/hu.po index de789ad56..8b1097ac3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -3372,7 +3372,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-" "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks " @@ -3398,6 +3398,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/pl.po b/po/pl.po index fe101fddd..cbad90314 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: \n" "Language-Team: Polish\n" @@ -2930,7 +2930,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" msgid "" @@ -2950,6 +2950,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/ru.po b/po/ru.po index e460aa23a..cc4183db3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -3371,7 +3371,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-" "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] " @@ -3397,6 +3397,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/po/weechat.pot b/po/weechat.pot index e8f27fca2..a365fd0a4 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-10 19:09+0200\n" +"POT-Creation-Date: 2009-06-11 12:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2897,7 +2897,7 @@ msgid "" "[list [servername]] | [listfull [servername]] | [add servername hostname[/" "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | " "[rename servername newservername] | [keep servername] | [del servername] | " -"[deloutq] | [raw]" +"[deloutq] | [jump] | [raw]" msgstr "" msgid "" @@ -2917,6 +2917,7 @@ msgid "" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat " "is currently sending)\n" +" jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n" "\n" "Examples:\n" diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c index d7d1e6a4e..08495a2c8 100644 --- a/src/gui/curses/gui-curses-keyboard.c +++ b/src/gui/curses/gui-curses-keyboard.c @@ -116,6 +116,7 @@ gui_keyboard_default_bindings () gui_keyboard_default_bind (/* m-a */ "meta-a", "/input jump_smart"); gui_keyboard_default_bind (/* m-j,m-l */ "meta-jmeta-l", "/input jump_last_buffer"); gui_keyboard_default_bind (/* m-j,m-r */ "meta-jmeta-r", "/server raw"); + gui_keyboard_default_bind (/* m-j,m-s */ "meta-jmeta-s", "/server jump"); gui_keyboard_default_bind (/* m-h */ "meta-h", "/input hotlist_clear"); gui_keyboard_default_bind (/* m-k */ "meta-k", "/input grab_key"); gui_keyboard_default_bind (/* m-u */ "meta-u", "/input scroll_unread"); diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 37cf1bef9..58e7afb4b 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -3082,13 +3082,20 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc, IRC_PLUGIN_NAME); return WEECHAT_RC_OK; } - + if (weechat_strcasecmp (argv[1], "raw") == 0) { irc_raw_open (1); return WEECHAT_RC_OK; } + if (weechat_strcasecmp (argv[1], "jump") == 0) + { + if (ptr_server && ptr_server->buffer) + weechat_buffer_set (ptr_server->buffer, "display", "1"); + return WEECHAT_RC_OK; + } + weechat_printf (NULL, _("%s%s: unknown option for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "server"); @@ -4012,7 +4019,7 @@ irc_command_init () "[copy servername newservername] | " "[rename servername newservername] | " "[keep servername] | [del servername] | " - "[deloutq] | [raw]"), + "[deloutq] | [jump] | [raw]"), N_(" list: list servers (no parameter implies " "this list)\n" " listfull: list servers with detailed info for " @@ -4036,6 +4043,7 @@ irc_command_init () " deloutq: delete messages out queue for all " "servers (all messages WeeChat is currently " "sending)\n" + " jump: jump to server buffer\n" " raw: open buffer with raw IRC data\n\n" "Examples:\n" " /server listfull\n" @@ -4048,7 +4056,7 @@ irc_command_init () " /server del freenode\n" " /server deloutq\n" " /server switch"), - "add|copy|rename|keep|del|deloutq|list|listfull|" + "add|copy|rename|keep|del|deloutq|jump|list|listfull|" "raw|switch %(irc_servers) %(irc_servers)", &irc_command_server, NULL); weechat_hook_command ("servlist",