diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index bd0cd4604..2f9f23d5d 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -463,6 +463,11 @@ ** type: integer ** values: 0 .. 128 (default value: 0) +* *weechat.look.prefix_align_more* +** description: display '+' if prefix is truncated +** type: boolean +** values: on, off (default value: on) + * *weechat.look.prefix_buffer_align* ** description: prefix alignment for buffer name, when many buffers are merged with same number (none, left, right (default)) ** type: integer @@ -473,6 +478,11 @@ ** type: integer ** values: 0 .. 128 (default value: 0) +* *weechat.look.prefix_buffer_align_more* +** description: display '+' if buffer name is truncated (when many buffers are merged with same number) +** type: boolean +** values: on, off (default value: on) + * *weechat.look.prefix_error* ** description: prefix for error messages ** type: string diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index d07a40e19..e8eea1db5 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -463,6 +463,11 @@ ** type: entier ** valeurs: 0 .. 128 (valeur par défaut: 0) +* *weechat.look.prefix_align_more* +** description: afficher '+' si le préfixe est tronqué +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *weechat.look.prefix_buffer_align* ** description: alignement de préfixe pour le nom du tampon, quand plusieurs tampons sont mélangés avec le même numéro (none, left, right (par défaut)) ** type: entier @@ -473,6 +478,11 @@ ** type: entier ** valeurs: 0 .. 128 (valeur par défaut: 0) +* *weechat.look.prefix_buffer_align_more* +** description: afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont mélangés avec le même numéro) +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *weechat.look.prefix_error* ** description: préfixe pour les messages d'erreur ** type: chaîne diff --git a/po/cs.po b/po/cs.po index ff5f6b605..036dc1536 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1434,6 +1434,9 @@ msgstr "zarovnání prefixu (none, left, right (výchozí))" msgid "max size for prefix (0 = no max size)" msgstr "maximální velikost prefixu (0 = žádná maximální velikost)" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1445,6 +1448,12 @@ msgid "" "no max size)" msgstr "maximální velikost prefixu (0 = žádná maximální velikost)" +#, fuzzy +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "maximální velikost prefixu (0 = žádná maximální velikost)" + msgid "string displayed after prefix" msgstr "řetězec zobrazený za prefixem" diff --git a/po/de.po b/po/de.po index e6dcd99b4..06746540e 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1457,6 +1457,9 @@ msgstr "Nicklisten-Position (top, left, right (Standard), bottom)" msgid "max size for prefix (0 = no max size)" msgstr "" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1467,6 +1470,11 @@ msgid "" "no max size)" msgstr "" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" + #, fuzzy msgid "string displayed after prefix" msgstr "Nach Nickvervollständigung anzufügende Zeichenfolge" diff --git a/po/es.po b/po/es.po index 83b224896..f9ad09361 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-08-23 04:03-0300\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -1430,6 +1430,9 @@ msgstr "" msgid "max size for prefix (0 = no max size)" msgstr "" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1440,6 +1443,11 @@ msgid "" "no max size)" msgstr "" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" + #, fuzzy msgid "string displayed after prefix" msgstr "la cadena mostrada tras la finalización de los nombres de usuario" diff --git a/po/fr.po b/po/fr.po index 5344a9b87..fc922a2c9 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-08-29 10:26+0200\n" -"PO-Revision-Date: 2009-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" +"PO-Revision-Date: 2009-08-29 12:59+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1617,6 +1617,9 @@ msgstr "alignement de préfixe (none, left, right (par défaut))" msgid "max size for prefix (0 = no max size)" msgstr "taille maximum pour le préfixe (0 = pas de taille maximum)" +msgid "display '+' if prefix is truncated" +msgstr "afficher '+' si le préfixe est tronqué" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1631,6 +1634,13 @@ msgstr "" "taille maximum pour le nom du tampon, quand plusieurs tampons sont mélangés " "avec le même numéro (0 = pas de taille maximum)" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" +"afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont " +"mélangés avec le même numéro)" + msgid "string displayed after prefix" msgstr "chaîne affichée après le préfixe" @@ -5712,6 +5722,9 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" +#~ msgid "display '+' if buffer name is truncated" +#~ msgstr "afficher '+' si le nom du tampon est tronqué" + #~ msgid "text color for nick name in input line" #~ msgstr "couleur du texte pour le pseudo dans la ligne de saisie" diff --git a/po/hu.po b/po/hu.po index c7157f4c5..4aa32bcd4 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1467,6 +1467,9 @@ msgstr "névlista helye (top, left, right (alapértelmezett), bottom)" msgid "max size for prefix (0 = no max size)" msgstr "" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1477,6 +1480,11 @@ msgid "" "no max size)" msgstr "" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" + #, fuzzy msgid "string displayed after prefix" msgstr "névkiegészítés után beszúrt szöveg" diff --git a/po/pl.po b/po/pl.po index e08176dbc..435d3e3dc 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-08-28 11:51+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish\n" @@ -1623,6 +1623,9 @@ msgstr "wyrównanie przedrostków (none, left, right (domyślne))" msgid "max size for prefix (0 = no max size)" msgstr "maksymalny rozmiar przedrostka (0 = brak maksymalnego rozmiaru)" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1637,6 +1640,13 @@ msgid "" msgstr "" "kolor nazwy bufora (przed predrostkiem, kiedy wiele buforów jest połączonych)" +#, fuzzy +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" +"kolor nazwy bufora (przed predrostkiem, kiedy wiele buforów jest połączonych)" + msgid "string displayed after prefix" msgstr "ciąg wyświetlany po przedrostku" diff --git a/po/ru.po b/po/ru.po index 815d4c0df..f6aeb4ca9 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1470,6 +1470,9 @@ msgstr "" msgid "max size for prefix (0 = no max size)" msgstr "" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1480,6 +1483,11 @@ msgid "" "no max size)" msgstr "" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" + #, fuzzy msgid "string displayed after prefix" msgstr "строка, вставляемая после автодополнения ника" diff --git a/po/weechat.pot b/po/weechat.pot index 2ad7c696b..45e259f3f 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-08-29 10:26+0200\n" +"POT-Creation-Date: 2009-08-29 13:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1258,6 +1258,9 @@ msgstr "" msgid "max size for prefix (0 = no max size)" msgstr "" +msgid "display '+' if prefix is truncated" +msgstr "" + msgid "" "prefix alignment for buffer name, when many buffers are merged with same " "number (none, left, right (default))" @@ -1268,6 +1271,11 @@ msgid "" "no max size)" msgstr "" +msgid "" +"display '+' if buffer name is truncated (when many buffers are merged with " +"same number)" +msgstr "" + msgid "string displayed after prefix" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index ede6068c2..54966fe22 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -92,8 +92,10 @@ struct t_config_option *config_look_paste_max_lines; struct t_config_option *config_look_prefix[GUI_CHAT_NUM_PREFIXES]; struct t_config_option *config_look_prefix_align; struct t_config_option *config_look_prefix_align_max; +struct t_config_option *config_look_prefix_align_more; struct t_config_option *config_look_prefix_buffer_align; struct t_config_option *config_look_prefix_buffer_align_max; +struct t_config_option *config_look_prefix_buffer_align_more; struct t_config_option *config_look_prefix_suffix; struct t_config_option *config_look_read_marker; struct t_config_option *config_look_save_config_on_exit; @@ -1371,6 +1373,11 @@ config_weechat_init_options () "prefix_align_max", "integer", N_("max size for prefix (0 = no max size)"), NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_prefix_align_more = config_file_new_option ( + weechat_config_file, ptr_section, + "prefix_align_more", "boolean", + N_("display '+' if prefix is truncated"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); config_look_prefix_buffer_align = config_file_new_option ( weechat_config_file, ptr_section, "prefix_buffer_align", "integer", @@ -1383,6 +1390,12 @@ config_weechat_init_options () N_("max size for buffer name, when many buffers are merged with same " "number (0 = no max size)"), NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_prefix_buffer_align_more = config_file_new_option ( + weechat_config_file, ptr_section, + "prefix_buffer_align_more", "boolean", + N_("display '+' if buffer name is truncated (when many buffers are " + "merged with same number)"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); config_look_prefix_suffix = config_file_new_option ( weechat_config_file, ptr_section, "prefix_suffix", "string", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index c5624fd40..021a503e1 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -107,8 +107,10 @@ extern struct t_config_option *config_look_paste_max_lines; extern struct t_config_option *config_look_prefix[]; extern struct t_config_option *config_look_prefix_align; extern struct t_config_option *config_look_prefix_align_max; +extern struct t_config_option *config_look_prefix_align_more; extern struct t_config_option *config_look_prefix_buffer_align; extern struct t_config_option *config_look_prefix_buffer_align_max; +extern struct t_config_option *config_look_prefix_buffer_align_more; extern struct t_config_option *config_look_prefix_suffix; extern struct t_config_option *config_look_read_marker; extern struct t_config_option *config_look_save_config_on_exit; diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 966d6020b..aac84aad1 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -630,7 +630,9 @@ gui_chat_display_time_and_prefix (struct t_gui_window *window, gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT_PREFIX_MORE); } - gui_chat_display_word (window, line, str_plus, + gui_chat_display_word (window, line, + (CONFIG_BOOLEAN(config_look_prefix_buffer_align_more)) ? + str_plus : str_space, NULL, 1, num_lines, count, lines_displayed, simulate); } @@ -744,7 +746,9 @@ gui_chat_display_time_and_prefix (struct t_gui_window *window, gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT_PREFIX_MORE); } - gui_chat_display_word (window, line, str_plus, + gui_chat_display_word (window, line, + (CONFIG_BOOLEAN(config_look_prefix_align_more)) ? + str_plus : str_space, NULL, 1, num_lines, count, lines_displayed, simulate); }