diff --git a/ChangeLog b/ChangeLog index 353fa9667..638c9c3cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ v0.3.6-dev, 2011-08-26 Version 0.3.6 (under dev!) -------------------------- +* core: add new option weechat.look.item_buffer_filter * core: change default value of option weechat.network.gnutls_ca_file to "/etc/ssl/certs/ca-certificates.crt" * core: replace deprecated gnutls function diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index cc90c3c4c..90499d3bc 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -458,6 +458,11 @@ ** Typ: integer ** Werte: 0 .. 65535 (Standardwert: `32`) +* *weechat.look.item_buffer_filter* +** Beschreibung: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter"` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"*"`) + * *weechat.look.item_time_format* ** Beschreibung: `Format für die Zeitanzeige, "time", in der Bar-Item (siehe man strftime für Datum/Zeit Platzhalter)` ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 1bfd01fe0..76726828c 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -458,6 +458,11 @@ ** type: integer ** values: 0 .. 65535 (default value: `32`) +* *weechat.look.item_buffer_filter* +** description: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter"` +** type: string +** values: any string (default value: `"*"`) + * *weechat.look.item_time_format* ** description: `time format for "time" bar item (see man strftime for date/time specifiers)` ** type: string diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index e68ef75ed..db729655f 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -458,6 +458,11 @@ ** type: entier ** valeurs: 0 .. 65535 (valeur par défaut: `32`) +* *weechat.look.item_buffer_filter* +** description: `chaîne utilisée pour montrer que des lignes sont filtrées dans le tampon courant (objet de barre "buffer_filter")` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"*"`) + * *weechat.look.item_time_format* ** description: `format de date/heure pour l'objet de barre \"time\" (voir man strftime pour le format de date/heure)` ** type: chaîne diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 2cd069055..8769ad8e9 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -458,6 +458,11 @@ ** tipo: intero ** valori: 0 .. 65535 (valore predefinito: `32`) +* *weechat.look.item_buffer_filter* +** descrizione: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter"` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"*"`) + * *weechat.look.item_time_format* ** descrizione: `formato dell'ora per l'elemento barra "time" (consultare man strftime per gli specificatori data/ora)` ** tipo: stringa diff --git a/po/cs.po b/po/cs.po index 2edaa79c2..ee035f21c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2385,6 +2385,11 @@ msgstr "" "časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci " "data/času)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/de.po b/po/de.po index dbb57f833..4e9aeafd3 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-08-15 10:10+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev \n" @@ -2582,6 +2582,11 @@ msgstr "" "Format für die Zeitanzeige, \"time\", in der Bar-Item (siehe man strftime " "für Datum/Zeit Platzhalter)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/es.po b/po/es.po index 82f7deac8..e0c97dc1e 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2418,6 +2418,11 @@ msgstr "" "formato de hora para el elemento de barra \"time\" (ver el manual de " "strftime para los especificadores de fecha/hora)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/fr.po b/po/fr.po index 32b3e35f0..aae235a1a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" -"PO-Revision-Date: 2011-08-26 18:24+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" +"PO-Revision-Date: 2011-08-26 19:23+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -2512,6 +2512,13 @@ msgstr "" "format de date/heure pour l'objet de barre \\\"time\\\" (voir man strftime " "pour le format de date/heure)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" +"chaîne utilisée pour montrer que des lignes sont filtrées dans le tampon " +"courant (objet de barre \"buffer_filter\")" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/hu.po b/po/hu.po index 3eb66b3d3..bffbcf2b4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -2041,6 +2041,11 @@ msgid "" "time format for \"time\" bar item (see man strftime for date/time specifiers)" msgstr "" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/it.po b/po/it.po index 05076fb12..169f0caec 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-08-16 17:48+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -2498,6 +2498,11 @@ msgstr "" "formato dell'ora per l'elemento barra \"time\" (consultare man strftime per " "gli specificatori data/ora)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/pl.po b/po/pl.po index 8d05db1ce..b383fe038 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-07-05 15:38+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -2414,6 +2414,11 @@ msgstr "" "format czasu dla elementu paska \"time\" (zobacz man strftime dla " "specyfikatorów daty/czasu)" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/pt_BR.po b/po/pt_BR.po index d5c5d6b90..bfff60577 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -2395,6 +2395,11 @@ msgid "" "time format for \"time\" bar item (see man strftime for date/time specifiers)" msgstr "" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/ru.po b/po/ru.po index ea3be6528..86cd33a77 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -2058,6 +2058,11 @@ msgid "" "time format for \"time\" bar item (see man strftime for date/time specifiers)" msgstr "" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/po/weechat.pot b/po/weechat.pot index cea8c5f25..860fdfdca 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: 2011-08-26 18:23+0200\n" +"POT-Creation-Date: 2011-08-26 19:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1792,6 +1792,11 @@ msgid "" "time format for \"time\" bar item (see man strftime for date/time specifiers)" msgstr "" +msgid "" +"string used to show that some lines are filtered in current buffer (bar item " +"\"buffer_filter\"" +msgstr "" + msgid "" "jump to previous buffer displayed when jumping to current buffer number " "with /buffer *N (where N is a buffer number), to easily switch to another " diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 0c0cf715b..2355567d5 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -107,6 +107,7 @@ struct t_config_option *config_look_input_share; struct t_config_option *config_look_input_share_overwrite; struct t_config_option *config_look_input_undo_max; struct t_config_option *config_look_item_time_format; +struct t_config_option *config_look_item_buffer_filter; 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_mouse; @@ -1783,7 +1784,13 @@ config_weechat_init_options () "item_time_format", "string", N_("time format for \"time\" bar item (see man strftime for date/time " "specifiers)"), - NULL, 0, 0, "%H:%M", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + NULL, 0, 0, "%H:%M", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_item_buffer_filter = config_file_new_option ( + weechat_config_file, ptr_section, + "item_buffer_filter", "string", + N_("string used to show that some lines are filtered in current buffer " + "(bar item \"buffer_filter\""), + NULL, 0, 0, "*", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); config_look_jump_current_to_previous_buffer = config_file_new_option ( weechat_config_file, ptr_section, "jump_current_to_previous_buffer", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 6ee81a216..7ac415da1 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -131,6 +131,7 @@ extern struct t_config_option *config_look_input_share; extern struct t_config_option *config_look_input_share_overwrite; extern struct t_config_option *config_look_input_undo_max; extern struct t_config_option *config_look_item_time_format; +extern struct t_config_option *config_look_item_buffer_filter; 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_mouse; diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 425a18b53..a49eefd73 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -932,7 +932,7 @@ char * gui_bar_item_default_buffer_filter (void *data, struct t_gui_bar_item *item, struct t_gui_window *window) { - char buf[256]; + char buf[512]; /* make C compiler happy */ (void) data; @@ -945,8 +945,9 @@ gui_bar_item_default_buffer_filter (void *data, struct t_gui_bar_item *item, return NULL; snprintf (buf, sizeof (buf), - "%s*", - gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_filter)))); + "%s%s", + gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_status_filter))), + CONFIG_STRING(config_look_item_buffer_filter)); return strdup (buf); }