diff options
-rw-r--r-- | doc/de/autogen/weechat_options.xml | 10 | ||||
-rw-r--r-- | doc/en/autogen/weechat_options.xml | 10 | ||||
-rw-r--r-- | doc/fr/autogen/weechat_options.xml | 10 | ||||
-rw-r--r-- | po/cs.po | 7 | ||||
-rw-r--r-- | po/de.po | 7 | ||||
-rw-r--r-- | po/es.po | 7 | ||||
-rw-r--r-- | po/fr.po | 11 | ||||
-rw-r--r-- | po/hu.po | 7 | ||||
-rw-r--r-- | po/pl.po | 7 | ||||
-rw-r--r-- | po/ru.po | 7 | ||||
-rw-r--r-- | po/weechat.pot | 7 | ||||
-rw-r--r-- | src/core/wee-config.c | 7 | ||||
-rw-r--r-- | src/core/wee-config.h | 1 | ||||
-rw-r--r-- | src/gui/gui-buffer.c | 3 |
14 files changed, 91 insertions, 10 deletions
diff --git a/doc/de/autogen/weechat_options.xml b/doc/de/autogen/weechat_options.xml index 4702e7cb4..1d2e64340 100644 --- a/doc/de/autogen/weechat_options.xml +++ b/doc/de/autogen/weechat_options.xml @@ -866,6 +866,16 @@ </listitem> </itemizedlist> +<command>weechat.look.jump_previous_buffer_when_closing</command>: jump to previously visited buffer when closing a buffer (if disabled, then jump to buffer number - 1) +<itemizedlist> + <listitem> + <para>type: boolean</para> + </listitem> + <listitem> + <para>values: on, off (default value: on)</para> + </listitem> +</itemizedlist> + <command>weechat.look.nickmode</command>: Nickmode (@%+) vorm Nickname anzeigen <itemizedlist> <listitem> diff --git a/doc/en/autogen/weechat_options.xml b/doc/en/autogen/weechat_options.xml index 2458adcfe..932ad7bc3 100644 --- a/doc/en/autogen/weechat_options.xml +++ b/doc/en/autogen/weechat_options.xml @@ -866,6 +866,16 @@ </listitem> </itemizedlist> +<command>weechat.look.jump_previous_buffer_when_closing</command>: jump to previously visited buffer when closing a buffer (if disabled, then jump to buffer number - 1) +<itemizedlist> + <listitem> + <para>type: boolean</para> + </listitem> + <listitem> + <para>values: on, off (default value: on)</para> + </listitem> +</itemizedlist> + <command>weechat.look.nickmode</command>: display nick mode ((half)op/voice) before each nick <itemizedlist> <listitem> diff --git a/doc/fr/autogen/weechat_options.xml b/doc/fr/autogen/weechat_options.xml index 3dad840e9..c0928e1f0 100644 --- a/doc/fr/autogen/weechat_options.xml +++ b/doc/fr/autogen/weechat_options.xml @@ -866,6 +866,16 @@ </listitem> </itemizedlist> +<command>weechat.look.jump_previous_buffer_when_closing</command>: sauter au tampon précédemment visité lors de la fermeture d'un tampon (si désactivé, alors le saut se fait vers le numéro de tampon - 1) +<itemizedlist> + <listitem> + <para>type: booléen</para> + </listitem> + <listitem> + <para>valeurs: on, off (valeur par défaut: on)</para> + </listitem> +</itemizedlist> + <command>weechat.look.nickmode</command>: afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur <itemizedlist> <listitem> @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1355,6 +1355,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "zobrazit mód přezdívky ((částečný)op/voice) před každou přezdívkou" @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1374,6 +1374,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "Nickmode (@%+) vorm Nickname anzeigen" @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1351,6 +1351,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "mostrar modo del usuario ((half)op/voice) antes de cada usuario" @@ -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-05-18 18:04+0200\n" -"PO-Revision-Date: 2009-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+0200\n" +"PO-Revision-Date: 2009-05-18 18:26+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1501,6 +1501,13 @@ msgstr "" "courant avec /buffer *N (où N est un numéro de tampon), pour facilement " "basculer à un autre tampon, puis revenir au tampon courant" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" +"sauter au tampon précédemment visité lors de la fermeture d'un tampon (si " +"désactivé, alors le saut se fait vers le numéro de tampon - 1)" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur" @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1383,6 +1383,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "a felhasználó módjának ((fél)operátor/voice) mutatása a név előtt" @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: <soltys@szluug.org>\n" "Language-Team: Polish\n" @@ -1213,6 +1213,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "" @@ -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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1385,6 +1385,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "отображать режим ника (op/voice) перед каждым ником" diff --git a/po/weechat.pot b/po/weechat.pot index 68cb27561..5f03752d0 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-05-18 18:04+0200\n" +"POT-Creation-Date: 2009-05-18 18:25+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" @@ -1181,6 +1181,11 @@ msgid "" "buffer, then come back to current buffer" msgstr "" +msgid "" +"jump to previously visited buffer when closing a buffer (if disabled, then " +"jump to buffer number - 1)" +msgstr "" + msgid "display nick mode ((half)op/voice) before each nick" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 68ae437e7..3e6996d96 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -84,6 +84,7 @@ struct t_config_option *config_look_hotlist_short_names; struct t_config_option *config_look_hotlist_sort; struct t_config_option *config_look_item_time_format; struct t_config_option *config_look_jump_current_to_previous_buffer; +struct t_config_option *config_look_jump_previous_buffer_when_closing; struct t_config_option *config_look_nickmode; struct t_config_option *config_look_nickmode_empty; struct t_config_option *config_look_paste_max_lines; @@ -1305,6 +1306,12 @@ config_weechat_init_options () "number with /buffer *N (where N is a buffer number), to easily " "switch to another buffer, then come back to current buffer"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + config_look_jump_previous_buffer_when_closing = config_file_new_option ( + weechat_config_file, ptr_section, + "jump_previous_buffer_when_closing", "boolean", + N_("jump to previously visited buffer when closing a buffer (if " + "disabled, then jump to buffer number - 1)"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); config_look_nickmode = config_file_new_option ( weechat_config_file, ptr_section, "nickmode", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 11d296c15..5b7db86ea 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -92,6 +92,7 @@ extern struct t_config_option *config_look_hotlist_short_names; extern struct t_config_option *config_look_hotlist_sort; extern struct t_config_option *config_look_item_time_format; extern struct t_config_option *config_look_jump_current_to_previous_buffer; +extern struct t_config_option *config_look_jump_previous_buffer_when_closing; extern struct t_config_option *config_look_nickmode; extern struct t_config_option *config_look_nickmode_empty; extern struct t_config_option *config_look_paste_max_lines; diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 4cc719882..99a30449c 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -1403,7 +1403,8 @@ gui_buffer_close (struct t_gui_buffer *buffer) /* find other buffer to display: previously visited buffer if current window is displaying buffer, or buffer # - 1 */ ptr_buffer_visited = NULL; - if (gui_current_window->buffer == buffer) + if (CONFIG_BOOLEAN(config_look_jump_previous_buffer_when_closing) + && (gui_current_window->buffer == buffer)) { index = gui_buffer_visited_get_index_previous (); if (index >= 0) |