1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-06 22:45:41 +02:00

Added conditions for bar display and bar max size

This commit is contained in:
Sebastien Helleu
2008-04-22 18:11:33 +02:00
parent 9d49beabf1
commit 06fd80e210
25 changed files with 695 additions and 296 deletions
+29 -13
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -113,9 +113,9 @@ msgstr "kompilováno"
msgid "List of bars:"
msgstr "Seznam pro aliasy:\n"
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
#, fuzzy, c-format
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n"
#, fuzzy
msgid "height"
@@ -151,6 +151,10 @@ msgstr "Žádné aliasy nejsou definovány.\n"
msgid "%sError: missing arguments for \"%s\" command"
msgstr "%s chybí argumenty pro příkaz \"%s\"\n"
#, fuzzy, c-format
msgid "%sNot enough memory"
msgstr "Nedostatek paměti pro nový řádek\n"
#, fuzzy, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
@@ -179,6 +183,10 @@ msgstr "%s neznámá klávesová funkce \"%s\"\n"
msgid "Bar deleted"
msgstr "uživatel byl zablokován"
#, fuzzy, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr "%s neznámá volba pro příkaz \"%s\"\n"
#, fuzzy, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr "%s neznámá volba pro příkaz \"%s\"\n"
@@ -595,16 +603,21 @@ msgid "manage bars"
msgstr "řídit buffery"
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1686,6 +1699,9 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
#, fuzzy
msgid "bar position (bottom, top, left, right)"
msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
@@ -1693,6 +1709,10 @@ msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
msgid "bar size in chars (0 = auto size)"
msgstr ""
#, fuzzy
msgid "max bar size in chars (0 = no limit)"
msgstr "maximální délka jmen v hotlistu (0 = bez limitu)"
#, fuzzy
msgid "separator line between bar and other bars/windows"
msgstr "oddělovač mezi rozhovorem a seznamem přezdívek"
@@ -4757,10 +4777,6 @@ msgstr "%s špatné parametry pro příkaz \"%s\"\n"
#~ msgid "%s%s: cannot identify date/time for \"%s\" command"
#~ msgstr "%s nemohu identofikovat datum/čas pro příkaz \"%s\"\n"
#, fuzzy
#~ msgid "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)"
#~ msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n"
#, fuzzy
#~ msgid "%s%s: command \"%s\" failed"
#~ msgstr "%s příkaz \"%s\" selhal\n"
+29 -13
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -118,9 +118,9 @@ msgstr "kompiliert am"
msgid "List of bars:"
msgstr "Liste der Aliases:\n"
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
#, fuzzy, c-format
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr "%sin %s%s%s/%s%s%s:%s ignoriere %s%s%s von %s%s\n"
#, fuzzy
msgid "height"
@@ -156,6 +156,10 @@ msgstr "Keine Aliases definiert.\n"
msgid "%sError: missing arguments for \"%s\" command"
msgstr "%s fehlende Argumente für den \"%s\"-Befehl\n"
#, fuzzy, c-format
msgid "%sNot enough memory"
msgstr "Nicht genügend Speicher für neue Zeile\n"
#, fuzzy, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n"
@@ -184,6 +188,10 @@ msgstr "%s unbekannte Tasten-Funktion \"%s\"\n"
msgid "Bar deleted"
msgstr "/users wurde deaktiviert"
#, fuzzy, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr "%s unbekannte Option für den \"%s\"-Befehl\n"
#, fuzzy, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr "%s unbekannte Option für den \"%s\"-Befehl\n"
@@ -603,16 +611,21 @@ msgid "manage bars"
msgstr "Puffer verwalten"
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1686,6 +1699,9 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
#, fuzzy
msgid "bar position (bottom, top, left, right)"
msgstr "Nicklisten-Position (top, left, right (Standard), bottom)"
@@ -1693,6 +1709,10 @@ msgstr "Nicklisten-Position (top, left, right (Standard), bottom)"
msgid "bar size in chars (0 = auto size)"
msgstr ""
#, fuzzy
msgid "max bar size in chars (0 = no limit)"
msgstr "maximale Länge der Namen in der Hotlist (0: kein Limit)"
#, fuzzy
msgid "separator line between bar and other bars/windows"
msgstr "Trennzeichen zwischen Chatfenster und Nickliste"
@@ -4749,10 +4769,6 @@ msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
#~ msgstr ""
#~ "%s kann für den \"%s\"-Befehl kein Datum/keine Uhrzeit identifizieren\n"
#, fuzzy
#~ msgid "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)"
#~ msgstr "%sin %s%s%s/%s%s%s:%s ignoriere %s%s%s von %s%s\n"
#, fuzzy
#~ msgid "%s%s: command \"%s\" failed"
#~ msgstr "%s der Befehl \"%s\" schlug fehl\n"
+29 -13
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+0200\n"
"PO-Revision-Date: 2007-09-19 12:09+0200\n"
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -115,9 +115,9 @@ msgstr "compilado en"
msgid "List of bars:"
msgstr "Lista de alias:\n"
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
#, fuzzy, c-format
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr "%sen %s%s%s/%s%s%s:%s ignorando %s%s%s de %s%s\n"
msgid "height"
msgstr ""
@@ -152,6 +152,10 @@ msgstr "Ningún alias definido.\n"
msgid "%sError: missing arguments for \"%s\" command"
msgstr "%s faltan argumentos para el comando \"%s\"\n"
#, fuzzy, c-format
msgid "%sNot enough memory"
msgstr "No hay suficiente memoria para una nueva línea\n"
#, fuzzy, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
@@ -180,6 +184,10 @@ msgstr "%s opción desconocida para el comando \"%s\"\n"
msgid "Bar deleted"
msgstr "los usuarios han sido desactivados"
#, fuzzy, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr "%s opción desconocida para el comando \"%s\"\n"
#, fuzzy, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr "%s opción desconocida para el comando \"%s\"\n"
@@ -599,16 +607,21 @@ msgid "manage bars"
msgstr "gestionar los búfers"
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1670,6 +1683,9 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
#, fuzzy
msgid "bar position (bottom, top, left, right)"
msgstr ""
@@ -1679,6 +1695,10 @@ msgstr ""
msgid "bar size in chars (0 = auto size)"
msgstr ""
#, fuzzy
msgid "max bar size in chars (0 = no limit)"
msgstr "longitud máxima de nombres en la hotlist (0 = sin límite)"
msgid "separator line between bar and other bars/windows"
msgstr ""
@@ -4760,10 +4780,6 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
#~ msgid "%s%s: cannot identify date/time for \"%s\" command"
#~ msgstr "%s no es posible identificar la fecha/hora para el comando \"%s\"\n"
#, fuzzy
#~ msgid "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)"
#~ msgstr "%sen %s%s%s/%s%s%s:%s ignorando %s%s%s de %s%s\n"
#, fuzzy
#~ msgid "%s%s: command \"%s\" failed"
#~ msgstr "%s el comando \"%s\" ha fallado\n"
+42 -14
View File
File diff suppressed because it is too large Load Diff
+28 -13
View File
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+0200\n"
"PO-Revision-Date: 2007-10-10 18:07+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -119,9 +119,9 @@ msgstr "lefordítva:"
msgid "List of bars:"
msgstr "Aliaszok listája:\n"
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
#, fuzzy, c-format
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr "%s %s%s%s/%s%s%s:%s %s%s%s mellőzése a következő(k)től: %s%s\n"
#, fuzzy
msgid "height"
@@ -157,6 +157,10 @@ msgstr "Nincs aliasz definiálva.\n"
msgid "%sError: missing arguments for \"%s\" command"
msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n"
#, fuzzy, c-format
msgid "%sNot enough memory"
msgstr "Nincs elég memória az új sorhoz\n"
#, fuzzy, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n"
@@ -185,6 +189,10 @@ msgstr "%s ismeretlen billentyűparancs \"%s\"\n"
msgid "Bar deleted"
msgstr "a felhasználók le lettek tiltva"
#, fuzzy, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr "%s ismeretlen opció a \"%s\" parancsnak\n"
#, fuzzy, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr "%s ismeretlen opció a \"%s\" parancsnak\n"
@@ -601,16 +609,21 @@ msgid "manage bars"
msgstr "pufferek kezelése"
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1690,6 +1703,9 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
#, fuzzy
msgid "bar position (bottom, top, left, right)"
msgstr "névlista helye (top, left, right (alapértelmezett), bottom)"
@@ -1697,6 +1713,9 @@ msgstr "névlista helye (top, left, right (alapértelmezett), bottom)"
msgid "bar size in chars (0 = auto size)"
msgstr ""
msgid "max bar size in chars (0 = no limit)"
msgstr ""
#, fuzzy
msgid "separator line between bar and other bars/windows"
msgstr "a névlista és a beszélgetőablak közti elválasztó"
@@ -4764,10 +4783,6 @@ msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
#~ msgid "%s%s: cannot identify date/time for \"%s\" command"
#~ msgstr "%s nem sikerült a dátumot/időt meghatározni a \"%s\" parancshoz\n"
#, fuzzy
#~ msgid "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)"
#~ msgstr "%s %s%s%s/%s%s%s:%s %s%s%s mellőzése a következő(k)től: %s%s\n"
#, fuzzy
#~ msgid "%s%s: command \"%s\" failed"
#~ msgstr "%s a \"%s\" parancs végrehajtása sikertelen\n"
+29 -13
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.2.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+0200\n"
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -115,9 +115,9 @@ msgstr "собран:"
msgid "List of bars:"
msgstr "Список сокращений:\n"
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
#, fuzzy, c-format
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr "%sна %s%s%s/%s%s%s:%s игнорирует %s%s%s с %s%s\n"
#, fuzzy
msgid "height"
@@ -153,6 +153,10 @@ msgstr "Сокращения не заданы.\n"
msgid "%sError: missing arguments for \"%s\" command"
msgstr "%s нет аргументов для \"%s\" команды\n"
#, fuzzy, c-format
msgid "%sNot enough memory"
msgstr "Недостаточно памяти для новой строчки\n"
#, fuzzy, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr "%s некорректное количество аргументов команды \"%s\"\n"
@@ -181,6 +185,10 @@ msgstr "%s неизвестная функция клавиши \"%s\"\n"
msgid "Bar deleted"
msgstr "команда users отключена"
#, fuzzy, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr "%s неизвестный параметр для команды \"%s\"\n"
#, fuzzy, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr "%s неизвестный параметр для команды \"%s\"\n"
@@ -597,16 +605,21 @@ msgid "manage bars"
msgstr "управление буферами"
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1694,6 +1707,9 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
#, fuzzy
msgid "bar position (bottom, top, left, right)"
msgstr ""
@@ -1702,6 +1718,10 @@ msgstr ""
msgid "bar size in chars (0 = auto size)"
msgstr ""
#, fuzzy
msgid "max bar size in chars (0 = no limit)"
msgstr "максимальная длина имён в хотлисте (0=не ограничено)"
#, fuzzy
msgid "separator line between bar and other bars/windows"
msgstr "разделитель чата и никлиста"
@@ -4748,10 +4768,6 @@ msgstr "%s некорректные аргументы команды \"%s\"\n"
#~ msgid "%s%s: cannot identify date/time for \"%s\" command"
#~ msgstr "%s не могу опознать дату/время для команды \"%s\"\n"
#, fuzzy
#~ msgid "%s%s%s on %s%s%s %s %s %s%s@%s %s(%s%s%s)"
#~ msgstr "%sна %s%s%s/%s%s%s:%s игнорирует %s%s%s с %s%s\n"
#, fuzzy
#~ msgid "%s%s: command \"%s\" failed"
#~ msgstr "%s команда \"%s\" не удалась\n"
+26 -7
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: 2008-04-19 10:27+0200\n"
"POT-Creation-Date: 2008-04-22 18:08+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"
@@ -94,7 +94,7 @@ msgid "List of bars:"
msgstr ""
#, c-format
msgid " %d. %s: %s, %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgid " %d. %s: %s (cond: %s), %s, %s: %s%s%d%s, items: %s%s (plugin: %s)"
msgstr ""
msgid "height"
@@ -126,6 +126,10 @@ msgstr ""
msgid "%sError: missing arguments for \"%s\" command"
msgstr ""
#, c-format
msgid "%sNot enough memory"
msgstr ""
#, c-format
msgid "%sError: wrong type \"%s\" for bar \"%s\""
msgstr ""
@@ -153,6 +157,10 @@ msgstr ""
msgid "Bar deleted"
msgstr ""
#, c-format
msgid "%sError: unable to set option \"%s\" for bar \"%s\""
msgstr ""
#, c-format
msgid "%sError: unknown option for \"%s\" command"
msgstr ""
@@ -521,16 +529,21 @@ msgid "manage bars"
msgstr ""
msgid ""
"[add barname type position size separator item1,item2,...] | [del barname] | "
"[set barname name|number|position|size|separator|items value] | [list] | "
"[listitems]"
"[add barname type[,cond1,cond2,...] position size separator item1,item2,...] "
"| [del barname] | [set barname name|number|condition|position|size|separator|"
"items value] | [list] | [listitems]"
msgstr ""
msgid ""
" add: add a new bar\n"
" barname: name of bar (must be unique)\n"
" type: \"root\" (outside windows), \"window_active\" (inside active "
"window), or \"window_inactive\" (inside each inactive window)\n"
" type: root: outside windows),\n"
" window: inside windows, with optional conditions (see below)\n"
"cond1,...: condition(s) for displaying bar (only for type \"window\"):\n"
" active: on active window\n"
" inactive: on inactive windows\n"
" nicklist: on windows with nicklist\n"
" without condition, bar is always displayed\n"
" position: bottom, top, left or right\n"
" size: size of bar (in chars)\n"
"separator: 1 for using separator (line), 0 or nothing means no separator\n"
@@ -1391,12 +1404,18 @@ msgstr ""
msgid "bar type (root, window, window_active, window_inactive)"
msgstr ""
msgid "condition(s) for displaying bar (for bars of type \"window\")"
msgstr ""
msgid "bar position (bottom, top, left, right)"
msgstr ""
msgid "bar size in chars (0 = auto size)"
msgstr ""
msgid "max bar size in chars (0 = no limit)"
msgstr ""
msgid "separator line between bar and other bars/windows"
msgstr ""
+56 -16
View File
File diff suppressed because it is too large Load Diff
+6 -30
View File
@@ -594,12 +594,18 @@ config_weechat_bar_read (void *data, struct t_config_file *config_file,
case GUI_BAR_OPTION_TYPE:
ptr_temp_bar->type = ptr_option;
break;
case GUI_BAR_OPTION_CONDITIONS:
ptr_temp_bar->conditions = ptr_option;
break;
case GUI_BAR_OPTION_POSITION:
ptr_temp_bar->position = ptr_option;
break;
case GUI_BAR_OPTION_SIZE:
ptr_temp_bar->size = ptr_option;
break;
case GUI_BAR_OPTION_SIZE_MAX:
ptr_temp_bar->size_max = ptr_option;
break;
case GUI_BAR_OPTION_SEPARATOR:
ptr_temp_bar->separator = ptr_option;
break;
@@ -619,36 +625,6 @@ config_weechat_bar_read (void *data, struct t_config_file *config_file,
return 1;
}
/*
* config_weechat_bar_write: write bar section in configuration file
* Return: 0 = successful
* -1 = write error
*/
void
config_weechat_bar_write (void *data, struct t_config_file *config_file,
char *section_name)
{
struct t_gui_bar *ptr_bar;
/* make C compiler happy */
(void) data;
config_file_write_line (config_file, section_name, NULL);
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
config_file_write_line (config_file,
ptr_bar->name,
"%s;%s;%d;%d;%s",
gui_bar_type_str[CONFIG_INTEGER(ptr_bar->type)],
gui_bar_position_str[CONFIG_INTEGER(ptr_bar->position)],
CONFIG_INTEGER(ptr_bar->size),
CONFIG_INTEGER(ptr_bar->separator),
CONFIG_STRING(ptr_bar->items));
}
}
/*
* config_weechat_filter_read: read filter option from config file
* return 1 if ok, 0 if error
+6 -17
View File
@@ -304,15 +304,8 @@ gui_bar_window_new (struct t_gui_bar *bar, struct t_gui_window *window)
if (window)
{
/* bar is type "window_active" and window is not active */
if ((CONFIG_INTEGER(bar->type) == GUI_BAR_TYPE_WINDOW_ACTIVE)
&& gui_current_window
&& (gui_current_window != window))
return 1;
/* bar is type "window_inactive" and window is active */
if ((CONFIG_INTEGER(bar->type) == GUI_BAR_TYPE_WINDOW_INACTIVE)
&& (!gui_current_window || (gui_current_window == window)))
if ((CONFIG_INTEGER(bar->type) == GUI_BAR_TYPE_WINDOW)
&& (!gui_bar_check_conditions_for_window (bar, window)))
return 1;
}
@@ -488,10 +481,8 @@ gui_bar_window_remove_unused_bars (struct t_gui_window *window)
{
next_bar_win = ptr_bar_win->next_bar_window;
if (((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW_ACTIVE)
&& (window != gui_current_window))
|| ((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW_INACTIVE)
&& (window == gui_current_window)))
if ((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW)
&& (!gui_bar_check_conditions_for_window (ptr_bar_win->bar, window)))
{
gui_bar_window_free (ptr_bar_win, window);
rc = 1;
@@ -519,10 +510,8 @@ gui_bar_window_add_missing_bars (struct t_gui_window *window)
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if (((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW_ACTIVE)
&& (window == gui_current_window))
|| ((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW_INACTIVE)
&& (window != gui_current_window)))
if ((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW)
&& gui_bar_check_conditions_for_window (ptr_bar, window))
{
if (!gui_bar_window_search_bar (window, ptr_bar))
{
+4
View File
@@ -317,6 +317,8 @@ gui_chat_draw_title (struct t_gui_buffer *buffer, int erase)
if (title_decoded)
free (title_decoded);
buffer->title_refresh_needed = 0;
}
/*
@@ -1276,6 +1278,8 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
ptr_line->refresh_needed = 0;
}
}
buffer->chat_refresh_needed = 0;
}
/*
+2
View File
@@ -423,4 +423,6 @@ gui_input_draw (struct t_gui_buffer *buffer, int erase)
refresh ();
}
}
buffer->input_refresh_needed = 0;
}
+4 -14
View File
@@ -206,14 +206,11 @@ gui_main_loop ()
/* refresh window if needed */
if (gui_window_refresh_needed)
gui_window_refresh_screen (0);
gui_window_refresh_screen ();
/* refresh status bar if needed */
if (gui_status_refresh_needed)
{
gui_status_draw (1);
gui_status_refresh_needed = 0;
}
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
@@ -230,29 +227,22 @@ gui_main_loop ()
{
/* refresh title if needed */
if (ptr_buffer->title_refresh_needed)
{
gui_chat_draw_title (ptr_buffer, 1);
ptr_buffer->title_refresh_needed = 0;
}
/* refresh chat if needed */
if (ptr_buffer->chat_refresh_needed)
{
gui_chat_draw (ptr_buffer,
(ptr_buffer->chat_refresh_needed) > 1 ? 1 : 0);
ptr_buffer->chat_refresh_needed = 0;
}
/* refresh nicklist if needed */
if (ptr_buffer->nicklist_refresh_needed)
{
gui_nicklist_draw (ptr_buffer, 1);
ptr_buffer->nicklist_refresh_needed = 0;
}
/* refresh input if needed */
if (ptr_buffer->input_refresh_needed)
{
gui_input_draw (ptr_buffer, 1);
ptr_buffer->input_refresh_needed = 0;
}
}
/* wait for keyboard or network activity */
+2
View File
@@ -316,4 +316,6 @@ gui_nicklist_draw (struct t_gui_buffer *buffer, int erase)
refresh ();
}
}
buffer->nicklist_refresh_needed = 0;
}
+2
View File
@@ -249,4 +249,6 @@ gui_status_draw (int erase)
wnoutrefresh (GUI_CURSES(ptr_win)->win_status);
refresh ();
}
gui_status_refresh_needed = 0;
}
File diff suppressed because it is too large Load Diff
+5 -9
View File
@@ -208,11 +208,9 @@ gui_bar_window_remove_unused_bars (struct t_gui_window *window)
while (ptr_bar_win)
{
next_bar_win = ptr_bar_win->next_bar_window;
if (((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW_ACTIVE)
&& (window != gui_current_window))
|| ((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW_INACTIVE)
&& (window == gui_current_window)))
if ((CONFIG_INTEGER(ptr_bar_win->bar->type) == GUI_BAR_TYPE_WINDOW)
&& (!gui_bar_check_conditions_for_window (ptr_bar_win->bar, window)))
{
gui_bar_window_free (ptr_bar_win, window);
rc = 1;
@@ -240,10 +238,8 @@ gui_bar_window_add_missing_bars (struct t_gui_window *window)
for (ptr_bar = gui_bars; ptr_bar; ptr_bar = ptr_bar->next_bar)
{
if (((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW_ACTIVE)
&& (window == gui_current_window))
|| ((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW_INACTIVE)
&& (window != gui_current_window)))
if ((CONFIG_INTEGER(ptr_bar->type) == GUI_BAR_TYPE_WINDOW)
&& gui_bar_check_conditions_for_window (ptr_bar, window))
{
if (!gui_bar_window_search_bar (window, ptr_bar))
{
+256 -29
View File
File diff suppressed because it is too large Load Diff
+21 -13
View File
@@ -26,8 +26,10 @@ struct t_gui_window;
enum t_gui_bar_option
{
GUI_BAR_OPTION_TYPE = 0,
GUI_BAR_OPTION_CONDITIONS,
GUI_BAR_OPTION_POSITION,
GUI_BAR_OPTION_SIZE,
GUI_BAR_OPTION_SIZE_MAX,
GUI_BAR_OPTION_SEPARATOR,
GUI_BAR_OPTION_ITEMS,
/* number of bar types */
@@ -38,8 +40,6 @@ enum t_gui_bar_type
{
GUI_BAR_TYPE_ROOT = 0,
GUI_BAR_TYPE_WINDOW,
GUI_BAR_TYPE_WINDOW_ACTIVE,
GUI_BAR_TYPE_WINDOW_INACTIVE,
/* number of bar types */
GUI_BAR_NUM_TYPES,
};
@@ -57,17 +57,21 @@ enum t_gui_bar_position
struct t_gui_bar
{
/* user choices */
struct t_weechat_plugin *plugin; /* plugin */
int number; /* bar number */
char *name; /* bar name */
struct t_config_option *type; /* type (root or window) */
struct t_config_option *position; /* bottom, top, left, right */
struct t_config_option *size; /* size of bar (in chars, 0 = auto) */
struct t_config_option *separator; /* true if separator line displayed */
struct t_config_option *items; /* bar items */
struct t_weechat_plugin *plugin; /* plugin */
int number; /* bar number */
char *name; /* bar name */
struct t_config_option *type; /* type (root or window) */
struct t_config_option *conditions; /* conditions for display */
struct t_config_option *position; /* bottom, top, left, right */
struct t_config_option *size; /* size of bar (in chars, 0 = auto) */
struct t_config_option *size_max; /* max size of bar (0 = no limit) */
struct t_config_option *separator; /* true if separator line displayed */
struct t_config_option *items; /* bar items */
/* internal vars */
int current_size; /* current bar size (strictly > 0) */
int conditions_count; /* number of conditions */
char **conditions_array; /* exploded bar conditions */
int items_count; /* number of bar items */
char **items_array; /* exploded bar items */
struct t_gui_bar_window *bar_window; /* pointer to bar window */
@@ -90,18 +94,22 @@ extern struct t_gui_bar *last_gui_temp_bar;
extern int gui_bar_search_option (char *option_name);
extern int gui_bar_search_type (char *type);
extern int gui_bar_search_position (char *position);
extern int gui_bar_check_conditions_for_window (struct t_gui_bar *bar,
struct t_gui_window *window);
extern int gui_bar_root_get_size (struct t_gui_bar *bar,
enum t_gui_bar_position position);
extern struct t_gui_bar *gui_bar_search (char *name);
extern void gui_bar_set_current_size (struct t_gui_bar *bar, int current_size);
extern void gui_bar_set (struct t_gui_bar *bar, char *property, char *value);
extern int gui_bar_set (struct t_gui_bar *bar, char *property, char *value);
extern struct t_gui_bar *gui_bar_alloc (char *name);
extern struct t_config_option *gui_bar_create_option (char *bar_name,
int index_option,
char *value);
extern struct t_gui_bar *gui_bar_new (struct t_weechat_plugin *plugin,
char *name, char *type, char *position,
char *size, char *separator, char *items);
char *name, char *type, char *conditions,
char *position, char *size,
char *size_max, char *separator,
char *items);
extern void gui_bar_use_temp_bars ();
extern void gui_bar_update (char *name);
extern void gui_bar_free (struct t_gui_bar *bar);
+1 -1
View File
@@ -158,9 +158,9 @@ extern int gui_window_calculate_pos_size (struct t_gui_window *window,
int force_calculate);
extern void gui_window_redraw_buffer (struct t_gui_buffer *buffer);
extern void gui_window_redraw_all_buffers ();
extern void gui_window_switch (struct t_gui_window *window);
extern void gui_window_switch_to_buffer (struct t_gui_window *window,
struct t_gui_buffer *buffer);
extern void gui_window_switch (struct t_gui_window *window);
extern void gui_window_page_up (struct t_gui_window *window);
extern void gui_window_page_down (struct t_gui_window *window);
extern void gui_window_scroll_up (struct t_gui_window *window);
+13 -6
View File
@@ -3878,7 +3878,8 @@ weechat_lua_api_bar_search (lua_State *L)
static int
weechat_lua_api_bar_new (lua_State *L)
{
const char *name, *type, *position, *items, *size, *separator;
const char *name, *type, *conditions, *position, *size, *size_max;
const char *separator, *items;
char *result;
int n;
@@ -3893,30 +3894,36 @@ weechat_lua_api_bar_new (lua_State *L)
name = NULL;
type = NULL;
conditions = NULL;
position = NULL;
size = NULL;
size_max = NULL;
separator = NULL;
items = NULL;
n = lua_gettop (lua_current_interpreter);
if (n < 6)
if (n < 8)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new");
LUA_RETURN_EMPTY;
}
name = lua_tostring (lua_current_interpreter, -6);
type = lua_tostring (lua_current_interpreter, -5);
position = lua_tostring (lua_current_interpreter, -4);
size = lua_tostring (lua_current_interpreter, -3);
name = lua_tostring (lua_current_interpreter, -8);
type = lua_tostring (lua_current_interpreter, -7);
conditions = lua_tostring (lua_current_interpreter, -6);
position = lua_tostring (lua_current_interpreter, -5);
size = lua_tostring (lua_current_interpreter, -4);
size_max = lua_tostring (lua_current_interpreter, -3);
separator = lua_tostring (lua_current_interpreter, -2);
items = lua_tostring (lua_current_interpreter, -1);
result = script_ptr2str (weechat_bar_new ((char *)name,
(char *)type,
(char *)conditions,
(char *)position,
(char *)size,
(char *)size_max,
(char *)separator,
(char *)items));
+11 -6
View File
@@ -3219,7 +3219,8 @@ static XS (XS_weechat_bar_search)
static XS (XS_weechat_bar_new)
{
char *result, *name, *type, *position, *size, *separator, *bar_items;
char *result, *name, *type, *conditions, *position, *size, *size_max;
char *separator, *bar_items;
dXSARGS;
/* make C compiler happy */
@@ -3231,7 +3232,7 @@ static XS (XS_weechat_bar_new)
PERL_RETURN_EMPTY;
}
if (items < 6)
if (items < 8)
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new");
PERL_RETURN_EMPTY;
@@ -3239,14 +3240,18 @@ static XS (XS_weechat_bar_new)
name = SvPV (ST (0), PL_na);
type = SvPV (ST (1), PL_na);
position = SvPV (ST (2), PL_na);
size = SvPV (ST (3), PL_na);
separator = SvPV (ST (4), PL_na);
bar_items = SvPV (ST (5), PL_na);
conditions = SvPV (ST (2), PL_na);
position = SvPV (ST (3), PL_na);
size = SvPV (ST (4), PL_na);
size_max = SvPV (ST (5), PL_na);
separator = SvPV (ST (6), PL_na);
bar_items = SvPV (ST (7), PL_na);
result = script_ptr2str (weechat_bar_new (name,
type,
conditions,
position,
size,
size_max,
separator,
bar_items));
@@ -3426,7 +3426,8 @@ weechat_python_api_bar_search (PyObject *self, PyObject *args)
static PyObject *
weechat_python_api_bar_new (PyObject *self, PyObject *args)
{
char *name, *type, *position, *size, *separator, *items, *result;
char *name, *type, *conditions, *position, *size, *size_max, *separator;
char *items, *result;
PyObject *object;
/* make C compiler happy */
@@ -3440,13 +3441,15 @@ weechat_python_api_bar_new (PyObject *self, PyObject *args)
name = NULL;
type = NULL;
conditions = NULL;
position = NULL;
size = NULL;
size_max = NULL;
separator = NULL;
items = NULL;
if (!PyArg_ParseTuple (args, "ssssss", &name, &type, &position, &size,
&separator, &items))
if (!PyArg_ParseTuple (args, "ssssssss", &name, &conditions, &type,
&position, &size, &size_max, &separator, &items))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new");
PYTHON_RETURN_EMPTY;
@@ -3454,8 +3457,10 @@ weechat_python_api_bar_new (PyObject *self, PyObject *args)
result = script_ptr2str (weechat_bar_new (name,
type,
conditions,
position,
size,
size_max,
separator,
items));
+17 -7
View File
@@ -3942,11 +3942,12 @@ weechat_ruby_api_bar_search (VALUE class, VALUE name)
*/
static VALUE
weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE type, VALUE position,
VALUE size, VALUE separator, VALUE items)
weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE type, VALUE conditions,
VALUE position, VALUE size, VALUE size_max,
VALUE separator, VALUE items)
{
char *c_name, *c_type, *c_position, *c_size, *c_separator, *c_items;
char *result;
char *c_name, *c_type, *c_conditions, *c_position, *c_size, *c_size_max;
char *c_separator, *c_items, *result;
VALUE return_value;
/* make C compiler happy */
@@ -3960,13 +3961,16 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE type, VALUE position,
c_name = NULL;
c_type = NULL;
c_conditions = NULL;
c_position = NULL;
c_size = NULL;
c_size_max = NULL;
c_separator = NULL;
c_items = NULL;
if (NIL_P (name) || NIL_P (type) || NIL_P (position) || NIL_P (size)
|| NIL_P (separator) || NIL_P (items))
if (NIL_P (name) || NIL_P (type) || NIL_P (conditions) || NIL_P (position)
|| NIL_P (size) || NIL_P (size_max) || NIL_P (separator)
|| NIL_P (items))
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("bar_new");
RUBY_RETURN_EMPTY;
@@ -3974,22 +3978,28 @@ weechat_ruby_api_bar_new (VALUE class, VALUE name, VALUE type, VALUE position,
Check_Type (name, T_STRING);
Check_Type (type, T_STRING);
Check_Type (conditions, T_STRING);
Check_Type (position, T_STRING);
Check_Type (size, T_STRING);
Check_Type (size_max, T_STRING);
Check_Type (separator, T_STRING);
Check_Type (items, T_STRING);
c_name = STR2CSTR (name);
c_type = STR2CSTR (type);
c_conditions = STR2CSTR (conditions);
c_position = STR2CSTR (position);
c_size = STR2CSTR (size);
c_size_max = STR2CSTR (size_max);
c_separator = STR2CSTR (separator);
c_items = STR2CSTR (items);
result = script_ptr2str (weechat_bar_new (c_name,
c_type,
c_conditions,
c_position,
c_size,
c_size_max,
c_separator,
c_items));
@@ -4589,7 +4599,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
rb_define_module_function (ruby_mWeechat, "bar_item_update", &weechat_ruby_api_bar_item_update, 1);
rb_define_module_function (ruby_mWeechat, "bar_item_remove", &weechat_ruby_api_bar_item_remove, 1);
rb_define_module_function (ruby_mWeechat, "bar_search", &weechat_ruby_api_bar_search, 1);
rb_define_module_function (ruby_mWeechat, "bar_new", &weechat_ruby_api_bar_new, 6);
rb_define_module_function (ruby_mWeechat, "bar_new", &weechat_ruby_api_bar_new, 8);
rb_define_module_function (ruby_mWeechat, "bar_set", &weechat_ruby_api_bar_set, 3);
rb_define_module_function (ruby_mWeechat, "bar_update", &weechat_ruby_api_bar_update, 1);
rb_define_module_function (ruby_mWeechat, "bar_remove", &weechat_ruby_api_bar_remove, 1);
+9 -7
View File
@@ -376,9 +376,10 @@ struct t_weechat_plugin
void (*bar_item_remove) (struct t_gui_bar_item *item);
struct t_gui_bar *(*bar_search) (char *name);
struct t_gui_bar *(*bar_new) (struct t_weechat_plugin *plugin, char *name,
char *type, char *position, char *size,
char *separator, char *items);
void (*bar_set) (struct t_gui_bar *bar, char *property, char *value);
char *type, char *condition, char *position,
char *size, char *size_max, char *separator,
char *items);
int (*bar_set) (struct t_gui_bar *bar, char *property, char *value);
void (*bar_update) (char *name);
void (*bar_remove) (struct t_gui_bar *bar);
@@ -771,10 +772,11 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
weechat_plugin->bar_item_remove(__item)
#define weechat_bar_search(__name) \
weechat_plugin->bar_search(__name)
#define weechat_bar_new(__name, __type, __position, __size, \
__separator, __items) \
weechat_plugin->bar_new(weechat_plugin, __name, __type, __position, \
__size, __separator, __items)
#define weechat_bar_new(__name, __type, __condition, __position, \
__size, __size_max, __separator, __items) \
weechat_plugin->bar_new(weechat_plugin, __name, __type, \
__condition, __position, __size, \
__size_max, __separator, __items)
#define weechat_bar_set(__bar, __property, __value) \
weechat_plugin->bar_set(__bar, __property, __value)
#define weechat_bar_update(__name) \