pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-27 21:36:37 +02:00
Code Activity

Added case-sensitive search in buffer, display marker for each line matching search

Browse Source
This commit is contained in:
Sebastien Helleu
2007-03-20 10:18:25 +00:00
parent 25bfda26e9
commit 7f0e0b5eea
34 changed files with 1920 additions and 1608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/de/weechat.de.xml
+3
View File
@@ -517,6 +517,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>
<!-- TRANSLATION NEEDED -->
Search for text in buffer history
(two times: search exact text)
</entry>
</row>
<row>
@@ -572,6 +573,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Eingabe / Strg + J / Strg + M</entry>
<entry>
Führe ein Kommando aus oder sende eine Nachricht
<!-- TRANSLATION NEEDED -->
(in search mode: stop search)
</entry>
</row>
<row>
doc/en/weechat.en.xml
+2
View File
@@ -512,6 +512,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Ctrl + R</entry>
<entry>
Search for text in buffer history
(two times: search exact text)
</entry>
</row>
<row>
@@ -567,6 +568,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Enter / Ctrl + J / Ctrl + M</entry>
<entry>
Execute command or send message
(in search mode: stop search)
</entry>
</row>
<row>
doc/fr/weechat.fr.xml
+2
View File
@@ -521,6 +521,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Ctrl + R</entry>
<entry>
Chercher du texte dans l'historique du tampon
(deux appuis successifs pour rechercher du texte exact)
</entry>
</row>
<row>
@@ -577,6 +578,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Entrée / Ctrl + J / Ctrl + M</entry>
<entry>
Exécuter la commande ou envoyer le message
(en mode recherche: arrêter la recherche)
</entry>
</row>
<row>
po/cs.po
+19 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2240,55 +2240,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "bajtů"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Akceptovat"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Storno"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Odebrat"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Vyčistit buffer"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data"
@@ -2340,7 +2344,7 @@ msgstr "-VÍCE-"
msgid "server"
msgstr "server"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nedostatek paměti pro nový řádek\n"
po/de.po
+19 -15
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n"
@@ -2248,55 +2248,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] annehmen"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] abbrechen"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] entfernen"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Puffer löschen"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen"
@@ -2348,7 +2352,7 @@ msgstr "-MEHR-"
msgid "server"
msgstr "Server"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nicht genügend Speicher für neue Zeile\n"
po/es.po
+19 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2278,56 +2278,60 @@ msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr ""
"%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "bytes"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "Tiempo estimado de llegada"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Aceptar"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Cancelar"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Eliminar"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
#, fuzzy
msgid " [C] Clear buffer"
msgstr "saltar al búfer DCC"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura"
@@ -2379,7 +2383,7 @@ msgstr "-M
msgid "server"
msgstr "servidor"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva línea\n"
po/fr.po
+20 -16
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"PO-Revision-Date: 2007-03-16 14:36+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-20 11:00+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -2267,55 +2267,59 @@ msgstr ""
"%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
"l'extension\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "octets"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "Ko"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "Mo"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "Go"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr "Recherche texte (exact): "
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr "Recherche texte: "
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Accepter"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Annuler"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Retirer"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Effacer le tampon"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut"
@@ -2367,7 +2371,7 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
po/hu.po
+19 -15
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2248,55 +2248,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "byte"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Elfogadás"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Mégsem"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Eltávolítás"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Puffer törlése"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása"
@@ -2348,7 +2352,7 @@ msgstr "-TOVÁBB-"
msgid "server"
msgstr "szerver"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nincs elég memória az új sorhoz\n"
po/ru.po
+728 -646
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+19 -15
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: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\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"
@@ -2100,55 +2100,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr ""
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr ""
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr ""
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr ""
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr ""
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr ""
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr ""
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr ""
@@ -2200,7 +2204,7 @@ msgstr ""
msgid "server"
msgstr ""
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr ""
src/gui/curses/gui-curses-chat.c
+23 -7
View File
@@ -812,14 +812,30 @@ gui_chat_display_line (t_gui_window *window, t_gui_line *line, int count,
}
else
{
/* display read marker if needed */
if (cfg_look_read_marker && cfg_look_read_marker[0] &&
window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
if (cfg_look_read_marker && cfg_look_read_marker[0])
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
/* display marker if line is matching user search */
if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
{
if (gui_buffer_line_search (line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
}
else
{
/* display read marker if needed */
if (window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
}
}
}
src/gui/curses/gui-curses-input.c
+8 -2
View File
@@ -79,7 +79,12 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
int char_size, length;
if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
return utf8_width_screen (_("Text search: "));
{
if (window->buffer->text_search_exact)
return utf8_width_screen (_("Text search (exact): "));
else
return utf8_width_screen (_("Text search: "));
}
length = 0;
pos = cfg_look_input_format;
@@ -161,7 +166,8 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT);
wprintw (GUI_CURSES(window)->win_input, "%s",
_("Text search: "));
(window->buffer->text_search_exact) ?
_("Text search (exact): ") : _("Text search: "));
return;
}
src/gui/curses/gui-curses-keyboard.c
+1 -10
View File
@@ -304,16 +304,7 @@ gui_keyboard_read ()
if ((gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED)
&& ((input_old == NULL) || (gui_current_window->buffer->input_buffer == NULL)
|| (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0)))
{
gui_current_window->start_line = NULL;
gui_current_window->start_line_pos = 0;
gui_current_window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (!gui_buffer_search_text (gui_current_window))
{
gui_chat_draw (gui_current_window->buffer, 1);
gui_status_draw (gui_current_window->buffer, 1);
}
}
gui_buffer_search_restart (gui_current_window);
if (input_old)
free (input_old);
src/gui/gui-action.c
+5 -1
View File
@@ -1453,6 +1453,10 @@ gui_action_search_text (t_gui_window *window, char *args)
if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
gui_buffer_search_start (window);
else
gui_buffer_search_stop (window);
{
window->buffer->text_search_exact ^= 1;
gui_buffer_search_restart (window);
gui_input_draw (window->buffer, 1);
}
}
}
src/gui/gui-buffer.c
+71 -47
View File
@@ -209,6 +209,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
/* text search */
new_buffer->text_search = TEXT_SEARCH_DISABLED;
new_buffer->text_search_exact = 0;
new_buffer->text_search_input = NULL;
/* add buffer to buffers queue */
@@ -647,7 +648,7 @@ gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive)
char *data;
int rc;
if (!text)
if (!text || !text[0])
return 0;
rc = 0;
@@ -655,7 +656,7 @@ gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive)
if (data)
{
if ((case_sensitive && (strstr (data, text)))
|| (!case_sensitive && (strcasestr (data, text))))
|| (!case_sensitive && (ascii_strcasestr (data, text))))
rc = 1;
free (data);
}
@@ -977,49 +978,6 @@ gui_buffer_move_to_number (t_gui_buffer *buffer, int number)
gui_window_redraw_buffer (buffer);
}
/*
* gui_buffer_search_start: start search in a buffer
*/
void
gui_buffer_search_start (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (window->buffer->text_search_input)
{
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
if (window->buffer->input_buffer && window->buffer->input_buffer[0])
window->buffer->text_search_input =
strdup (window->buffer->input_buffer);
gui_action_delete_line (window, NULL);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_stop: stop search in a buffer
*/
void
gui_buffer_search_stop (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_DISABLED;
gui_action_delete_line (window, NULL);
if (window->buffer->text_search_input)
{
gui_insert_string_input (window, window->buffer->text_search_input, -1);
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
window->start_line = NULL;
window->start_line_pos = 0;
gui_chat_draw (window->buffer, 0);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_text: search text in a buffer
*/
@@ -1038,7 +996,8 @@ gui_buffer_search_text (t_gui_window *window)
window->start_line->prev_line : window->buffer->last_line;
while (ptr_line)
{
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0))
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
window->start_line = ptr_line;
window->start_line_pos = 0;
@@ -1061,7 +1020,8 @@ gui_buffer_search_text (t_gui_window *window)
window->start_line->next_line : window->buffer->lines->next_line;
while (ptr_line)
{
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0))
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
window->start_line = ptr_line;
window->start_line_pos = 0;
@@ -1078,6 +1038,69 @@ gui_buffer_search_text (t_gui_window *window)
return 0;
}
/*
* gui_buffer_search_start: start search in a buffer
*/
void
gui_buffer_search_start (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
window->buffer->text_search_exact = 0;
if (window->buffer->text_search_input)
{
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
if (window->buffer->input_buffer && window->buffer->input_buffer[0])
window->buffer->text_search_input =
strdup (window->buffer->input_buffer);
gui_action_delete_line (window, NULL);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_restart: restart search (after input changes or exact
* flag (un)set)
*/
void
gui_buffer_search_restart (t_gui_window *window)
{
window->start_line = NULL;
window->start_line_pos = 0;
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (!gui_buffer_search_text (window))
{
gui_chat_draw (window->buffer, 1);
gui_status_draw (window->buffer, 1);
}
}
/*
* gui_buffer_search_stop: stop search in a buffer
*/
void
gui_buffer_search_stop (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_DISABLED;
window->buffer->text_search = 0;
gui_action_delete_line (window, NULL);
if (window->buffer->text_search_input)
{
gui_insert_string_input (window, window->buffer->text_search_input, -1);
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
window->start_line = NULL;
window->start_line_pos = 0;
gui_chat_draw (window->buffer, 0);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_print_log: print buffer infos in log (usually for crash dump)
*/
@@ -1117,6 +1140,7 @@ gui_buffer_print_log (t_gui_buffer *buffer)
weechat_log_printf (" ptr_history. . . . . . : 0x%X\n", buffer->ptr_history);
weechat_log_printf (" num_history. . . . . . : %d\n", buffer->num_history);
weechat_log_printf (" text_search. . . . . . : %d\n", buffer->text_search);
weechat_log_printf (" text_search_exact. . . : %d\n", buffer->text_search_exact);
weechat_log_printf (" text_search_input. . . : '%s'\n", buffer->text_search_input);
weechat_log_printf (" prev_buffer. . . . . . : 0x%X\n", buffer->prev_buffer);
weechat_log_printf (" next_buffer. . . . . . : 0x%X\n", buffer->next_buffer);
src/gui/gui-buffer.h
+1
View File
@@ -128,6 +128,7 @@ struct t_gui_buffer
/* text search */
int text_search; /* text search type */
int text_search_exact; /* exact search (case sensitive) ? */
char *text_search_input; /* input saved before text search */
/* link to previous/next buffer */
src/gui/gui.h
+1
View File
@@ -100,6 +100,7 @@ extern void gui_buffer_switch_raw_data (t_gui_window *);
extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int);
extern void gui_buffer_move_to_number (t_gui_buffer *, int);
extern void gui_buffer_search_start (t_gui_window *);
extern void gui_buffer_search_restart (t_gui_window *);
extern void gui_buffer_search_stop (t_gui_window *);
extern int gui_buffer_search_text (t_gui_window *);
extern void gui_buffer_print_log (t_gui_buffer *);
weechat/doc/de/weechat.de.xml
+3
View File
@@ -517,6 +517,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>
<!-- TRANSLATION NEEDED -->
Search for text in buffer history
(two times: search exact text)
</entry>
</row>
<row>
@@ -572,6 +573,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Eingabe / Strg + J / Strg + M</entry>
<entry>
Führe ein Kommando aus oder sende eine Nachricht
<!-- TRANSLATION NEEDED -->
(in search mode: stop search)
</entry>
</row>
<row>
weechat/doc/en/weechat.en.xml
+2
View File
@@ -512,6 +512,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Ctrl + R</entry>
<entry>
Search for text in buffer history
(two times: search exact text)
</entry>
</row>
<row>
@@ -567,6 +568,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Enter / Ctrl + J / Ctrl + M</entry>
<entry>
Execute command or send message
(in search mode: stop search)
</entry>
</row>
<row>
weechat/doc/fr/weechat.fr.xml
+2
View File
@@ -521,6 +521,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Ctrl + R</entry>
<entry>
Chercher du texte dans l'historique du tampon
(deux appuis successifs pour rechercher du texte exact)
</entry>
</row>
<row>
@@ -577,6 +578,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<entry>Entrée / Ctrl + J / Ctrl + M</entry>
<entry>
Exécuter la commande ou envoyer le message
(en mode recherche: arrêter la recherche)
</entry>
</row>
<row>
weechat/po/cs.po
+19 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2240,55 +2240,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s server/kanál (%s/%s) nenaleyen pro exec příkaz pluginu\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "bajtů"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Akceptovat"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Storno"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Odebrat"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Vyčistit buffer"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Zavřít čistý pohled na data"
@@ -2340,7 +2344,7 @@ msgstr "-VÍCE-"
msgid "server"
msgstr "server"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nedostatek paměti pro nový řádek\n"
weechat/po/de.po
+19 -15
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: <de@li.org>\n"
@@ -2248,55 +2248,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s Server/Channel (%s/%s) für den Plugin-Exec-Befehl nicht gefunden\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "Bytes"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] annehmen"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] abbrechen"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] entfernen"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] alte DCCs entfernen"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] DCC-Ansicht schließen"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Puffer löschen"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Rohdatenansicht schließen"
@@ -2348,7 +2352,7 @@ msgstr "-MEHR-"
msgid "server"
msgstr "Server"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nicht genügend Speicher für neue Zeile\n"
weechat/po/es.po
+19 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2278,56 +2278,60 @@ msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr ""
"%s servidor/canal (%s/%s) no encontrado para el plugin de comando exec\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "bytes"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "Tiempo estimado de llegada"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Aceptar"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Cancelar"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Eliminar"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
#, fuzzy
msgid " [C] Clear buffer"
msgstr "saltar al búfer DCC"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Cerrar vista de datos basura"
@@ -2379,7 +2383,7 @@ msgstr "-M
msgid "server"
msgstr "servidor"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "No hay suficiente memoria para una nueva línea\n"
weechat/po/fr.po
+20 -16
View File
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"PO-Revision-Date: 2007-03-16 14:36+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-20 11:00+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -2267,55 +2267,59 @@ msgstr ""
"%s serveur/canal (%s/%s) non trouvé pour l'exécution de commande de "
"l'extension\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "octets"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "Ko"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "Mo"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "Go"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr "Recherche texte (exact): "
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr "Recherche texte: "
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Accepter"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Annuler"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Retirer"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Effacer le tampon"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Fermer la vue IRC brut"
@@ -2367,7 +2371,7 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Pas assez de mémoire pour une nouvelle ligne !\n"
weechat/po/hu.po
+19 -15
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.4-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\n"
"PO-Revision-Date: 2007-03-07 09:31+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2248,55 +2248,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr "%s (%s/%s) szerver/szoba nem található a modul futtatása parancshoz\n"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr "byte"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr "KB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr "MB"
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr "GB"
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr "ETA"
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr " [A] Elfogadás"
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr " [C] Mégsem"
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr " [R] Eltávolítás"
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr " [P] Régi DCC törlése"
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr " [Q] DCC nézet bezárása"
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr " [C] Puffer törlése"
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr " [Q] Nyers adat nézet bezárása"
@@ -2348,7 +2352,7 @@ msgstr "-TOVÁBB-"
msgid "server"
msgstr "szerver"
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr "Nincs elég memória az új sorhoz\n"
weechat/po/ru.po
+728 -646
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+19 -15
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: 2007-03-16 14:35+0100\n"
"POT-Creation-Date: 2007-03-20 11:00+0100\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"
@@ -2100,55 +2100,59 @@ msgstr ""
msgid "%s server/channel (%s/%s) not found for plugin exec command\n"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "bytes"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "KB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "MB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:941
#: src/gui/curses/gui-curses-chat.c:957
msgid "GB"
msgstr ""
#: src/gui/curses/gui-curses-chat.c:1075
#: src/gui/curses/gui-curses-chat.c:1091
msgid "ETA"
msgstr ""
#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164
#: src/gui/curses/gui-curses-input.c:84 src/gui/curses/gui-curses-input.c:170
msgid "Text search (exact): "
msgstr ""
#: src/gui/curses/gui-curses-input.c:86 src/gui/curses/gui-curses-input.c:170
msgid "Text search: "
msgstr ""
#: src/gui/curses/gui-curses-input.c:419
#: src/gui/curses/gui-curses-input.c:425
msgid " [A] Accept"
msgstr ""
#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426
#: src/gui/curses/gui-curses-input.c:427 src/gui/curses/gui-curses-input.c:432
msgid " [C] Cancel"
msgstr ""
#: src/gui/curses/gui-curses-input.c:432
#: src/gui/curses/gui-curses-input.c:438
msgid " [R] Remove"
msgstr ""
#: src/gui/curses/gui-curses-input.c:437
#: src/gui/curses/gui-curses-input.c:443
msgid " [P] Purge old DCC"
msgstr ""
#: src/gui/curses/gui-curses-input.c:439
#: src/gui/curses/gui-curses-input.c:445
msgid " [Q] Close DCC view"
msgstr ""
#: src/gui/curses/gui-curses-input.c:448
#: src/gui/curses/gui-curses-input.c:454
msgid " [C] Clear buffer"
msgstr ""
#: src/gui/curses/gui-curses-input.c:450
#: src/gui/curses/gui-curses-input.c:456
msgid " [Q] Close raw data view"
msgstr ""
@@ -2200,7 +2204,7 @@ msgstr ""
msgid "server"
msgstr ""
#: src/gui/gui-buffer.c:619
#: src/gui/gui-buffer.c:620
msgid "Not enough memory for new line\n"
msgstr ""
weechat/src/gui/curses/gui-curses-chat.c
+23 -7
View File
@@ -812,14 +812,30 @@ gui_chat_display_line (t_gui_window *window, t_gui_line *line, int count,
}
else
{
/* display read marker if needed */
if (cfg_look_read_marker && cfg_look_read_marker[0] &&
window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
if (cfg_look_read_marker && cfg_look_read_marker[0])
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
/* display marker if line is matching user search */
if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
{
if (gui_buffer_line_search (line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
}
else
{
/* display read marker if needed */
if (window->buffer->last_read_line &&
(window->buffer->last_read_line == line->prev_line))
{
gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
"%c", cfg_look_read_marker[0]);
}
}
}
}
weechat/src/gui/curses/gui-curses-input.c
+8 -2
View File
@@ -79,7 +79,12 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
int char_size, length;
if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
return utf8_width_screen (_("Text search: "));
{
if (window->buffer->text_search_exact)
return utf8_width_screen (_("Text search (exact): "));
else
return utf8_width_screen (_("Text search: "));
}
length = 0;
pos = cfg_look_input_format;
@@ -161,7 +166,8 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
COLOR_WIN_INPUT);
wprintw (GUI_CURSES(window)->win_input, "%s",
_("Text search: "));
(window->buffer->text_search_exact) ?
_("Text search (exact): ") : _("Text search: "));
return;
}
weechat/src/gui/curses/gui-curses-keyboard.c
+1 -10
View File
@@ -304,16 +304,7 @@ gui_keyboard_read ()
if ((gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED)
&& ((input_old == NULL) || (gui_current_window->buffer->input_buffer == NULL)
|| (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0)))
{
gui_current_window->start_line = NULL;
gui_current_window->start_line_pos = 0;
gui_current_window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (!gui_buffer_search_text (gui_current_window))
{
gui_chat_draw (gui_current_window->buffer, 1);
gui_status_draw (gui_current_window->buffer, 1);
}
}
gui_buffer_search_restart (gui_current_window);
if (input_old)
free (input_old);
weechat/src/gui/gui-action.c
+5 -1
View File
@@ -1453,6 +1453,10 @@ gui_action_search_text (t_gui_window *window, char *args)
if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
gui_buffer_search_start (window);
else
gui_buffer_search_stop (window);
{
window->buffer->text_search_exact ^= 1;
gui_buffer_search_restart (window);
gui_input_draw (window->buffer, 1);
}
}
}
weechat/src/gui/gui-buffer.c
+71 -47
View File
@@ -209,6 +209,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
/* text search */
new_buffer->text_search = TEXT_SEARCH_DISABLED;
new_buffer->text_search_exact = 0;
new_buffer->text_search_input = NULL;
/* add buffer to buffers queue */
@@ -647,7 +648,7 @@ gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive)
char *data;
int rc;
if (!text)
if (!text || !text[0])
return 0;
rc = 0;
@@ -655,7 +656,7 @@ gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive)
if (data)
{
if ((case_sensitive && (strstr (data, text)))
|| (!case_sensitive && (strcasestr (data, text))))
|| (!case_sensitive && (ascii_strcasestr (data, text))))
rc = 1;
free (data);
}
@@ -977,49 +978,6 @@ gui_buffer_move_to_number (t_gui_buffer *buffer, int number)
gui_window_redraw_buffer (buffer);
}
/*
* gui_buffer_search_start: start search in a buffer
*/
void
gui_buffer_search_start (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (window->buffer->text_search_input)
{
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
if (window->buffer->input_buffer && window->buffer->input_buffer[0])
window->buffer->text_search_input =
strdup (window->buffer->input_buffer);
gui_action_delete_line (window, NULL);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_stop: stop search in a buffer
*/
void
gui_buffer_search_stop (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_DISABLED;
gui_action_delete_line (window, NULL);
if (window->buffer->text_search_input)
{
gui_insert_string_input (window, window->buffer->text_search_input, -1);
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
window->start_line = NULL;
window->start_line_pos = 0;
gui_chat_draw (window->buffer, 0);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_text: search text in a buffer
*/
@@ -1038,7 +996,8 @@ gui_buffer_search_text (t_gui_window *window)
window->start_line->prev_line : window->buffer->last_line;
while (ptr_line)
{
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0))
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
window->start_line = ptr_line;
window->start_line_pos = 0;
@@ -1061,7 +1020,8 @@ gui_buffer_search_text (t_gui_window *window)
window->start_line->next_line : window->buffer->lines->next_line;
while (ptr_line)
{
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0))
if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer,
window->buffer->text_search_exact))
{
window->start_line = ptr_line;
window->start_line_pos = 0;
@@ -1078,6 +1038,69 @@ gui_buffer_search_text (t_gui_window *window)
return 0;
}
/*
* gui_buffer_search_start: start search in a buffer
*/
void
gui_buffer_search_start (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
window->buffer->text_search_exact = 0;
if (window->buffer->text_search_input)
{
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
if (window->buffer->input_buffer && window->buffer->input_buffer[0])
window->buffer->text_search_input =
strdup (window->buffer->input_buffer);
gui_action_delete_line (window, NULL);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_search_restart: restart search (after input changes or exact
* flag (un)set)
*/
void
gui_buffer_search_restart (t_gui_window *window)
{
window->start_line = NULL;
window->start_line_pos = 0;
window->buffer->text_search = TEXT_SEARCH_BACKWARD;
if (!gui_buffer_search_text (window))
{
gui_chat_draw (window->buffer, 1);
gui_status_draw (window->buffer, 1);
}
}
/*
* gui_buffer_search_stop: stop search in a buffer
*/
void
gui_buffer_search_stop (t_gui_window *window)
{
window->buffer->text_search = TEXT_SEARCH_DISABLED;
window->buffer->text_search = 0;
gui_action_delete_line (window, NULL);
if (window->buffer->text_search_input)
{
gui_insert_string_input (window, window->buffer->text_search_input, -1);
free (window->buffer->text_search_input);
window->buffer->text_search_input = NULL;
}
window->start_line = NULL;
window->start_line_pos = 0;
gui_chat_draw (window->buffer, 0);
gui_status_draw (window->buffer, 1);
gui_input_draw (window->buffer, 1);
}
/*
* gui_buffer_print_log: print buffer infos in log (usually for crash dump)
*/
@@ -1117,6 +1140,7 @@ gui_buffer_print_log (t_gui_buffer *buffer)
weechat_log_printf (" ptr_history. . . . . . : 0x%X\n", buffer->ptr_history);
weechat_log_printf (" num_history. . . . . . : %d\n", buffer->num_history);
weechat_log_printf (" text_search. . . . . . : %d\n", buffer->text_search);
weechat_log_printf (" text_search_exact. . . : %d\n", buffer->text_search_exact);
weechat_log_printf (" text_search_input. . . : '%s'\n", buffer->text_search_input);
weechat_log_printf (" prev_buffer. . . . . . : 0x%X\n", buffer->prev_buffer);
weechat_log_printf (" next_buffer. . . . . . : 0x%X\n", buffer->next_buffer);
weechat/src/gui/gui-buffer.h
+1
View File
@@ -128,6 +128,7 @@ struct t_gui_buffer
/* text search */
int text_search; /* text search type */
int text_search_exact; /* exact search (case sensitive) ? */
char *text_search_input; /* input saved before text search */
/* link to previous/next buffer */
weechat/src/gui/gui.h
+1
View File
@@ -100,6 +100,7 @@ extern void gui_buffer_switch_raw_data (t_gui_window *);
extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int);
extern void gui_buffer_move_to_number (t_gui_buffer *, int);
extern void gui_buffer_search_start (t_gui_window *);
extern void gui_buffer_search_restart (t_gui_window *);
extern void gui_buffer_search_stop (t_gui_window *);
extern int gui_buffer_search_text (t_gui_window *);
extern void gui_buffer_print_log (t_gui_buffer *);