From ce0a81fe20d475f2c5a269cc9b1f0b0dbfa83f83 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 26 Aug 2011 23:42:46 +0200 Subject: [PATCH] core: add new options weechat.look.bar_more_left/right/up/down --- ChangeLog | 1 + doc/de/autogen/user/weechat_options.txt | 22 +++++++++++- doc/en/autogen/user/weechat_options.txt | 22 +++++++++++- doc/fr/autogen/user/weechat_options.txt | 20 +++++++++++ doc/it/autogen/user/weechat_options.txt | 22 +++++++++++- po/cs.po | 24 +++++++++++-- po/de.po | 24 +++++++++++-- po/es.po | 24 +++++++++++-- po/fr.po | 34 ++++++++++++++++-- po/hu.po | 24 +++++++++++-- po/it.po | 24 +++++++++++-- po/pl.po | 24 +++++++++++-- po/pt_BR.po | 24 +++++++++++-- po/ru.po | 24 +++++++++++-- po/weechat.pot | 24 +++++++++++-- src/core/wee-config.c | 30 +++++++++++++++- src/core/wee-config.h | 4 +++ src/gui/curses/gui-curses-bar-window.c | 46 +++++++++++++++++-------- 18 files changed, 378 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 638c9c3cb..7319833d8 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 options weechat.look.bar_more_left/right/up/down * 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" diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index 90499d3bc..bf6242e05 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -323,6 +323,26 @@ ** Typ: integer ** Werte: time, buffer, prefix, suffix, message (Standardwert: `message`) +* *weechat.look.bar_more_down* +** Beschreibung: `string displayed when bar can be scrolled down (for bars with filling different from "horizontal")` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"++"`) + +* *weechat.look.bar_more_left* +** Beschreibung: `string displayed when bar can be scrolled to the left (for bars with filling "horizontal")` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"<<"`) + +* *weechat.look.bar_more_right* +** Beschreibung: `string displayed when bar can be scrolled to the right (for bars with filling "horizontal")` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `">>"`) + +* *weechat.look.bar_more_up* +** Beschreibung: `string displayed when bar can be scrolled up (for bars with filling different from "horizontal")` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"--"`) + * *weechat.look.buffer_notify_default* ** Beschreibung: `Standardeinstellung der Benachrichtigungsstufe für Buffer (dies wird genutzt um WeeChat mitzuteilen ob der Buffer in der Hotlist angezeigt werden soll oder nicht, entsprechend der Wichtigkeit der Nachricht): all=alle Nachrichten (Standard), message=Nachrichten+Highlights, highlights=nur Highlights, none=Hotlist wird niemals angezeigt.` ** Typ: integer @@ -459,7 +479,7 @@ ** 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"` +** Beschreibung: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter")` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"*"`) diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 76726828c..efb8c75d2 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -323,6 +323,26 @@ ** type: integer ** values: time, buffer, prefix, suffix, message (default value: `message`) +* *weechat.look.bar_more_down* +** description: `string displayed when bar can be scrolled down (for bars with filling different from "horizontal")` +** type: string +** values: any string (default value: `"++"`) + +* *weechat.look.bar_more_left* +** description: `string displayed when bar can be scrolled to the left (for bars with filling "horizontal")` +** type: string +** values: any string (default value: `"<<"`) + +* *weechat.look.bar_more_right* +** description: `string displayed when bar can be scrolled to the right (for bars with filling "horizontal")` +** type: string +** values: any string (default value: `">>"`) + +* *weechat.look.bar_more_up* +** description: `string displayed when bar can be scrolled up (for bars with filling different from "horizontal")` +** type: string +** values: any string (default value: `"--"`) + * *weechat.look.buffer_notify_default* ** description: `default notify level for buffers (used to tell WeeChat if buffer must be displayed in hotlist or not, according to importance of message): all=all messages (default), message=messages+highlights, highlight=highlights only, none=never display in hotlist` ** type: integer @@ -459,7 +479,7 @@ ** 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"` +** description: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter")` ** type: string ** values: any string (default value: `"*"`) diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index db729655f..8bb1a2bed 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -323,6 +323,26 @@ ** type: entier ** valeurs: time, buffer, prefix, suffix, message (valeur par défaut: `message`) +* *weechat.look.bar_more_down* +** description: `chaîne affichée quand la barre peut être défilée vers le bas (pour les barres avec un remplissage différent de "horizontal")` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"++"`) + +* *weechat.look.bar_more_left* +** description: `chaîne affichée quand la barre peut être défilée vers la gauche (pour les barres avec un remplissage "horizontal")` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"<<"`) + +* *weechat.look.bar_more_right* +** description: `chaîne affichée quand la barre peut être défilée vers la droite (pour les barres avec un remplissage "horizontal")` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `">>"`) + +* *weechat.look.bar_more_up* +** description: `chaîne affichée quand la barre peut être défilée vers le haut (pour les barres avec un remplissage différent de "horizontal")` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"--"`) + * *weechat.look.buffer_notify_default* ** description: `niveau de notification par défaut pour les tampons (utilisé pour dire à WeeChat si le tampon doit être affiché dans la hotlist ou non, selon l'importance du message): all=tous les messages (par défaut), message=messages+highlights, highlight=highlights seulement, none=ne jemais afficher dans la hotlist` ** type: entier diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 8769ad8e9..f283c524b 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -323,6 +323,26 @@ ** tipo: intero ** valori: time, buffer, prefix, suffix, message (valore predefinito: `message`) +* *weechat.look.bar_more_down* +** descrizione: `string displayed when bar can be scrolled down (for bars with filling different from "horizontal")` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"++"`) + +* *weechat.look.bar_more_left* +** descrizione: `string displayed when bar can be scrolled to the left (for bars with filling "horizontal")` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"<<"`) + +* *weechat.look.bar_more_right* +** descrizione: `string displayed when bar can be scrolled to the right (for bars with filling "horizontal")` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `">>"`) + +* *weechat.look.bar_more_up* +** descrizione: `string displayed when bar can be scrolled up (for bars with filling different from "horizontal")` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"--"`) + * *weechat.look.buffer_notify_default* ** descrizione: `livello predefinito di notifica per i buffer (utilizzato per comunicare a WeeChat se il buffer deve essere visualizzato nella hotlist oppure no, a seconda dell'importanza del messaggio): all: tutti i messaggi (predefinito), message=messaggi+eventi, highlight=solo eventi, none=non viene mai visualizzato nella hotlist` ** tipo: intero @@ -459,7 +479,7 @@ ** 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"` +** descrizione: `string used to show that some lines are filtered in current buffer (bar item "buffer_filter")` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"*"`) diff --git a/po/cs.po b/po/cs.po index ee035f21c..119be005d 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2195,6 +2195,26 @@ msgstr "" "zarovnání pro konce řádků (všechny řádky po prvím): začínají pod těmito daty " "(time, buffer, prefix, suffix, message (výchozí))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2387,7 +2407,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/de.po b/po/de.po index 4e9aeafd3..79e8e5771 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-08-15 10:10+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev \n" @@ -2371,6 +2371,26 @@ msgstr "" "Buffer = buffer, Präfix = prefix, Suffix = suffix, Nachricht = message " "(Standardwert))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2584,7 +2604,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/es.po b/po/es.po index e0c97dc1e..9ab81bf8b 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2220,6 +2220,26 @@ msgstr "" "empiezan debajo de este elemento (time, buffer, prefix, suffix, message (por " "defecto))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2420,7 +2440,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/fr.po b/po/fr.po index aae235a1a..f5fa51e86 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 19:26+0200\n" -"PO-Revision-Date: 2011-08-26 19:23+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" +"PO-Revision-Date: 2011-08-26 23:34+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -2308,6 +2308,34 @@ msgstr "" "elles démarrent sous cette donnée (time, buffer, prefix, suffix, message " "(par défaut))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" +"chaîne affichée quand la barre peut être défilée vers la gauche (pour les " +"barres avec un remplissage \"horizontal\")" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" +"chaîne affichée quand la barre peut être défilée vers la droite (pour les " +"barres avec un remplissage \"horizontal\")" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" +"chaîne affichée quand la barre peut être défilée vers le haut (pour les " +"barres avec un remplissage différent de \"horizontal\")" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" +"chaîne affichée quand la barre peut être défilée vers le bas (pour les " +"barres avec un remplissage différent de \"horizontal\")" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2514,7 +2542,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" "chaîne utilisée pour montrer que des lignes sont filtrées dans le tampon " "courant (objet de barre \"buffer_filter\")" diff --git a/po/hu.po b/po/hu.po index bffbcf2b4..4d8e16a03 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1892,6 +1892,26 @@ msgid "" "under this data (time, buffer, prefix, suffix, message (default))" msgstr "" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2043,7 +2063,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/it.po b/po/it.po index 169f0caec..fab5116ff 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-08-16 17:48+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -2297,6 +2297,26 @@ msgstr "" "iniziano al di sotto di questi dati (data, buffer, prefissio, suffisso, " "messaggio (predefinito))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2500,7 +2520,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/pl.po b/po/pl.po index b383fe038..9783f7869 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-07-05 15:38+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -2221,6 +2221,26 @@ msgstr "" "wyrównanie dla końca linii (wszystkie po pierwszej): zaczynają się od tego " "(time, buffer, prefix, suffix, message (domyślnie))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2416,7 +2436,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index bfff60577..4373a702d 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -2216,6 +2216,26 @@ msgstr "" "alignment for end of lines (all lines after the first): they are starting " "under this data (time, buffer, prefix, suffix, message (default))" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + # Find a better translations to hotlist #, fuzzy msgid "" @@ -2397,7 +2417,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/ru.po b/po/ru.po index 86cd33a77..ddabf6197 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1901,6 +1901,26 @@ msgid "" "under this data (time, buffer, prefix, suffix, message (default))" msgstr "" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -2060,7 +2080,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index 860fdfdca..bf4d54242 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 19:26+0200\n" +"POT-Creation-Date: 2011-08-26 23:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1657,6 +1657,26 @@ msgid "" "under this data (time, buffer, prefix, suffix, message (default))" msgstr "" +msgid "" +"string displayed when bar can be scrolled to the left (for bars with filling " +"\"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled to the right (for bars with " +"filling \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled up (for bars with filling " +"different from \"horizontal\")" +msgstr "" + +msgid "" +"string displayed when bar can be scrolled down (for bars with filling " +"different from \"horizontal\")" +msgstr "" + msgid "" "default notify level for buffers (used to tell WeeChat if buffer must be " "displayed in hotlist or not, according to importance of message): all=all " @@ -1794,7 +1814,7 @@ msgstr "" msgid "" "string used to show that some lines are filtered in current buffer (bar item " -"\"buffer_filter\"" +"\"buffer_filter\")" msgstr "" msgid "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 2355567d5..fc7a12f18 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -79,6 +79,10 @@ struct t_config_option *config_startup_display_version; /* config, look & feel section */ struct t_config_option *config_look_align_end_of_lines; +struct t_config_option *config_look_bar_more_left; +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_time_format; struct t_config_option *config_look_color_pairs_auto_reset; @@ -1598,6 +1602,30 @@ config_weechat_init_options () "are starting under this data (time, buffer, prefix, suffix, " "message (default))"), "time|buffer|prefix|suffix|message", 0, 0, "message", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_bar_more_left = config_file_new_option ( + weechat_config_file, ptr_section, + "bar_more_left", "string", + N_("string displayed when bar can be scrolled to the left " + "(for bars with filling \"horizontal\")"), + NULL, 0, 0, "<<", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_bar_more_right = config_file_new_option ( + weechat_config_file, ptr_section, + "bar_more_right", "string", + N_("string displayed when bar can be scrolled to the right " + "(for bars with filling \"horizontal\")"), + NULL, 0, 0, ">>", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_bar_more_up = config_file_new_option ( + weechat_config_file, ptr_section, + "bar_more_up", "string", + N_("string displayed when bar can be scrolled up " + "(for bars with filling different from \"horizontal\")"), + NULL, 0, 0, "--", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_bar_more_down = config_file_new_option ( + weechat_config_file, ptr_section, + "bar_more_down", "string", + N_("string displayed when bar can be scrolled down " + "(for bars with filling different from \"horizontal\")"), + NULL, 0, 0, "++", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); config_look_buffer_notify_default = config_file_new_option ( weechat_config_file, ptr_section, "buffer_notify_default", "integer", @@ -1789,7 +1817,7 @@ config_weechat_init_options () 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\""), + "(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, diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 7ac415da1..d4117061b 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -104,6 +104,10 @@ extern struct t_config_option *config_startup_display_logo; extern struct t_config_option *config_startup_display_version; extern struct t_config_option *config_look_align_end_of_lines; +extern struct t_config_option *config_look_bar_more_left; +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_time_format; extern struct t_config_option *config_look_command_chars; diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c index aee425f12..e8d88406d 100644 --- a/src/gui/curses/gui-curses-bar-window.c +++ b/src/gui/curses/gui-curses-bar-window.c @@ -385,7 +385,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, static char str_start_input_hidden[16] = { '\0' }; static char str_cursor[16] = { '\0' }; char *pos_start_input, *pos_after_start_input, *pos_cursor, *buf; - char *new_start_input; + char *new_start_input, *ptr_string; static int length_start_input, length_start_input_hidden; int length_on_screen; int chars_available, index, size; @@ -646,28 +646,46 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, if ((bar_window->cursor_x < 0) && (bar_window->cursor_y < 0) && ((bar_window->scroll_x > 0) || (bar_window->scroll_y > 0))) { - x = (bar_window->height > 1) ? bar_window->width - 2 : 0; - if (x < 0) + if (filling == GUI_BAR_FILLING_HORIZONTAL) + { + ptr_string = CONFIG_STRING(config_look_bar_more_left); x = 0; + } + else + { + ptr_string = CONFIG_STRING(config_look_bar_more_up); + x = bar_window->width - utf8_strlen_screen (ptr_string); + if (x < 0) + x = 0; + } y = 0; - gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, - CONFIG_COLOR(config_color_bar_more), - CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); - mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, - y, x, "--"); + if (ptr_string && ptr_string[0]) + { + gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, + CONFIG_COLOR(config_color_bar_more), + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); + mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, + y, x, ptr_string); + } } if ((bar_window->cursor_x < 0) && (bar_window->cursor_y < 0) && (some_data_not_displayed || (line < items_count))) { - x = bar_window->width - 2; + ptr_string = (filling == GUI_BAR_FILLING_HORIZONTAL) ? + CONFIG_STRING(config_look_bar_more_right) : + CONFIG_STRING(config_look_bar_more_down); + x = bar_window->width - utf8_strlen_screen (ptr_string); if (x < 0) x = 0; y = (bar_window->height > 1) ? bar_window->height - 1 : 0; - gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, - CONFIG_COLOR(config_color_bar_more), - CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); - mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, - y, x, "++"); + if (ptr_string && ptr_string[0]) + { + gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, + CONFIG_COLOR(config_color_bar_more), + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); + mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, + y, x, ptr_string); + } } } if (items)