pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 05:46:38 +02:00
Code Activity

Add option "-merged" for /buffer clear

Browse Source
This commit is contained in:
Sebastien Helleu
2009-06-14 10:49:03 +02:00
parent 1f8532e668
commit 5ecdee569f
12 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/en/autogen/user/weechat_commands.txt
+2 -2
View File
@@ -45,12 +45,12 @@
/bar scroll nicklist * ye
........................................
• *`/buffer`* `[clear [number | -all] | move number | merge number | unmerge [number] | close [n1[-n2]]| list | notify level | localvar | set property value | number | name]`::
• *`/buffer`* `[clear [number | -merged | -all] | move number | merge number | unmerge [number] | close [n1[-n2]] | list | notify level | localvar | set property value | number | name]`::
........................................
manage buffers
clear: clear buffer content (-all for all buffers, number for a buffer, or nothing for current buffer)
clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer)
move: move buffer in the list (may be relative, for example -1)
merge: merge current buffer to another buffer (chat area will be mix of both buffers)
(by default ctrl-x switches between merged buffers)
doc/fr/autogen/user/irc_options.txt
+1 -1
View File
@@ -54,7 +54,7 @@
** valeurs: toute chaîne (valeur par défaut: "irc_privmsg,irc_notice")
* *irc.look.item_display_server*
** description: name of bar item where IRC server is displayed (for status bar)
** description: nom de l'objet de barre où est affiché le serveur IRC (pour la barre de statut)
** type: entier
** valeurs: buffer_plugin, buffer_name (valeur par défaut: buffer_plugin)
doc/fr/autogen/user/weechat_commands.txt
+2 -2
View File
@@ -45,12 +45,12 @@
/bar scroll nicklist * ye
........................................
• *`/buffer`* `[clear [nombre | -all] | move nombre | merge nombre | unmerge [nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | nombre | nom]`::
• *`/buffer`* `[clear [nombre | -merged | -all] | move nombre | merge nombre | unmerge [nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | nombre | nom]`::
........................................
gestion des tampons
clear: efface le contenu du tampon (-all pour tous les tampons, un numéro pour un tampon, ou rien pour le tampon courant)
clear: efface le contenu du tampon (un numéro pour un tampon, -merged pour les tampons mélangés, -all pour tous les tampons, ou rien pour le tampon courant)
move: déplace le tampon dans la liste (peut être relatif, par exemple -1)
merge: mélange le tampon courant avec un autre tampon (la zone de discussion sera un mélange des deux tampons)
(par défaut ctrl-x bascule entre les tampons mélangés)
po/cs.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -771,15 +771,15 @@ msgid "manage buffers"
msgstr "řídit buffery"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
#, fuzzy
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/de.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -828,15 +828,15 @@ msgid "manage buffers"
msgstr "Puffer verwalten"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
#, fuzzy
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/es.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -824,15 +824,15 @@ msgid "manage buffers"
msgstr "gestionar los búfers"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
#, fuzzy
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/fr.po
+13 -12
View File
@@ -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-12 16:00+0200\n"
"PO-Revision-Date: 2009-06-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-06-14 10:45+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -827,17 +827,17 @@ msgid "manage buffers"
msgstr "gestion des tampons"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
"[clear [nombre | -all] | move nombre | merge nombre | unmerge [nombre] | "
"close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | "
"nombre | nom]"
"[clear [nombre | -merged | -all] | move nombre | merge nombre | unmerge "
"[nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété "
"valeur | nombre | nom]"
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
@@ -872,8 +872,9 @@ msgid ""
" jump to #weechat: /buffer #weechat\n"
" jump to next buffer: /buffer +1"
msgstr ""
" clear: efface le contenu du tampon (-all pour tous les tampons, un numéro "
"pour un tampon, ou rien pour le tampon courant)\n"
" clear: efface le contenu du tampon (un numéro pour un tampon, -merged "
"pour les tampons mélangés, -all pour tous les tampons, ou rien pour le "
"tampon courant)\n"
" move: déplace le tampon dans la liste (peut être relatif, par exemple -"
"1)\n"
" merge: mélange le tampon courant avec un autre tampon (la zone de "
po/hu.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -828,15 +828,15 @@ msgid "manage buffers"
msgstr "pufferek kezelése"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
#, fuzzy
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/pl.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@@ -770,14 +770,14 @@ msgid "manage buffers"
msgstr ""
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/ru.po
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: 2009-05-11 13:02+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -822,15 +822,15 @@ msgid "manage buffers"
msgstr "управление буферами"
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
#, fuzzy
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
po/weechat.pot
+6 -6
View File
@@ -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-12 16:00+0200\n"
"POT-Creation-Date: 2009-06-14 10:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -738,14 +738,14 @@ msgid "manage buffers"
msgstr ""
msgid ""
"[clear [number | -all] | move number | merge number | unmerge [number] | "
"close [n1[-n2]]| list | notify level | localvar | set property value | "
"number | name]"
"[clear [number | -merged | -all] | move number | merge number | unmerge "
"[number] | close [n1[-n2]] | list | notify level | localvar | set property "
"value | number | name]"
msgstr ""
msgid ""
" clear: clear buffer content (-all for all buffers, number for a buffer, "
"or nothing for current buffer)\n"
" clear: clear buffer content (number for a buffer, -merged for merged "
"buffers, -all for all buffers, or nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for example -1)\n"
" merge: merge current buffer to another buffer (chat area will be mix of "
"both buffers)\n"
src/core/wee-command.c
+20 -6
View File
@@ -536,6 +536,18 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
{
if (string_strcasecmp (argv[2], "-all") == 0)
gui_buffer_clear_all ();
else if (string_strcasecmp (argv[2], "-merged") == 0)
{
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
if ((ptr_buffer->number == buffer->number)
&& (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATTED))
{
gui_buffer_clear (ptr_buffer);
}
}
}
else
{
for (i = 2; i < argc; i++)
@@ -3963,11 +3975,13 @@ command_init ()
&command_bar, NULL);
hook_command (NULL, "buffer",
N_("manage buffers"),
N_("[clear [number | -all] | move number | merge number | "
"unmerge [number] | close [n1[-n2]]| list | notify level | "
"localvar | set property value | number | name]"),
N_(" clear: clear buffer content (-all for all buffers, "
"number for a buffer, or nothing for current buffer)\n"
N_("[clear [number | -merged | -all] | move number | "
"merge number | unmerge [number] | close [n1[-n2]] | "
"list | notify level | localvar | set property value | "
"number | name]"),
N_(" clear: clear buffer content (number for a buffer, "
"-merged for merged buffers, -all for all buffers, or "
"nothing for current buffer)\n"
" move: move buffer in the list (may be relative, for "
"example -1)\n"
" merge: merge current buffer to another buffer (chat "
@@ -4004,7 +4018,7 @@ command_init ()
" close buffers 5 to 7: /buffer close 5-7\n"
" jump to #weechat: /buffer #weechat\n"
" jump to next buffer: /buffer +1"),
"clear -all|%(buffers_numbers)"
"clear -merged|-all|%(buffers_numbers)"
" || move %(buffers_numbers)"
" || merge %(buffers_numbers)"
" || unmerge %(buffers_numbers)"