diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | doc/de/autogen/user/weechat_options.txt | 14 | ||||
| -rw-r--r-- | doc/en/autogen/user/weechat_options.txt | 14 | ||||
| -rw-r--r-- | doc/fr/autogen/user/weechat_options.txt | 14 | ||||
| -rw-r--r-- | doc/it/autogen/user/weechat_options.txt | 14 | ||||
| -rw-r--r-- | po/cs.po | 18 | ||||
| -rw-r--r-- | po/de.po | 18 | ||||
| -rw-r--r-- | po/es.po | 18 | ||||
| -rw-r--r-- | po/fr.po | 18 | ||||
| -rw-r--r-- | po/hu.po | 12 | ||||
| -rw-r--r-- | po/it.po | 18 | ||||
| -rw-r--r-- | po/pl.po | 16 | ||||
| -rw-r--r-- | po/pt_BR.po | 12 | ||||
| -rw-r--r-- | po/ru.po | 12 | ||||
| -rw-r--r-- | po/weechat.pot | 12 | ||||
| -rw-r--r-- | src/core/wee-config.c | 14 | ||||
| -rw-r--r-- | src/core/wee-config.h | 2 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-chat.c | 153 |
18 files changed, 321 insertions, 61 deletions
@@ -10,7 +10,8 @@ Version 0.3.6 (under dev!) * core: fix display of paste multi-line prompt with a root input bar (bug #34305) * core: add "inactive" colors for inactive windows and lines in merged buffers, - new options: weechat.look.color_inactive_message, + new options: weechat.look.color_inactive_window, + weechat.look.color_inactive_buffer, weechat.look.color_inactive_message, weechat.look.color_inactive_prefix, weechat.look.color_inactive_prefix_buffer, weechat.look.color_inactive_time, weechat.color.chat_inactive_line, weechat.color.chat_inactive_window, diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index 50a185ce9..8df768019 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -43,7 +43,7 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `cyan`) -* *weechat.color.chat_inactive_line* +* *weechat.color.chat_inactive_buffer* ** Beschreibung: `text color for chat when line is inactive (buffer is merged with other buffers and is not selected)` ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`) @@ -83,7 +83,7 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `brown`) -* *weechat.color.chat_prefix_buffer_inactive_line* +* *weechat.color.chat_prefix_buffer_inactive_buffer* ** Beschreibung: `text color for inactive buffer name (before prefix, when many buffers are merged with same number and if buffer is not selected)` ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`) @@ -368,6 +368,11 @@ ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`) +* *weechat.look.color_inactive_buffer* +** Beschreibung: `use a different color for lines in inactive buffer (when line is from a merged buffer not selected)` +** Typ: boolesch +** Werte: on, off (Standardwert: `on`) + * *weechat.look.color_inactive_message* ** Beschreibung: `use a different color for inactive message (when window is not current window, or if line is from a merged buffer not selected)` ** Typ: boolesch @@ -388,6 +393,11 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `off`) +* *weechat.look.color_inactive_window* +** Beschreibung: `use a different color for lines in inactive window (when window is not current window)` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + * *weechat.look.color_pairs_auto_reset* ** Beschreibung: `automatischer Reset der Farbpaarungen sobald die verfügbare Anzahl an Paaren kleiner oder gleich der hier angegebenen Anzahl ist (-1 = deaktiviert den automatischen Reset, dann ist ein manueller Reset mittels "/color reset" notwendig falls alle Farbpaarungen belegt sind)` ** Typ: integer diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 6379231d5..5df5f3a20 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -43,7 +43,7 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `cyan`) -* *weechat.color.chat_inactive_line* +* *weechat.color.chat_inactive_buffer* ** description: `text color for chat when line is inactive (buffer is merged with other buffers and is not selected)` ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`) @@ -83,7 +83,7 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `brown`) -* *weechat.color.chat_prefix_buffer_inactive_line* +* *weechat.color.chat_prefix_buffer_inactive_buffer* ** description: `text color for inactive buffer name (before prefix, when many buffers are merged with same number and if buffer is not selected)` ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`) @@ -368,6 +368,11 @@ ** type: string ** values: any string (default value: `"%H:%M:%S"`) +* *weechat.look.color_inactive_buffer* +** description: `use a different color for lines in inactive buffer (when line is from a merged buffer not selected)` +** type: boolean +** values: on, off (default value: `on`) + * *weechat.look.color_inactive_message* ** description: `use a different color for inactive message (when window is not current window, or if line is from a merged buffer not selected)` ** type: boolean @@ -388,6 +393,11 @@ ** type: boolean ** values: on, off (default value: `off`) +* *weechat.look.color_inactive_window* +** description: `use a different color for lines in inactive window (when window is not current window)` +** type: boolean +** values: on, off (default value: `off`) + * *weechat.look.color_pairs_auto_reset* ** description: `automatically reset table of color pairs when number of available pairs is lower or equal to this number (-1 = disable automatic reset, and then a manual "/color reset" is needed when table is full)` ** type: integer diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 1c059f154..036a5432f 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -43,7 +43,7 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `cyan`) -* *weechat.color.chat_inactive_line* +* *weechat.color.chat_inactive_buffer* ** description: `couleur du texte pour la discussion lorsque la ligne est inactive (tampon mélangé avec d'autres tampons et non sélectionné)` ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`) @@ -83,7 +83,7 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `brown`) -* *weechat.color.chat_prefix_buffer_inactive_line* +* *weechat.color.chat_prefix_buffer_inactive_buffer* ** description: `couleur du texte pour le nom du tampon inactif (avant le préfixe, quand plusieurs tampons sont mélangés avec le même numéro et si le tampon n'est pas sélectionné)` ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`) @@ -368,6 +368,11 @@ ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"%H:%M:%S"`) +* *weechat.look.color_inactive_buffer* +** description: `utiliser une couleur différente pour les lignes dans un tampon inactif (si la ligne est d'un tampon mélangé et le tampon n'est pas sélectionné)` +** type: booléen +** valeurs: on, off (valeur par défaut: `on`) + * *weechat.look.color_inactive_message* ** description: `utiliser une couleur différente pour un message inactif (quand la fenêtre n'est pas la fenêtre courante, ou si la ligne est d'un tampon mélangé et le tampon n'est pas sélectionné)` ** type: booléen @@ -388,6 +393,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `off`) +* *weechat.look.color_inactive_window* +** description: `utiliser une couleur différente pour les lignes dans une fenêtre inactive (quand la fenêtre n'est pas la fenêtre courante)` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + * *weechat.look.color_pairs_auto_reset* ** description: `réinitialisation automatique de la table des paires de couleurs quand le nombre de paires disponibles est inférieur ou égal à ce nombre (-1 = désactiver la réinitialisation automatique, et donc un "/color reset" manuel est nécessaire quand la table est pleine)` ** type: entier diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index beb78bf77..c802f213e 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -43,7 +43,7 @@ ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `cyan`) -* *weechat.color.chat_inactive_line* +* *weechat.color.chat_inactive_buffer* ** descrizione: `text color for chat when line is inactive (buffer is merged with other buffers and is not selected)` ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`) @@ -83,7 +83,7 @@ ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `brown`) -* *weechat.color.chat_prefix_buffer_inactive_line* +* *weechat.color.chat_prefix_buffer_inactive_buffer* ** descrizione: `text color for inactive buffer name (before prefix, when many buffers are merged with same number and if buffer is not selected)` ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`) @@ -368,6 +368,11 @@ ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"%H:%M:%S"`) +* *weechat.look.color_inactive_buffer* +** descrizione: `use a different color for lines in inactive buffer (when line is from a merged buffer not selected)` +** tipo: bool +** valori: on, off (valore predefinito: `on`) + * *weechat.look.color_inactive_message* ** descrizione: `use a different color for inactive message (when window is not current window, or if line is from a merged buffer not selected)` ** tipo: bool @@ -388,6 +393,11 @@ ** tipo: bool ** valori: on, off (valore predefinito: `off`) +* *weechat.look.color_inactive_window* +** descrizione: `use a different color for lines in inactive window (when window is not current window)` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + * *weechat.look.color_pairs_auto_reset* ** descrizione: `ripristina automaticamente la tabella delle coppie colore quando il numero di coppie disponibili è minore o uguale a questo numero (-1 = disabilita il ripristino automatico, dunque è necessario "/color reset" quando la tabella è al completo)` ** tipo: intero @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2235,6 +2235,22 @@ msgstr "" "specifikaci data/času), barvy jsou povoleny ve formátu \"${barva}\", " "například francouzský čas: \"${lightblue}%H${white}%M${lightred}%S\"" +#, fuzzy +msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se " +"stejným číslem)" + +#, fuzzy +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se " +"stejným číslem)" + msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-08-15 10:10+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2413,6 +2413,22 @@ msgstr "" "\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine " "französische Uhr: \"${lightblue}%H${white}%M${lightred}%S\"" +#, fuzzy +msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"Textfarbe des Buffer-Namens (vor dem Präfix, wenn mehrere Buffer mit der " +"selben Zahl zusammengefügt worden sind)" + +#, fuzzy +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"Textfarbe des Buffer-Namens (vor dem Präfix, wenn mehrere Buffer mit der " +"selben Zahl zusammengefügt worden sind)" + msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2262,6 +2262,22 @@ msgstr "" "\"${color}\", ejemplo hora francesa: \"${lightblue}%H${white}%M${lightred}%S" "\"" +#, fuzzy +msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"color del texto para el nombre del buffer (antes del prefijo, cuando varios " +"buffers está fusionados con el mismo número)" + +#, fuzzy +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"color del texto para el nombre del buffer (antes del prefijo, cuando varios " +"buffers está fusionados con el mismo número)" + msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" @@ -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-09-21 21:29+0200\n" -"PO-Revision-Date: 2011-09-21 21:30+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" +"PO-Revision-Date: 2011-09-22 18:22+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -2359,6 +2359,20 @@ msgstr "" "${white}%M${lightred}%S\"" msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"utiliser une couleur différente pour les lignes dans une fenêtre inactive " +"(quand la fenêtre n'est pas la fenêtre courante)" + +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"utiliser une couleur différente pour les lignes dans un tampon inactif (si " +"la ligne est d'un tampon mélangé et le tampon n'est pas sélectionné)" + +msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" msgstr "" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1927,6 +1927,16 @@ msgid "" msgstr "új nap kezdetével megjelenő időbélyeg" msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" + +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" + +msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" msgstr "" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-09-02 14:16+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2347,6 +2347,22 @@ msgstr "" "formato \"${colore}\", nell'orario italiano ad esempio: \"${lightblue}%H" "${white}%M{lightred}%S\"" +#, fuzzy +msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"colore del testo per il nome del buffer (prima del prefisso, quando più " +"buffer sono uniti con lo stesso nome)" + +#, fuzzy +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"colore del testo per il nome del buffer (prima del prefisso, quando più " +"buffer sono uniti con lo stesso nome)" + msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-07-05 15:38+0200\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2262,6 +2262,20 @@ msgstr "" "specyfikatorów daty/czasu), kolory są dozwolone poprzez \"${color}\", na " "przykład francuski czas: \"${lightblue}%H${white}%M${lightred}%S\"" +#, fuzzy +msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" +"kolor nazwy bufora (przed predrostkiem, kiedy wiele buforów jest połączonych)" + +#, fuzzy +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" +"kolor nazwy bufora (przed predrostkiem, kiedy wiele buforów jest połączonych)" + msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 24b8fc841..684af52b8 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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -2259,6 +2259,16 @@ msgstr "" "paraespecificadores de data/horário" msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" + +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" + +msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" msgstr "" @@ -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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1936,6 +1936,16 @@ msgid "" msgstr "отображение маркера даты при смене дня" msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" + +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" + +msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 389fa648f..b260f2cc1 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-09-21 21:29+0200\n" +"POT-Creation-Date: 2011-09-22 22:56+0200\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" @@ -1691,6 +1691,16 @@ msgid "" msgstr "" msgid "" +"use a different color for lines in inactive window (when window is not " +"current window)" +msgstr "" + +msgid "" +"use a different color for lines in inactive buffer (when line is from a " +"merged buffer not selected)" +msgstr "" + +msgid "" "use a different color for inactive time (when window is not current window, " "or if line is from a merged buffer not selected)" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 349589e7e..bdf39d027 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -85,6 +85,8 @@ 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_inactive_window; +struct t_config_option *config_look_color_inactive_buffer; struct t_config_option *config_look_color_inactive_time; struct t_config_option *config_look_color_inactive_prefix_buffer; struct t_config_option *config_look_color_inactive_prefix; @@ -1651,6 +1653,18 @@ config_weechat_init_options () "\"${color}\", for example french time: " "\"${lightblue}%H${white}%M${lightred}%S\""), NULL, 0, 0, "%H:%M:%S", NULL, 0, NULL, NULL, &config_change_buffer_time_format, NULL, NULL, NULL); + config_look_color_inactive_window = config_file_new_option ( + weechat_config_file, ptr_section, + "color_inactive_window", "boolean", + N_("use a different color for lines in inactive window (when window " + "is not current window)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); + config_look_color_inactive_buffer = config_file_new_option ( + weechat_config_file, ptr_section, + "color_inactive_buffer", "boolean", + N_("use a different color for lines in inactive buffer (when line is " + "from a merged buffer not selected)"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); config_look_color_inactive_time = config_file_new_option ( weechat_config_file, ptr_section, "color_inactive_time", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 323d6fe66..07c0443e9 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -112,6 +112,8 @@ 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; extern struct t_config_option *config_look_confirm_quit; +extern struct t_config_option *config_look_color_inactive_window; +extern struct t_config_option *config_look_color_inactive_buffer; extern struct t_config_option *config_look_color_inactive_time; extern struct t_config_option *config_look_color_inactive_prefix_buffer; extern struct t_config_option *config_look_color_inactive_prefix; diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index f1633449e..822aca386 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -106,34 +106,30 @@ gui_chat_marker_for_line (struct t_gui_buffer *buffer, struct t_gui_line *line) */ void -gui_chat_reset_style (struct t_gui_window *window, struct t_gui_line *line) +gui_chat_reset_style (struct t_gui_window *window, struct t_gui_line *line, + int color_inactive_window, int color_inactive_buffer, + int color_default) { - if (CONFIG_BOOLEAN(config_look_color_inactive_message)) + if (window != gui_current_window) { - if (window != gui_current_window) + if (CONFIG_BOOLEAN(config_look_color_inactive_window)) { gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, - GUI_COLOR_CHAT_INACTIVE_WINDOW); - } - else - { - if (line && !(line->data->buffer->active)) - { - gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, - GUI_COLOR_CHAT_INACTIVE_BUFFER); - } - else - { - gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, - GUI_COLOR_CHAT); - } + color_inactive_window); + return; } } - else + else if (line && !(line->data->buffer->active)) { - gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, - GUI_COLOR_CHAT); + if (CONFIG_BOOLEAN(config_look_color_inactive_buffer)) + { + gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, + color_inactive_buffer); + return; + } } + gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, + color_default); } /* @@ -210,11 +206,18 @@ gui_chat_string_next_char (struct t_gui_window *window, struct t_gui_line *line, const unsigned char *string, int apply_style, int apply_style_inactive) { - if (apply_style && apply_style_inactive - && ((window != gui_current_window) - || (line && !(line->data->buffer->active)))) + if (apply_style && apply_style_inactive) { - apply_style = 0; + if (window != gui_current_window) + { + if (CONFIG_BOOLEAN(config_look_color_inactive_window)) + apply_style = 0; + } + else if (line && !(line->data->buffer->active)) + { + if (CONFIG_BOOLEAN(config_look_color_inactive_buffer)) + apply_style = 0; + } } while (string[0]) @@ -280,7 +283,10 @@ gui_chat_string_next_char (struct t_gui_window *window, struct t_gui_line *line, case GUI_COLOR_RESET_CHAR: string++; if (apply_style) - gui_chat_reset_style (window, line); + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); break; default: return (char *)string; @@ -530,7 +536,10 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, { if (window->win_chat_cursor_y < window->coords_size) window->coords[window->win_chat_cursor_y].line = line; - gui_chat_reset_style (window, line); + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); } /* display time */ @@ -547,7 +556,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, window->coords[window->win_chat_cursor_y].time_x2 = window->win_chat_cursor_x - 1; if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } gui_chat_display_word (window, line, str_space, NULL, 1, num_lines, count, lines_displayed, simulate, @@ -575,7 +589,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, if (CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_RIGHT) { if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } for (i = 0; i < num_spaces; i++) { gui_chat_display_word (window, line, str_space, @@ -587,11 +606,15 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, if (!simulate) { - gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat, - ((!CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer)) - || ((gui_current_window == window) && (line->data->buffer->active))) ? - GUI_COLOR_CHAT_PREFIX_BUFFER : - GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER); + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + (CONFIG_BOOLEAN(config_look_color_inactive_buffer) + && CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer) + && (gui_current_window == window) + && (!line->data->buffer->active)) ? + GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER : + GUI_COLOR_CHAT_PREFIX_BUFFER, + GUI_COLOR_CHAT_PREFIX_BUFFER); } if (window->win_chat_cursor_y < window->coords_size) @@ -639,7 +662,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, else { if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } if ((CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_LEFT) || ((CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE) && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE))) @@ -668,7 +696,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, || (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE))) { if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } if (CONFIG_INTEGER(config_look_prefix_align_max) > 0) { @@ -698,8 +731,30 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, prefix_highlighted = gui_color_decode (line->data->prefix, NULL); if (!simulate) { - gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat, - GUI_COLOR_CHAT_HIGHLIGHT); + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + (CONFIG_BOOLEAN(config_look_color_inactive_buffer) + && CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer) + && (gui_current_window == window) + && (!line->data->buffer->active)) ? + GUI_COLOR_CHAT_INACTIVE_BUFFER : + GUI_COLOR_CHAT_HIGHLIGHT, + GUI_COLOR_CHAT_HIGHLIGHT); + } + } + else + { + if (!simulate) + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + (CONFIG_BOOLEAN(config_look_color_inactive_buffer) + && CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer) + && (gui_current_window == window) + && (!line->data->buffer->active)) ? + GUI_COLOR_CHAT_INACTIVE_BUFFER : + GUI_COLOR_CHAT, + GUI_COLOR_CHAT); } } @@ -737,7 +792,12 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, free (prefix_highlighted); if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_LEFT) { @@ -861,7 +921,12 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, /* reset color & style for a new line */ if (!simulate) - gui_chat_reset_style (window, line); + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } if (!line->data->message || !line->data->message[0]) { @@ -1012,7 +1077,10 @@ gui_chat_display_line_y (struct t_gui_window *window, struct t_gui_line *line, int y) { /* reset color & style for a new line */ - gui_chat_reset_style (window, line); + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); window->win_chat_cursor_x = 0; window->win_chat_cursor_y = y; @@ -1152,7 +1220,10 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase) { gui_window_coords_alloc (ptr_win); - gui_chat_reset_style (ptr_win, NULL); + gui_chat_reset_style (ptr_win, NULL, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); if (erase) { |