diff --git a/ChangeLog b/ChangeLog index a0607bdcc..25ac17757 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,12 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] (file 'NEWS' in sources). +Version 0.4.3 (under dev!) +-------------------------- + +* core: add options to customize default text search in buffers: + weechat.look.buffer_search_{case_sensitive|force_default|regex|where} + Version 0.4.2 (2013-10-06) -------------------------- diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index aeb7c7aec..3ef55047a 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -413,6 +413,26 @@ ** Typ: integer ** Werte: none, highlight, message, all (Standardwert: `all`) +* [[option_weechat.look.buffer_search_case_sensitive]] *weechat.look.buffer_search_case_sensitive* +** Beschreibung: `default text search in buffer: case sensitive or not` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + +* [[option_weechat.look.buffer_search_force_default]] *weechat.look.buffer_search_force_default* +** Beschreibung: `force default values for text search in buffer (instead of using values from last search in buffer)` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + +* [[option_weechat.look.buffer_search_regex]] *weechat.look.buffer_search_regex* +** Beschreibung: `default text search in buffer: if enabled, search regular expression, otherwise search simple string` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + +* [[option_weechat.look.buffer_search_where]] *weechat.look.buffer_search_where* +** Beschreibung: `default text search in buffer: in message, prefix, prefix and message` +** Typ: integer +** Werte: prefix, message, prefix_message (Standardwert: `message`) + * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format* ** Beschreibung: `Format für die Uhrzeit, die in jeder Zeile eines Buffers dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt wird evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval). Beispiel: Uhrzeit in Graustufen (Unterstützung von 256 Farben notwendig): "${color:252}%H${color:245}%M${color:240}%S"` ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index a20e530ab..2c07d395b 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -413,6 +413,26 @@ ** type: integer ** values: none, highlight, message, all (default value: `all`) +* [[option_weechat.look.buffer_search_case_sensitive]] *weechat.look.buffer_search_case_sensitive* +** description: `default text search in buffer: case sensitive or not` +** type: boolean +** values: on, off (default value: `off`) + +* [[option_weechat.look.buffer_search_force_default]] *weechat.look.buffer_search_force_default* +** description: `force default values for text search in buffer (instead of using values from last search in buffer)` +** type: boolean +** values: on, off (default value: `off`) + +* [[option_weechat.look.buffer_search_regex]] *weechat.look.buffer_search_regex* +** description: `default text search in buffer: if enabled, search regular expression, otherwise search simple string` +** type: boolean +** values: on, off (default value: `off`) + +* [[option_weechat.look.buffer_search_where]] *weechat.look.buffer_search_where* +** description: `default text search in buffer: in message, prefix, prefix and message` +** type: integer +** values: prefix, message, prefix_message (default value: `message`) + * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format* ** description: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:252}%H${color:245}%M${color:240}%S"` ** type: string diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index d577bca76..6a65d6f8d 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -413,6 +413,26 @@ ** type: entier ** valeurs: none, highlight, message, all (valeur par défaut: `all`) +* [[option_weechat.look.buffer_search_case_sensitive]] *weechat.look.buffer_search_case_sensitive* +** description: `recherche par défaut dans le tampon : sensible à la casse ou non` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + +* [[option_weechat.look.buffer_search_force_default]] *weechat.look.buffer_search_force_default* +** description: `forcer les valeurs par défaut pour la recherche de texte dans le tampon (au lieu d'utiliser les valeurs de la dernière recherche dans le tampon)` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + +* [[option_weechat.look.buffer_search_regex]] *weechat.look.buffer_search_regex* +** description: `recherche par défaut dans le tampon: si activé, rechercher une expression régulière, sinon rechercher du texte simple` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + +* [[option_weechat.look.buffer_search_where]] *weechat.look.buffer_search_where* +** description: `recherche par défaut dans le tampon: dans le message, le préfixe, le préfixe et le message` +** type: entier +** valeurs: prefix, message, prefix_message (valeur par défaut: `message`) + * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format* ** description: `format de date/heure pour chaque ligne affichée dans les tampons (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval); par exemple l'heure avec des niveaux de gris (requiert le support de 256 couleurs): "${color:252}%H${color:245}%M${color:240}%S"` ** type: chaîne diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index e18996ca8..469e9dedb 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -413,6 +413,26 @@ ** tipo: intero ** valori: none, highlight, message, all (valore predefinito: `all`) +* [[option_weechat.look.buffer_search_case_sensitive]] *weechat.look.buffer_search_case_sensitive* +** descrizione: `default text search in buffer: case sensitive or not` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + +* [[option_weechat.look.buffer_search_force_default]] *weechat.look.buffer_search_force_default* +** descrizione: `force default values for text search in buffer (instead of using values from last search in buffer)` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + +* [[option_weechat.look.buffer_search_regex]] *weechat.look.buffer_search_regex* +** descrizione: `default text search in buffer: if enabled, search regular expression, otherwise search simple string` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + +* [[option_weechat.look.buffer_search_where]] *weechat.look.buffer_search_where* +** descrizione: `default text search in buffer: in message, prefix, prefix and message` +** tipo: intero +** valori: prefix, message, prefix_message (valore predefinito: `message`) + * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format* ** descrizione: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:252}%H${color:245}%M${color:240}%S"` ** tipo: stringa diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt index 33011990c..f1a9c6de1 100644 --- a/doc/ja/autogen/user/weechat_options.txt +++ b/doc/ja/autogen/user/weechat_options.txt @@ -413,6 +413,26 @@ ** タイプ: 整数 ** 値: none, highlight, message, all (デフォルト値: `all`) +* [[option_weechat.look.buffer_search_case_sensitive]] *weechat.look.buffer_search_case_sensitive* +** 説明: `default text search in buffer: case sensitive or not` +** タイプ: ブール +** 値: on, off (デフォルト値: `off`) + +* [[option_weechat.look.buffer_search_force_default]] *weechat.look.buffer_search_force_default* +** 説明: `force default values for text search in buffer (instead of using values from last search in buffer)` +** タイプ: ブール +** 値: on, off (デフォルト値: `off`) + +* [[option_weechat.look.buffer_search_regex]] *weechat.look.buffer_search_regex* +** 説明: `default text search in buffer: if enabled, search regular expression, otherwise search simple string` +** タイプ: ブール +** 値: on, off (デフォルト値: `off`) + +* [[option_weechat.look.buffer_search_where]] *weechat.look.buffer_search_where* +** 説明: `default text search in buffer: in message, prefix, prefix and message` +** タイプ: 整数 +** 値: prefix, message, prefix_message (デフォルト値: `message`) + * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format* ** 説明: `バッファに表示される行に付く時間フォーマット (日付/時間の指定子は strftime の man を参照) (注意: 値は評価されるため "${color:xxx}" フォーマットで色を指定出来ます、/help eval を参照); 例えばグレースケールを使う時間の例 (256 色のサポートが必要): "${color:252}%H${color:245}%M${color:240}%S"` ** タイプ: 文字列 diff --git a/po/cs.po b/po/cs.po index 4ab6ff519..75246fd01 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 11:12+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2536,6 +2536,22 @@ msgstr "" "all=všechny zprávy (výchozí), message=zprávy+zváraznění, highlight=pouze " "zvýraznění, none=nikdy nezobrazovat v hotlistu" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" diff --git a/po/de.po b/po/de.po index 6ce4bfc3a..682cd248d 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:17+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -2891,6 +2891,22 @@ msgstr "" "Nachrichten (Standard), message=Nachrichten+Highlights, highlights=nur " "Highlights, none=Hotlist wird niemals angezeigt" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/es.po b/po/es.po index 4ee9789be..8873818a6 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:17+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2678,6 +2678,22 @@ msgstr "" "+resaltes, highlight=solamente resaltes,none=nunca mostrar en la lista de " "actividad" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" diff --git a/po/fr.po b/po/fr.po index 1a438009f..3cebee506 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" -"PO-Revision-Date: 2013-10-06 11:17+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" +"PO-Revision-Date: 2013-10-06 11:42+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -2812,6 +2812,28 @@ msgstr "" "message=messages+highlights, highlight=highlights seulement, none=ne jamais " "afficher dans la hotlist" +msgid "default text search in buffer: case sensitive or not" +msgstr "recherche par défaut dans le tampon : sensible à la casse ou non" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" +"forcer les valeurs par défaut pour la recherche de texte dans le tampon (au " +"lieu d'utiliser les valeurs de la dernière recherche dans le tampon)" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" +"recherche par défaut dans le tampon: si activé, rechercher une expression " +"régulière, sinon rechercher du texte simple" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" +"recherche par défaut dans le tampon: dans le message, le préfixe, le préfixe " +"et le message" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/hu.po b/po/hu.po index 59fc7d9b7..c68f3e1cb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -2210,6 +2210,22 @@ msgid "" "none=never display in hotlist" msgstr "" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" diff --git a/po/it.po b/po/it.po index e6ee9745f..e5b374d07 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -2765,6 +2765,22 @@ msgstr "" "message=messaggi+notifiche, highlight=solo notifiche, none=non viene mai " "visualizzato nella hotlist" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" diff --git a/po/ja.po b/po/ja.po index b72e49272..b72eeb3b7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -2740,6 +2740,22 @@ msgstr "" "のメッセージ (デフォルト)、message=メッセージとハイライト、highlight=ハイライ" "トのみ、none=ホットリストに表示されない" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/pl.po b/po/pl.po index 8b5bf2bb1..a563e25f3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -2795,6 +2795,22 @@ msgstr "" "+podświetlenia, highlight=tylko podświetlenia, none=nigdy nie wyświetlany na " "hotliście" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0f99f575e..e71da43d4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -2621,6 +2621,22 @@ msgstr "" "message=mensagens+destaques, highlights=apenas destaques, none=nunca mostrar " "na lista atual" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/ru.po b/po/ru.po index 142cdc99b..92d5a7d47 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -2232,6 +2232,22 @@ msgid "" "none=never display in hotlist" msgstr "" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated #, fuzzy msgid "" diff --git a/po/tr.po b/po/tr.po index 0165009dd..306522d59 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-10-06 10:18+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -1978,6 +1978,22 @@ msgid "" "none=never display in hotlist" msgstr "" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/po/weechat.pot b/po/weechat.pot index d084a3e24..78eb8ae54 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-06 11:16+0200\n" +"POT-Creation-Date: 2013-10-06 11:35+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -1982,6 +1982,22 @@ msgid "" "none=never display in hotlist" msgstr "" +msgid "default text search in buffer: case sensitive or not" +msgstr "" + +msgid "" +"force default values for text search in buffer (instead of using values from " +"last search in buffer)" +msgstr "" + +msgid "" +"default text search in buffer: if enabled, search regular expression, " +"otherwise search simple string" +msgstr "" + +msgid "default text search in buffer: in message, prefix, prefix and message" +msgstr "" + #. TRANSLATORS: string "${color:xxx}" must NOT be translated msgid "" "time format for each line displayed in buffers (see man strftime for date/" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 70fb8e6e8..0e7ab6a6d 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -85,6 +85,10 @@ struct t_config_option *config_look_bar_more_right; struct t_config_option *config_look_bar_more_up; struct t_config_option *config_look_bar_more_down; struct t_config_option *config_look_buffer_notify_default; +struct t_config_option *config_look_buffer_search_case_sensitive; +struct t_config_option *config_look_buffer_search_force_default; +struct t_config_option *config_look_buffer_search_regex; +struct t_config_option *config_look_buffer_search_where; struct t_config_option *config_look_buffer_time_format; struct t_config_option *config_look_color_basic_force_bold; struct t_config_option *config_look_color_inactive_window; @@ -1975,6 +1979,29 @@ config_weechat_init_options () "none=never display in hotlist"), "none|highlight|message|all", 0, 0, "all", NULL, 0, NULL, NULL, &config_change_buffer_notify_default, NULL, NULL, NULL); + config_look_buffer_search_case_sensitive = config_file_new_option ( + weechat_config_file, ptr_section, + "buffer_search_case_sensitive", "boolean", + N_("default text search in buffer: case sensitive or not"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + config_look_buffer_search_force_default = config_file_new_option ( + weechat_config_file, ptr_section, + "buffer_search_force_default", "boolean", + N_("force default values for text search in buffer (instead of using " + "values from last search in buffer)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + config_look_buffer_search_regex = config_file_new_option ( + weechat_config_file, ptr_section, + "buffer_search_regex", "boolean", + N_("default text search in buffer: if enabled, search regular expression, " + "otherwise search simple string"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + config_look_buffer_search_where = config_file_new_option ( + weechat_config_file, ptr_section, + "buffer_search_where", "integer", + N_("default text search in buffer: in message, prefix, prefix and " + "message"), + "prefix|message|prefix_message", 0, 0, "message", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); config_look_buffer_time_format = config_file_new_option ( weechat_config_file, ptr_section, "buffer_time_format", "string", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index a8012af51..f78a8749e 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -37,6 +37,13 @@ enum t_config_look_align_end_of_lines CONFIG_LOOK_ALIGN_END_OF_LINES_MESSAGE, }; +enum t_config_look_buffer_search_where +{ + CONFIG_LOOK_BUFFER_SEARCH_PREFIX = 0, + CONFIG_LOOK_BUFFER_SEARCH_MESSAGE, + CONFIG_LOOK_BUFFER_SEARCH_PREFIX_MESSAGE, +}; + enum t_config_look_prefix_align { CONFIG_LOOK_PREFIX_ALIGN_NONE = 0, @@ -102,6 +109,10 @@ extern struct t_config_option *config_look_bar_more_right; extern struct t_config_option *config_look_bar_more_up; extern struct t_config_option *config_look_bar_more_down; extern struct t_config_option *config_look_buffer_notify_default; +extern struct t_config_option *config_look_buffer_search_case_sensitive; +extern struct t_config_option *config_look_buffer_search_force_default; +extern struct t_config_option *config_look_buffer_search_regex; +extern struct t_config_option *config_look_buffer_search_where; extern struct t_config_option *config_look_buffer_time_format; extern struct t_config_option *config_look_color_basic_force_bold; extern struct t_config_option *config_look_color_inactive_window; diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index 7e1fc4fb4..c37954c1b 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -1549,8 +1549,28 @@ void gui_window_search_start (struct t_gui_window *window) { window->buffer->text_search = GUI_TEXT_SEARCH_BACKWARD; - if (window->buffer->text_search_where == 0) - window->buffer->text_search_where = GUI_TEXT_SEARCH_IN_MESSAGE; + if ((window->buffer->text_search_where == 0) + || CONFIG_BOOLEAN(config_look_buffer_search_force_default)) + { + /* set default search values */ + window->buffer->text_search_exact = CONFIG_BOOLEAN(config_look_buffer_search_case_sensitive); + window->buffer->text_search_regex = CONFIG_BOOLEAN(config_look_buffer_search_regex); + switch (CONFIG_INTEGER(config_look_buffer_search_where)) + { + case CONFIG_LOOK_BUFFER_SEARCH_PREFIX: + window->buffer->text_search_where = GUI_TEXT_SEARCH_IN_PREFIX; + break; + case CONFIG_LOOK_BUFFER_SEARCH_MESSAGE: + window->buffer->text_search_where = GUI_TEXT_SEARCH_IN_MESSAGE; + break; + case CONFIG_LOOK_BUFFER_SEARCH_PREFIX_MESSAGE: + window->buffer->text_search_where = GUI_TEXT_SEARCH_IN_PREFIX | GUI_TEXT_SEARCH_IN_MESSAGE; + break; + default: + window->buffer->text_search_where = GUI_TEXT_SEARCH_IN_MESSAGE; + break; + } + } window->buffer->text_search_found = 0; gui_input_search_compile_regex (window->buffer); if (window->buffer->text_search_input)